diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 49 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 57 insertions, 0 deletions
@@ -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 @@ -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 6f3d801ab..d72b40a7a 100644 --- 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([ |