summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorspop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-28 16:43:55 +0000
committerspop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>2014-08-28 16:43:55 +0000
commitb6de67fd687ff799ca961f6d4696bff4e0df3ba5 (patch)
tree19d5d3c6ef64cc92526779c7ac07dcaff82bcdd2 /config
parent2e8e2399532c279302a383ed0c9aec8db68ab382 (diff)
downloadgcc-b6de67fd687ff799ca961f6d4696bff4e0df3ba5.tar.gz
check functionality of isl version 0.12
* config/isl.m4 (_ISL_CHECK_CT_PROG): Removed. (ISL_CHECK_VERSION): Check for functionality added to ISL 0.12 instead of checking for version number. * configure: Regenerated. * configure.ac (ISL_CHECK_VERSION): Do not use ISL version number. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@214683 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'config')
-rw-r--r--config/isl.m426
1 files changed, 5 insertions, 21 deletions
diff --git a/config/isl.m4 b/config/isl.m4
index 57ae3c5f740..0eece37bc9a 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -93,20 +93,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
@@ -118,15 +107,10 @@ AC_DEFUN([ISL_CHECK_VERSION],
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl"
- AC_MSG_CHECKING([for version $1.$2 of 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],
- [
- AC_LINK_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
- [gcc_cv_isl=yes],
- [gcc_cv_isl=no])
- ])
+ [gcc_cv_isl=no])
AC_MSG_RESULT([$gcc_cv_isl])
CFLAGS=$_isl_saved_CFLAGS