diff --git a/ChangeLog b/ChangeLog index 2c66272b888..dc22839ea93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-20 Roman Gareev + + * configure.ac: Accept only CLooG 0.18.1. + * configure: Regenerate. + 2014-07-17 Roman Gareev * configure.ac: Don't accept isl 0.11. diff --git a/configure b/configure index 592f352e63d..f5e8d6a5218 100755 --- a/configure +++ b/configure @@ -6031,50 +6031,8 @@ $as_echo "$as_me: WARNING: using in-tree CLooG, disabling version check" >&2;} CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17.0 of CLooG" >&5 -$as_echo_n "checking for version 0.17.0 of CLooG... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include "cloog/version.h" -int -main () -{ -#if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 17 \ - || CLOOG_VERSION_REVISION < 0 - choke me - #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gcc_cv_cloog=yes -else - gcc_cv_cloog=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5 -$as_echo "$gcc_cv_cloog" >&6; } - - CFLAGS=$_cloog_saved_CFLAGS - LDFLAGS=$_cloog_saved_LDFLAGS - fi - - - if test "${gcc_cv_cloog}" = no ; then - - - - if test "${ENABLE_CLOOG_CHECK}" = yes ; then - _cloog_saved_CFLAGS=$CFLAGS - _cloog_saved_LDFLAGS=$LDFLAGS - - CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5 -$as_echo_n "checking for version 0.18.0 of CLooG... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.1 of CLooG" >&5 +$as_echo_n "checking for version 0.18.1 of CLooG... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "cloog/version.h" @@ -6083,7 +6041,7 @@ main () { #if CLOOG_VERSION_MAJOR != 0 \ || CLOOG_VERSION_MINOR != 18 \ - || CLOOG_VERSION_REVISION < 0 + || CLOOG_VERSION_REVISION < 1 choke me #endif ; @@ -6104,7 +6062,6 @@ $as_echo "$gcc_cv_cloog" >&6; } fi - fi diff --git a/configure.ac b/configure.ac index 6c7b4df2f40..7a04c05147c 100644 --- a/configure.ac +++ b/configure.ac @@ -1661,10 +1661,7 @@ if test "x$with_isl" != "xno" && dnl with user input. CLOOG_INIT_FLAGS dnl The versions of CLooG that work for Graphite. - CLOOG_CHECK_VERSION(0,17,0) - if test "${gcc_cv_cloog}" = no ; then - CLOOG_CHECK_VERSION(0,18,0) - fi + CLOOG_CHECK_VERSION(0,18,1) dnl Only execute fail-action, if CLooG has been requested. CLOOG_IF_FAILED([