Fix ISL check with static libisl

	toplevel:
	* configure: Regenerate.

	config:
	* isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS.

From-SVN: r189207

diff --git a/ChangeLog b/ChangeLog
index 0c95b9bc4b14931e804e3cd619c27ab8d70ffa53..72ee3692070b466303fb18100a05db42a0b57ee8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * configure: Regenerate.
+
 2012-07-02  Janis Johnson  <janisjo@codesourcery.com>
 
        * MAINTAINERS (Various Maintainers): Add myself as testsuite

diff --git a/config/ChangeLog b/config/ChangeLog
index c2c93fc2e398c56762fdb2d257319b86101c5edd..aa4e0a3de82d6f247d117e4f1fcbd900739f076c 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS.
+
 2012-07-02  Richard Guenther  <rguenther@suse.de>
 
        * isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer.

diff --git a/config/isl.m4 b/config/isl.m4
index c5411587c1df63dff39ed5606243eb0176708822..152d422ef908f707a22323788ad1b1eb6923e3b0 100644 (file)
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -120,9 +120,11 @@ AC_DEFUN([ISL_CHECK_VERSION],
   if test "${ENABLE_ISL_CHECK}" = yes ; then
     _isl_saved_CFLAGS=$CFLAGS
     _isl_saved_LDFLAGS=$LDFLAGS
+    _isl_saved_LIBS=$LIBS
 
     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
-    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} -lisl"
+    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
+    LIBS="${_isl_saved_LIBS} -lisl"
     echo $CFLAGS
 
     AC_CACHE_CHECK([for version $1.$2 of ISL],
@@ -133,6 +135,7 @@ AC_DEFUN([ISL_CHECK_VERSION],
 
     CFLAGS=$_isl_saved_CFLAGS
     LDFLAGS=$_isl_saved_LDFLAGS
+    LIBS=$_isl_saved_LIBS
   fi
 ]
 )

diff --git a/configure b/configure
index 0dd80caba4d3720feeb114b5e92589c7d8d325f6..d452fa7c2b448df2d908d85e5c26ed2174999cde 100755 (executable)
--- a/configure
+++ b/configure
@@ -5689,9 +5689,11 @@ if test "x$with_isl" != "xno"; then
   if test "${ENABLE_ISL_CHECK}" = yes ; then
     _isl_saved_CFLAGS=$CFLAGS
     _isl_saved_LDFLAGS=$LDFLAGS
+    _isl_saved_LIBS=$LIBS
 
     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
-    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs} -lisl"
+    LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
+    LIBS="${_isl_saved_LIBS} -lisl"
     echo $CFLAGS
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
@@ -5734,6 +5736,7 @@ $as_echo "$gcc_cv_isl" >&6; }
 
     CFLAGS=$_isl_saved_CFLAGS
     LDFLAGS=$_isl_saved_LDFLAGS
+    LIBS=$_isl_saved_LIBS
   fi