configure.ac: Don't accept isl 0.11.

	* configure.ac: Don't accept isl 0.11.
	* configure: Regenerate.

From-SVN: r212758

diff --git a/ChangeLog b/ChangeLog
index 73e6f28b1a4d50343a5a4a3bd4b0bfdffa210607..2c66272b88888a35cc198e28c4c36d34a22bdd58 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-17  Roman Gareev  <gareevroman@gmail.com>
+
+       * configure.ac: Don't accept isl 0.11.
+       * configure: Regenerate.
+
 2014-07-16  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
        * MAINTAINERS (Write After Approval): Add myself.

diff --git a/configure b/configure
index 353730b4d6196c16fcc8bc0fbcfbed6903b4048f..592f352e63d31e262338fc99bfddedd56c7e9d9f 100755 (executable)
--- a/configure
+++ b/configure
@@ -5889,54 +5889,6 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
 
 
 
-  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.11 of ISL" >&5
-$as_echo_n "checking for version 0.11 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.11", strlen ("isl-0.11")) != 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
-
-
-  if test "${gcc_cv_isl}" = no ; then
-
   if test "${ENABLE_ISL_CHECK}" = yes ; then
     _isl_saved_CFLAGS=$CFLAGS
     _isl_saved_LDFLAGS=$LDFLAGS
@@ -5983,7 +5935,6 @@ $as_echo "$gcc_cv_isl" >&6; }
   fi
 
 
-  fi
 
 
 

diff --git a/configure.ac b/configure.ac
index d0f7471a4fc6feab9836b57a69b67d75f45ee8cf..6c7b4df2f409df8a8b75469653795d837954366e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1650,10 +1650,7 @@ if test "x$with_isl" != "xno" &&
   dnl with user input.
   ISL_INIT_FLAGS
   dnl The versions of ISL that work for Graphite
-  ISL_CHECK_VERSION(0,11)
-  if test "${gcc_cv_isl}" = no ; then
-    ISL_CHECK_VERSION(0,12)
-  fi
+  ISL_CHECK_VERSION(0,12)
   dnl Only execute fail-action, if ISL has been requested.
   ISL_IF_FAILED([
     AC_MSG_ERROR([Unable to find a usable ISL.  See config.log for details.])])