aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-11-06 01:15:44 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-11-06 01:15:44 +0000
commit327a232c85de3faa56f9a6117c86e1aa22f88bd6 (patch)
treea664640621fd3d6806683e08beebc142b634b4fc /configure.ac
parentc60d796f04f81b17330fbfc1e438ed207b1047f4 (diff)
* Remove support for old (before Nix 0.12pre12020) databases.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac27
1 files changed, 1 insertions, 26 deletions
diff --git a/configure.ac b/configure.ac
index b5c247434..46036113b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,31 +193,6 @@ AC_ARG_WITH(store-dir, AC_HELP_STRING([--with-store-dir=PATH],
storedir=$withval, storedir='/nix/store')
AC_SUBST(storedir)
-AC_ARG_ENABLE(old-db-compat, AC_HELP_STRING([--disable-old-db-compat],
- [disable support for converting from old Berkeley DB-based Nix stores]),
- old_db_compat=$enableval, old_db_compat=yes)
-AM_CONDITIONAL(OLD_DB_COMPAT, test "$old_db_compat" = "yes")
-
-AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb=PATH],
- [prefix of Berkeley DB (for Nix <= 0.11 compatibility)]),
- bdb=$withval, bdb=)
-AM_CONDITIONAL(HAVE_BDB, test -n "$bdb")
-if test -z "$bdb"; then
- bdb_lib='-L${top_builddir}/externals/inst-bdb/lib -ldb_cxx'
- bdb_include='-I${top_builddir}/externals/inst-bdb/include'
-else
- bdb_lib="-L$bdb/lib -ldb_cxx"
- bdb_include="-I$bdb/include"
-fi
-if test "$old_db_compat" = "no"; then
- bdb_lib=
- bdb_include=
-else
- AC_DEFINE(OLD_DB_COMPAT, 1, [Whether to support converting from old Berkeley DB-based Nix stores.])
-fi
-AC_SUBST(bdb_lib)
-AC_SUBST(bdb_include)
-
AC_ARG_WITH(aterm, AC_HELP_STRING([--with-aterm=PATH],
[prefix of CWI ATerm library]),
aterm=$withval, aterm=)
@@ -289,7 +264,7 @@ AC_CHECK_FUNCS([strsignal])
AC_CHECK_FUNCS([posix_fallocate])
-# This is needed if ATerm, Berkeley DB or bzip2 are static libraries,
+# This is needed if ATerm or bzip2 are static libraries,
# and the Nix libraries are dynamic.
if test "$(uname)" = "Darwin"; then
LDFLAGS="-all_load $LDFLAGS"