* tests/early-libtool.at: Pass $CPPFLAGS and $CFLAGS to

compiler when compiling for extra flags that might be
needed for ANSI-compliance, 64-bit, etc. The environment
we compile with should match the environment libtool was
compiled with.

diff --git a/ChangeLog b/ChangeLog
index b2e256f74e270ebde2c5c85138f1274f6a665fba..66d3e260b81353d49ca33a006f6d5d36950a3aad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-18  Albert Chin-A-Young <china@thewrittenword.com>
+
+       * tests/early-libtool.at: Pass $CPPFLAGS and $CFLAGS to
+       compiler when compiling for extra flags that might be
+       needed for ANSI-compliance, 64-bit, etc. The environment
+       we compile with should match the environment libtool was
+       compiled with.
+
 2006-05-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix mode=compile time regression of CVS HEAD over branch-1-5.

diff --git a/tests/early-libtool.at b/tests/early-libtool.at
index 6e3c41b5a655dd66b9df350ca9c876c0d8fd4c2c..3f9d2b4e8cc6b7273f7389bfad74bb1d3ca8bc06 100644 (file)
--- a/tests/early-libtool.at
+++ b/tests/early-libtool.at
@@ -44,9 +44,13 @@ EXEEXT = @EXEEXT@
 LIBTOOL = @LIBTOOL@
 OBJEXT = @OBJEXT@
 
-COMPILE = $(CC) $(DEFAULT_INCLUDES)
-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFAULT_INCLUDES)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFAULT_INCLUDES)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFAULT_INCLUDES)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 all: hell$(EXEEXT)
 
@@ -135,10 +139,10 @@ hello (void)
 _EOF
 
 # Prove that we can run libtool from inside configure:
-$SHELL ./libtool --mode=compile --tag=CC "$CC" -I. -I$srcdir \
-    -c -o hello.lo hello.c  || exit 1
-$SHELL ./libtool --mode=link --tag=CC "$CC" -o libhello.la \
-    -rpath /notexist hello.lo || exit 1
+$SHELL ./libtool --mode=compile --tag=CC "$CC" $CPPFLAGS $CFLAGS \
+    -I. -I$srcdir -c -o hello.lo hello.c  || exit 1
+$SHELL ./libtool --mode=link --tag=CC "$CC" $CFLAGS $LDFLAGS \
+    -o libhello.la -rpath /notexist hello.lo || exit 1
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@@ -154,8 +158,12 @@ EXEEXT = @EXEEXT@
 LIBTOOL = @LIBTOOL@
 OBJEXT = @OBJEXT@
 
-COMPILE = $(CC) $(DEFAULT_INCLUDES)
-LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) -o $@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
+
+COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFAULT_INCLUDES)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
 hell$(EXEEXT): main.$(OBJEXT) libhello.la
        $(LINK) main.$(OBJEXT) libhello.la