From f1462c208ba5d4efda864875f814c268366f4803 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 9 Feb 2011 21:23:13 +0000
Subject: Use $BDW_GC_LIBS instead of a custom variable.

---
 configure.ac            | 2 --
 src/libexpr/Makefile.am | 2 +-
 src/libmain/Makefile.am | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 273a3c22133b..b487a8fdaa2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,11 +268,9 @@ AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
   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],
diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am
index 6c38ecdd565f..f9da9ac01b5e 100644
--- a/src/libexpr/Makefile.am
+++ b/src/libexpr/Makefile.am
@@ -11,7 +11,7 @@ pkginclude_HEADERS = \
  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
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index 1a2146e0448f..ababc3595968 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -2,7 +2,7 @@ pkglib_LTLIBRARIES = libmain.la
 
 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
 
-- 
cgit 1.4.1