libgc configuration

* configure.in (BDW_GC_CFLAGS, BDW_GC_LIBS): New variables.
* src/Makefile.in (CFLAGS): Add BDW_GC_CFLAGS.
  (LIBES): Add BDW_GC_LIBS.

diff --git a/configure.ac b/configure.ac
index 04c75e3..e21ad47 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1432,7 +1432,14 @@ AC_DEFUN([EMACS_CHECK_MODULES],
       m4_default([$3], [HAVE_$1=yes])],
      [m4_default([$4], [HAVE_$1=no])])])
 
+PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
+AC_SUBST(BDW_GC_CFLAGS)
+AC_SUBST(BDW_GC_LIBS)
+CFLAGS="$CFLAGS $BDW_GC_CFLAGS"
+LIBS="$BDW_GC_LIBS $LIBS"
+
 HAVE_SOUND=no
+
 if test "${with_sound}" != "no"; then
   # Sound support for GNU/Linux, the free BSDs, and MinGW.
   AC_CHECK_HEADERS([machine/soundcard.h sys/soundcard.h soundcard.h],

diff --git a/src/Makefile.in b/src/Makefile.in
index a13f7b8..778e826 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -125,6 +125,9 @@ LIB_MATH=@LIB_MATH@
 ## -lpthread, or empty.
 LIB_PTHREAD=@LIB_PTHREAD@
 
+BDW_GC_CFLAGS=@BDW_GC_CFLAGS@
+BDW_GC_LIBS=@BDW_GC_LIBS@
+
 LIBIMAGE=@LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@
 
 XFT_LIBS=@XFT_LIBS@
@@ -399,7 +402,9 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 
 
 ## Construct full set of libraries to be linked.
-LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
+LIBES = $(LIBS) \
+   $(BDW_GC_LIBS) \
+   $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \
    $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \