* configure: Regenerate after syncing config/.

5 files changed, 28 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index d1e45e4..0ff8e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-05  Alan Modra  <amodra@gmail.com>
+
+	* configure: Regenerate after syncing config/.
+
 2013-01-15  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* configure.ac: Sync with GCC repo.
diff --git a/config/ChangeLog b/config/ChangeLog
index c3079db..c6e8b25 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-15  Richard Biener  <rguenther@suse.de>
+
+	PR other/55973
+	* 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.
+
 2013-01-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove
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
diff --git a/config/isl.m4 b/config/isl.m4
index ba3fa1b..f45854d 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -66,6 +66,7 @@ AC_DEFUN([ISL_INIT_FLAGS],
     isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' '
     islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
     ENABLE_ISL_CHECK=no
+    AC_MSG_WARN([using in-tree ISL, disabling version check])
   fi
 ]
 )
@@ -113,14 +114,13 @@ AC_DEFUN([ISL_CHECK_VERSION],
     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
     LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
     LIBS="${_isl_saved_LIBS} -lisl"
-    echo $CFLAGS
 
-    AC_CACHE_CHECK([for version $1.$2 of ISL],
-      [gcc_cv_isl],
-      [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
+    AC_MSG_CHECKING([for version $1.$2 of ISL])
+    AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
 	[gcc_cv_isl=yes],
 	[gcc_cv_isl=no],
-	[gcc_cv_isl=yes])])
+	[gcc_cv_isl=yes])
+    AC_MSG_RESULT([$gcc_cv_isl])
 
     CFLAGS=$_isl_saved_CFLAGS
     LDFLAGS=$_isl_saved_LDFLAGS
diff --git a/configure b/configure
index 30b6843..e669aa0 100755
--- a/configure
+++ b/configure
@@ -5833,7 +5833,6 @@ $as_echo "$as_me: WARNING: using in-tree ISL, disabling version check" >&2;}
     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
     LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
     LIBS="${_isl_saved_LIBS} -lisl"
-    echo $CFLAGS
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
 $as_echo_n "checking for version 0.10 of ISL... " >&6; }
@@ -5882,7 +5881,6 @@ $as_echo "$gcc_cv_isl" >&6; }
     CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
     LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
     LIBS="${_isl_saved_LIBS} -lisl"
-    echo $CFLAGS
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
 $as_echo_n "checking for version 0.11 of ISL... " >&6; }