configure: Don't needlessly augment $LIBS (and $GUILE_LIBS.)

* configure.ac: Don't augment $LIBS with $LTLIBUNISTRING and
  $BDW_GC_LIBS.

* libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS):
  Remove @LTLIBINTL@.  Add $(BDW_GC_LIBS).

diff --git a/configure.ac b/configure.ac
index faf31f3..4b4323f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -862,9 +862,7 @@ if test "x$HAVE_LIBGMP" != "xyes"; then
 fi
 
 dnl GNU libunistring is checked for by Gnulib's `libunistring' module.
-if test "x$LTLIBUNISTRING" != "x"; then
-  LIBS="$LTLIBUNISTRING $LIBS"
-else
+if test "x$LTLIBUNISTRING" = "x"; then
   AC_MSG_ERROR([GNU libunistring is required, please install it.])
 fi
 
@@ -1231,8 +1229,9 @@ main ()
 #--------------------------------------------------------------------
 PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
 
-CFLAGS="$BDW_GC_CFLAGS $CFLAGS"
+save_LIBS="$LIBS"
 LIBS="$BDW_GC_LIBS $LIBS"
+CFLAGS="$BDW_GC_CFLAGS $CFLAGS"
 
 # `GC_do_blocking ()' is available in GC 7.1 but not declared.
 AC_CHECK_FUNCS([GC_do_blocking])
@@ -1249,6 +1248,8 @@ AC_CHECK_TYPE([GC_fn_type],
   [],
   [#include <gc/gc.h>])
 
+LIBS="$save_LIBS"
+
 
 AC_CHECK_SIZEOF(float)
 if test "$ac_cv_sizeof_float" -le "$ac_cv_sizeof_long"; then

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index de69a40..55a9764 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -451,11 +451,13 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c               \
 noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
 
 libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@
+
 libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD =         \
   @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL)        \
   $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
+
 libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS =                                                                \
-  @LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB)                                         \
+  $(BDW_GC_LIBS) $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB)                                      \
   $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(SERVENT_LIB)                                                     \
   -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@    \
   -export-dynamic -no-undefined                                                                                \