diff options
author | Richard Biener <rguenther@suse.de> | 2013-01-15 13:07:56 +0000 |
---|---|---|
committer | Richard Biener <rguenth@gcc.gnu.org> | 2013-01-15 13:07:56 +0000 |
commit | 2869f0ff8a6aeee0b5b776616b61ee4032a5d354 (patch) | |
tree | 0b0ad10065ff420dea6ae0512dcd2d6c544cfc04 /config/cloog.m4 | |
parent | 783a3a053465d7f68b3bb5ae5bee631ea6297fa5 (diff) | |
download | gcc-2869f0ff8a6aeee0b5b776616b61ee4032a5d354.zip gcc-2869f0ff8a6aeee0b5b776616b61ee4032a5d354.tar.gz gcc-2869f0ff8a6aeee0b5b776616b61ee4032a5d354.tar.bz2 |
re PR other/55973 (r195150 doesn't properly handle out of tree isl 0.11.1)
2013-01-15 Richard Biener <rguenther@suse.de>
PR other/55973
* configure: Re-generate.
config/
* isl.m4 (ISL_INIT_FLAGS): Warn about disabled version check
for in-tree build.
(ISL_CHECK_VERSION): Do not use AC_CACHE_CHECK.
* cloog.m4 (CLOOG_INIT_FLAGS): Disable version check for
in-tree build and warn about that.
(CLOOG_CHECK_VERSION): Do not use AC_CACHE_CHECK.
From-SVN: r195195
Diffstat (limited to 'config/cloog.m4')
-rw-r--r-- | config/cloog.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/config/cloog.m4 b/config/cloog.m4 index a92ef2e..670cd65 100644 --- a/config/cloog.m4 +++ b/config/cloog.m4 @@ -57,12 +57,15 @@ AC_DEFUN([CLOOG_INIT_FLAGS], if test "x${with_cloog_lib}" != x; then clooglibs="-L$with_cloog_lib" fi - dnl If no --with-cloog flag was specified and there is in-tree ClooG - dnl source, set up flags to use that. + dnl If no --with-cloog flag was specified and there is in-tree CLooG + dnl source, set up flags to use that and skip any version tests + dnl as we cannot run them reliably before building CLooG if test "x${clooginc}" = x && test "x${clooglibs}" = x \ && test -d ${srcdir}/cloog; then clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' ' clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include ' + ENABLE_CLOOG_CHECK=no + AC_MSG_WARN([using in-tree CLooG, disabling version check]) fi clooginc="-DCLOOG_INT_GMP ${clooginc}" @@ -115,11 +118,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION], CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], - [gcc_cv_cloog], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], + AC_MSG_CHECKING([for version $1.$2.$3 of CLooG]) + AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], [gcc_cv_cloog=yes], - [gcc_cv_cloog=no])]) + [gcc_cv_cloog=no]) + AC_MSG_RESULT([$gcc_cv_cloog]) CFLAGS=$_cloog_saved_CFLAGS LDFLAGS=$_cloog_saved_LDFLAGS |