* Use pkgconfig to locate the Boehm GC (as suggested by Ludo), if

--enable-gc is given.

configure.ac

@@ -251,17 +251,17 @@ AC_SUBST(bzip2_bin_test)
 
 
 # Whether to use the Boehm garbage collector.
-AC_ARG_WITH(boehm-gc, AC_HELP_STRING([--with-boehm-gc=PATH],
+AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
-  [prefix of the Boehm GC package to enable garbage collection in the Nix expression evaluator]),
+  [enable garbage collection in the Nix expression evaluator (requires Boehm GC)]),
-  boehmgc=$withval, boehmgc=)
+  gc=$enableval, gc=)
-if test -n "$boehmgc"; then
+if test -n "$gc"; then
+  PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
   boehmgc_lib="-L$boehmgc/lib -lgc"
-  CXXFLAGS="-I$boehmgc/include $CXXFLAGS"
+  CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
   AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.])
 fi
 AC_SUBST(boehmgc_lib)
-AC_SUBST(boehmgc_include)
+
-  
 
 AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
   [do not initialise DB etc. in `make install']),

release.nix

@@ -19,7 +19,7 @@ let
 
         buildInputs =
           [ curl bison24 flex2535 perl libxml2 libxslt w3m bzip2
-            tetex dblatex nukeReferences
+            tetex dblatex nukeReferences pkgconfig
           ];
 
         configureFlags = ''
@@ -67,12 +67,12 @@ let
         name = "nix";
         src = tarball;
 
-        buildInputs = [ curl perl bzip2 openssl ];
+        buildInputs = [ curl perl bzip2 openssl pkgconfig boehmgc ];
 
         configureFlags = ''
           --disable-init-state
           --with-bzip2=${bzip2}
-          --with-boehm-gc=${boehmgc}
+          --enable-gc
         '';
       };