2013-09-21 Jan-Benedict Glaw <jbglaw@lug-owl.de>

	* configure.ac: Update from GCC.
	* configure: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index a93e13e36d576ba911ba6d5a678d3e40164e1e57..ec02806c727b84082e69eace7500eb7223e943f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-21  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
+
+       * configure.ac: Update from GCC.
+       * configure: Regenerate.
+
 2013-09-20  Alan Modra  <amodra@gmail.com>
 
        * libtool.m4 (_LT_ENABLE_LOCK <ld -m flags>): Remove non-canonical

diff --git a/configure b/configure
index ee45e1b00f90f14cd8b58794d29ac99b5e8b5dc4..a91689ff4199493e7bfc922d3cb7941fb8a01dda 100755 (executable)
--- a/configure
+++ b/configure
@@ -5965,6 +5965,55 @@ $as_echo "$gcc_cv_isl" >&6; }
   fi
 
 
+    if test "${gcc_cv_isl}" = no ; 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}"
+    LIBS="${_isl_saved_LIBS} -lisl"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.12 of ISL" >&5
+$as_echo_n "checking for version 0.12 of ISL... " >&6; }
+    if test "$cross_compiling" = yes; then :
+  gcc_cv_isl=yes
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <isl/version.h>
+   #include <string.h>
+int
+main ()
+{
+if (strncmp (isl_version (), "isl-0.12", strlen ("isl-0.12")) != 0)
+     return 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  gcc_cv_isl=yes
+else
+  gcc_cv_isl=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5
+$as_echo "$gcc_cv_isl" >&6; }
+
+    CFLAGS=$_isl_saved_CFLAGS
+    LDFLAGS=$_isl_saved_LDFLAGS
+    LIBS=$_isl_saved_LIBS
+  fi
+
+
+    fi
   fi
 
 

diff --git a/configure.ac b/configure.ac
index 6f3d801ab06a0f6be6bf8e7acd2af700b58956ad..d72b40a7af9b59df6c8a56bfbe507e9397ad8d5f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1653,6 +1653,9 @@ if test "x$with_isl" != "xno" &&
   ISL_CHECK_VERSION(0,10)
   if test "${gcc_cv_isl}" = no ; then
     ISL_CHECK_VERSION(0,11)
+    if test "${gcc_cv_isl}" = no ; then
+      ISL_CHECK_VERSION(0,12)
+    fi
   fi
   dnl Only execute fail-action, if ISL has been requested.
   ISL_IF_FAILED([