diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-16 12:49:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-16 12:49:47 +0000 |
| commit | fb9368b5a0b2457b28f19d4902bc0790123338a2 (patch) | |
| tree | 8e0d68ccc2951c44cfd442b3dad261e190127013 /configure.ac | |
| parent | 64fd29855a8ae49cacdaff424679821b4fd3bf57 (diff) | |
| parent | 4aced7f8d0d5d2c1057b0f46a70a37a577f81fa5 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 81c008a84..c2599a75f 100644 --- a/configure.ac +++ b/configure.ac @@ -132,11 +132,18 @@ AC_LANG_POP(C++) AC_CHECK_HEADER([err.h], [], [bsddiff_compat_include="-Icompat-include"]) AC_SUBST([bsddiff_compat_include]) + # Check whether we have the personality() syscall, which allows us to # do i686-linux builds on x86_64-linux machines. AC_CHECK_HEADERS([sys/personality.h]) +# Check for tr1/unordered_set. +AC_LANG_PUSH(C++) +AC_CHECK_HEADERS([tr1/unordered_set], [], [], []) +AC_LANG_POP(C++) + + AC_DEFUN([NEED_PROG], [ AC_PATH_PROG($1, $2) @@ -255,6 +262,18 @@ AC_SUBST(sqlite_lib) AC_SUBST(sqlite_include) AC_SUBST(sqlite_bin) +# Whether to use the Boehm garbage collector. +AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc], + [enable garbage collection in the Nix expression evaluator (requires Boehm GC)]), + gc=$enableval, gc=) +if test -n "$gc"; then + PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) + boehmgc_lib="-L$boehmgc/lib -lgc" + CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS" + AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.]) +fi +AC_SUBST(boehmgc_lib) + AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state], [do not initialise DB etc. in `make install']), |