mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 21:40:33 +02:00
Code Activity

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

Browse source 
* 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).
This commit is contained in:
Ludovic Courtès 2010-10-19 23:32:16 +02:00
parent 511246a193
commit abd7e37ab7
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

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

4
libguile/Makefile.am
View file

@ -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 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_DEPENDENCIES = @LIBLOBJS@
libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \ libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \
@LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL) \ @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL) \
$(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS = \ 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) \ $(GETADDRINFO_LIB) $(HOSTENT_LIB) $(SERVENT_LIB) \
-version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ \ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ \
-export-dynamic -no-undefined \ -export-dynamic -no-undefined \