Sync toplevel configure.ac with GCC

[deliverable/binutils-gdb.git] / config / isl.m4

diff --git a/config/isl.m4 b/config/isl.m4
index ba3fa1b7f83c2d2c2d8eb0038ec0426c1fda343f..459fac1e3e7027bf0ce3f1c09b3e167f349602f9 100644 (file)
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -66,7 +66,10 @@ AC_DEFUN([ISL_INIT_FLAGS],
     isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
     islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
     ENABLE_ISL_CHECK=no
+    AC_MSG_WARN([using in-tree ISL, disabling version check])
   fi
+
+  isllibs="${isllibs} -lisl"
 ]
 )
 
@@ -89,20 +92,9 @@ AC_DEFUN([ISL_REQUESTED],
 ]
 )
 
-# _ISL_CHECK_CT_PROG(MAJOR, MINOR)
-# --------------------------------------------
-# Helper for verifying ISL compile time version.
-m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM(
-  [#include <isl/version.h>
-   #include <string.h>],
-  [if (strncmp (isl_version (), "isl-$1.$2", strlen ("isl-$1.$2")) != 0)
-     return 1;
-   ])])
-
-# ISL_CHECK_VERSION ISL_CHECK_VERSION (MAJOR, MINOR)
+# ISL_CHECK_VERSION ISL_CHECK_VERSION ()
 # ----------------------------------------------------------------
-# Test the found ISL to be exact of version MAJOR.MINOR and at least
-# REVISION.
+# Test that ISL contains functionality added to the minimum expected version.
 AC_DEFUN([ISL_CHECK_VERSION],
 [
   if test "${ENABLE_ISL_CHECK}" = yes ; then
@@ -113,14 +105,12 @@ AC_DEFUN([ISL_CHECK_VERSION],
     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
     LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
     LIBS="${_isl_saved_LIBS} -lisl"
-    echo $CFLAGS
 
-    AC_CACHE_CHECK([for version $1.$2 of ISL],
-      [gcc_cv_isl],
-      [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
+    AC_MSG_CHECKING([for compatible ISL])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <isl/val.h>]], [[;]])],
        [gcc_cv_isl=yes],
-       [gcc_cv_isl=no],
-       [gcc_cv_isl=yes])])
+       [gcc_cv_isl=no])
+    AC_MSG_RESULT([$gcc_cv_isl])
 
     CFLAGS=$_isl_saved_CFLAGS
     LDFLAGS=$_isl_saved_LDFLAGS