This makes us accept the CLooG 0.18.0 and ISL 0.11.1 combo.
It's probably not the best stage to move the version checks to
gcc/ where we can rely on built in-tree ISL/CLooG, so this avoids
it with the caveat that in-tree CLooG 0.18.0 will fail the
version check (they no longer ship built version.h but only
version.h.in).
I verified all GRAPHITE tests pass with 0.18.0/0.11.1.
Ok for trunk?
Or do people prefer to move CLooG/ISL checks to gcc/ configure
time to fix the in-tree use of 0.18.0 and also do version checks
of in-tree ISL at all (they don't have a version.h).
Thanks,
Richard.
2013-01-14 Richard Biener <rguent...@suse.de>
* configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0.
* configure: Re-generate.
Index: configure.ac
===================================================================
--- configure.ac (revision 195144)
+++ configure.ac (working copy)
@@ -1606,8 +1606,11 @@ if test "x$with_isl" != "xno" &&
dnl Provide configure switches and initialize islinc & isllibs
dnl with user input.
ISL_INIT_FLAGS
- dnl The minimal version of ISL required for Graphite.
+ dnl The versions of ISL that work for Graphite
ISL_CHECK_VERSION(0,10)
+ if test "${gcc_cv_isl}" = no ; then
+ ISL_CHECK_VERSION(0,11)
+ fi
dnl Only execute fail-action, if ISL has been requested.
ISL_IF_FAILED([
AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
@@ -1617,11 +1620,11 @@ if test "x$with_isl" != "xno" &&
dnl Provide configure switches and initialize clooginc & clooglibs
dnl with user input.
CLOOG_INIT_FLAGS
- dnl The minimal version of CLooG required for Graphite.
- dnl
- dnl If we use CLooG-Legacy, the provided version information is
- dnl ignored.
+ 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
dnl Only execute fail-action, if CLooG has been requested.
CLOOG_IF_FAILED([
