Author: ludo Date: Wed Feb 9 21:23:13 2011 New Revision: 25873 URL: https://svn.nixos.org/websvn/nix/?rev=25873&sc=1
Log: Use $BDW_GC_LIBS instead of a custom variable. Modified: nix/trunk/configure.ac nix/trunk/src/libexpr/Makefile.am nix/trunk/src/libmain/Makefile.am Modified: nix/trunk/configure.ac ============================================================================== --- nix/trunk/configure.ac Wed Feb 9 21:11:30 2011 (r25872) +++ nix/trunk/configure.ac Wed Feb 9 21:23:13 2011 (r25873) @@ -268,11 +268,9 @@ gc=$enableval, gc=) if test -n "$gc"; then PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) - boehmgc_lib="$BDW_GC_LIBS" 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], Modified: nix/trunk/src/libexpr/Makefile.am ============================================================================== --- nix/trunk/src/libexpr/Makefile.am Wed Feb 9 21:11:30 2011 (r25872) +++ nix/trunk/src/libexpr/Makefile.am Wed Feb 9 21:23:13 2011 (r25873) @@ -11,7 +11,7 @@ names.hh symbol-table.hh libexpr_la_LIBADD = ../libutil/libutil.la ../libstore/libstore.la \ - ../boost/format/libformat.la @boehmgc_lib@ + ../boost/format/libformat.la @BDW_GC_LIBS@ BUILT_SOURCES = \ parser-tab.hh lexer-tab.hh parser-tab.cc lexer-tab.cc Modified: nix/trunk/src/libmain/Makefile.am ============================================================================== --- nix/trunk/src/libmain/Makefile.am Wed Feb 9 21:11:30 2011 (r25872) +++ nix/trunk/src/libmain/Makefile.am Wed Feb 9 21:23:13 2011 (r25873) @@ -2,7 +2,7 @@ libmain_la_SOURCES = shared.cc -libmain_la_LIBADD = ../libstore/libstore.la @boehmgc_lib@ +libmain_la_LIBADD = ../libstore/libstore.la @BDW_GC_LIBS@ pkginclude_HEADERS = shared.hh _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
