summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2015-02-17 15:59:50 +0000
committerKim van der Riet <kpvdr@apache.org>2015-02-17 15:59:50 +0000
commit2e60cf6ce254d749890c5740d0d3b15e2b1e41a3 (patch)
tree7903f747dc89eb240b11a6f6b8479d486b506d29
parent9b0b08e1bf468b07e95637d51d53a0a5baf77f67 (diff)
downloadqpid-python-2e60cf6ce254d749890c5740d0d3b15e2b1e41a3.tar.gz
QPID-6394 Make linearstore the default store for linux builds
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1660430 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/legacystore.cmake2
-rw-r--r--qpid/cpp/src/linearstore.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/legacystore.cmake b/qpid/cpp/src/legacystore.cmake
index e8deee9538..4f7f354969 100644
--- a/qpid/cpp/src/legacystore.cmake
+++ b/qpid/cpp/src/legacystore.cmake
@@ -40,7 +40,7 @@ else (DEFINED legacystore_force)
# allow legacystore to be built
#
message(STATUS "BerkeleyDB for C++ and libaio found, Legacystore support enabled")
- set (legacystore_default ON)
+ set (legacystore_default OFF) # Disabled, deprecated. Use linearstore instead.
else (HAVE_AIO AND HAVE_AIO_H)
if (NOT HAVE_AIO)
message(STATUS "Legacystore requires libaio which is absent.")
diff --git a/qpid/cpp/src/linearstore.cmake b/qpid/cpp/src/linearstore.cmake
index d462450f72..2ed10bd8fb 100644
--- a/qpid/cpp/src/linearstore.cmake
+++ b/qpid/cpp/src/linearstore.cmake
@@ -40,7 +40,7 @@ else (DEFINED linearstore_force)
# allow linearstore to be built
#
message(STATUS "BerkeleyDB for C++ and libaio found, Linearstore support may be enabled (currently experimental and disabled by default)")
- set (linearstore_default OFF) # Temporarily disabled
+ set (linearstore_default ON)
else (HAVE_AIO AND HAVE_AIO_H)
if (NOT HAVE_AIO)
message(STATUS "Linearstore requires libaio which is absent.")