libguile configuration

* configure.in (GUILE_CFLAGS, GUILE_LIBS): New variables.
  (BDW_GC_CFLAGS, BDW_GC_LIBS): Remove.

* src/Makefile.in (ALL_CFLAGS): Replace BDW_GC_CFLAGS with GUILE_CFLAGS.
  (LIBES): Replace BDW_GC_LIBS with GUILE_LIBS.

diff --git a/configure.ac b/configure.ac
index b68d0c7..88a06ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1371,11 +1371,10 @@ 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"
+PKG_CHECK_MODULES([GUILE], [guile-2.2], [],
+                  [PKG_CHECK_MODULES([GUILE], [guile-2.0])])
+AC_SUBST(GUILE_CFLAGS)
+AC_SUBST(GUILE_LIBS)
 
 HAVE_SOUND=no
 

diff --git a/src/Makefile.in b/src/Makefile.in
index 778e826..83b5a2f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -125,8 +125,8 @@ LIB_MATH=@LIB_MATH@
 ## -lpthread, or empty.
 LIB_PTHREAD=@LIB_PTHREAD@
 
-BDW_GC_CFLAGS=@BDW_GC_CFLAGS@
-BDW_GC_LIBS=@BDW_GC_LIBS@
+GUILE_CFLAGS=@GUILE_CFLAGS@
+GUILE_LIBS=@GUILE_LIBS@
 
 LIBIMAGE=@LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@
 
@@ -330,6 +330,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
   $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
   $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
   $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \
+  $(GUILE_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
 ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS)
 
@@ -403,7 +404,7 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj)
 
 ## Construct full set of libraries to be linked.
 LIBES = $(LIBS) \
-   $(BDW_GC_LIBS) \
+   $(GUILE_LIBS) \
    $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \