Sync isl.m4 with GCC tree

* isl.m4: Sync with GCC tree.
This commit is contained in:
H.J. Lu 2015-03-16 08:51:37 -07:00
parent 51f374927b
commit d9a4c83b86
2 changed files with 11 additions and 17 deletions

View File

@ -1,3 +1,7 @@
2015-03-16 H.J. Lu <hongjiu.lu@intel.com>
* isl.m4: Sync with GCC tree.
2015-03-16 H.J. Lu <hongjiu.lu@intel.com> 2015-03-16 H.J. Lu <hongjiu.lu@intel.com>
Sync with GCC Sync with GCC

View File

@ -68,6 +68,8 @@ AC_DEFUN([ISL_INIT_FLAGS],
ENABLE_ISL_CHECK=no ENABLE_ISL_CHECK=no
AC_MSG_WARN([using in-tree ISL, disabling version check]) AC_MSG_WARN([using in-tree ISL, disabling version check])
fi fi
isllibs="${isllibs} -lisl"
] ]
) )
@ -90,20 +92,9 @@ AC_DEFUN([ISL_REQUESTED],
] ]
) )
# _ISL_CHECK_CT_PROG(MAJOR, MINOR) # ISL_CHECK_VERSION ISL_CHECK_VERSION ()
# --------------------------------------------
# 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)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# Test the found ISL to be exact of version MAJOR.MINOR and at least # Test that ISL contains functionality added to the minimum expected version.
# REVISION.
AC_DEFUN([ISL_CHECK_VERSION], AC_DEFUN([ISL_CHECK_VERSION],
[ [
if test "${ENABLE_ISL_CHECK}" = yes ; then if test "${ENABLE_ISL_CHECK}" = yes ; then
@ -115,11 +106,10 @@ AC_DEFUN([ISL_CHECK_VERSION],
LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
LIBS="${_isl_saved_LIBS} -lisl" LIBS="${_isl_saved_LIBS} -lisl"
AC_MSG_CHECKING([for version $1.$2 of ISL]) AC_MSG_CHECKING([for compatible ISL])
AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <isl/val.h>]], [[;]])],
[gcc_cv_isl=yes], [gcc_cv_isl=yes],
[gcc_cv_isl=no], [gcc_cv_isl=no])
[gcc_cv_isl=yes])
AC_MSG_RESULT([$gcc_cv_isl]) AC_MSG_RESULT([$gcc_cv_isl])
CFLAGS=$_isl_saved_CFLAGS CFLAGS=$_isl_saved_CFLAGS