lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Use $BDW_GC_LIBS instead of a custom variable.

Browse source
This commit is contained in:
Ludovic Courtès 2011-02-09 21:23:13 +00:00
parent 1876ab764f
commit f1462c208b
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -268,11 +268,9 @@ AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
gc=$enableval, gc=) gc=$enableval, gc=)
if test -n "$gc"; then if test -n "$gc"; then
PKG_CHECK_MODULES([BDW_GC], [bdw-gc]) PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
boehmgc_lib="$BDW_GC_LIBS"
CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS" CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.]) AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.])
fi fi
AC_SUBST(boehmgc_lib)
AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state], AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],

2
src/libexpr/Makefile.am
View file

@ -11,7 +11,7 @@ pkginclude_HEADERS = \
names.hh symbol-table.hh names.hh symbol-table.hh
libexpr_la_LIBADD = ../libutil/libutil.la ../libstore/libstore.la \ libexpr_la_LIBADD = ../libutil/libutil.la ../libstore/libstore.la \
../boost/format/libformat.la @boehmgc_lib@ ../boost/format/libformat.la @BDW_GC_LIBS@
BUILT_SOURCES = \ BUILT_SOURCES = \
parser-tab.hh lexer-tab.hh parser-tab.cc lexer-tab.cc parser-tab.hh lexer-tab.hh parser-tab.cc lexer-tab.cc

2
src/libmain/Makefile.am
View file

@ -2,7 +2,7 @@ pkglib_LTLIBRARIES = libmain.la
libmain_la_SOURCES = shared.cc 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 pkginclude_HEADERS = shared.hh