* libtool.m4 (LDFLAGS, LIBS): pass them to ltconfig, for the tests

that involve linking
* Makefile.am (LDFLAGS, LIBS, libtool, clibtool): ditto
* tests/Makefile.am (CFLAGS, CPPFLAGS, LDFLAGS, LIBS): set
(LDFLAGS, LIBS, TESTS_ENVIRONMENT): pass them down

diff --git a/ChangeLog b/ChangeLog
index bbb4816b477f14f21b036d89388698aa1228a73e..b80da4cfe6f64b56d3c9ebadbc4ec94e0e625acb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-04-02  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libtool.m4 (LDFLAGS, LIBS): pass them to ltconfig, for the tests 
+       that involve linking
+       * Makefile.am (LDFLAGS, LIBS, libtool, clibtool): ditto
+       * tests/Makefile.am (CFLAGS, CPPFLAGS, LDFLAGS, LIBS): set
+       (LDFLAGS, LIBS, TESTS_ENVIRONMENT): pass them down
+
 1999-04-02  Erez Zadok  <ezk@cs.columbia.edu>
 
        * doc/PLATFORMS: 1.2f ok on various versions of hpux cc

diff --git a/Makefile.am b/Makefile.am
index 45cb47f2565ad0df7cbef75093bb7d7d5b9065c8..5d1b4c06ad706fd497e772e126c87cf37a9c73d3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,8 @@ DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
 # We need to export these variables when we run ltconfig.
 CFLAGS = @CFLAGS@
 CPPLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS= @LIBS@
 
 aclocal_macros = libtool.m4
 
@@ -28,14 +30,16 @@ bin_SCRIPTS = libtool libtoolize
 
 libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
        CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       LD="$(LD)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+       LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
        $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
          --output=$@ $(srcdir)/ltmain.sh
 
 # Experimental C version of libtool.
 clibtool: $(srcdir)/ltmain.c $(srcdir)/ltconfig
        CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       LD="$(LD)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+       LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+       LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
        $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
          --output=$@ $(srcdir)/ltmain.c
 

diff --git a/libtool.m4 b/libtool.m4
index f8b163aae37acb2681da6fb23ab02a32411649b3..eed89b4ae0ded5bfe7f23b52b2abc064e65be581 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -21,7 +21,7 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 35 AC_PROG_LIBTOOL
+# serial 36 AC_PROG_LIBTOOL
 AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
 
@@ -30,8 +30,8 @@ AC_CACHE_SAVE
 
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
+LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" LN_S="$LN_S" \
+NM="$NM" RANLIB="$RANLIB" DLLTOOL="$DLLTOOL" AS="$AS" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || AC_MSG_ERROR([libtool configure failed])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 91ca3064fc5bb023a770f5e361dfd71c8df837fb..fe683883656a9ce13ce8a4d682e657d85ae4d42c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,9 +27,16 @@ cdemo-static.test: $(top_builddir)/libtool
 $(top_builddir)/libtool:
        cd $(top_builddir) && $(MAKE) all
 
+# We should export these variables when we run ltconfig.
+CFLAGS = @CFLAGS@
+CPPLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+
 # Be sure to reexport important environment variables.
 TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-       LD="$(LD)" NM="$(NM)" RANLIB="$(RANLIB)" LN_S="$(LN_S)"
+       LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+       LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)"
 
 EXTRA_DIST = defs $(TESTS)