sync toplevel with gcc

diff --git a/ChangeLog b/ChangeLog
index f90cfbe..21e5877 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-20  Paolo Bonzini  <bonzini@gnu.org>
+
+       * configure: Regenerate.
+
 2010-11-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        PR other/46202

diff --git a/config/ChangeLog b/config/ChangeLog
index e3d6248..5633e8c 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -2,6 +2,24 @@
 
        * cloog.m4 (CLOOG_INIT_FLAGS): Fix spelling in option names.
 
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+       * cloog.m4: Add -enable-cloog-backend=(isl|ppl|ppl-legacy) to
+       define the cloog backend to use. Furthermore, only pass the ppllibs to
+       the configure checks, if necessary.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+       * cloog.m4: Use CLooG predefined macro to check for CLooG PPL.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+       * cloog.m4: Fix typo.  verison -> version.
+
+2010-11-12  Tobias Grosser  <grosser@fim.uni-passau.de>
+
+       * cloog.m4: Pass ppl libraries to the CLooG version check.
+
 2010-11-11  Jan Hubicka  <jh@suse.cz>
 
        * bootstrap-lto: Use -flto.

diff --git a/config/cloog.m4 b/config/cloog.m4
index 96ebd4d..e1eb9e8 100644 (file)
--- a/config/cloog.m4
+++ b/config/cloog.m4
@@ -38,10 +38,9 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
       [Specify the directory for the installed CLooG library])])
 
   AC_ARG_ENABLE(cloog-backend,
-    [  --enable-cloog-backend[=backend]
-                               isl: The cloog.org isl backend
-                               ppl-legacy: The legacy ppl backend - default
-                               ppl: The cloog.org ppl backend],
+    [AS_HELP_STRING(
+      [--enable-cloog-backend[[=BACKEND]]],
+      [set the CLooG BACKEND used to either isl, ppl or ppl-legacy (default)])],
     [ if   test "x${enableval}" = "xisl"; then
        cloog_backend=isl
       elif test "x${enableval}" = "xppl"; then

diff --git a/configure b/configure
index 28f4c9f..847727b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1455,10 +1455,9 @@ Optional Features:
   --enable-libssp         build libssp directory
   --enable-build-with-cxx build with C++ compiler instead of C compiler
   --disable-ppl-version-check    disable check for PPL version
-  --enable-cloog-backend=backend
-                               isl: The cloog.org isl backend
-                               ppl-legacy: The legacy ppl backend - default
-                               ppl: The cloog.org ppl backend
+  --enable-cloog-backend[=BACKEND]
+                          set the CLooG BACKEND used to either isl, ppl or
+                          ppl-legacy (default)
   --disable-cloog-version-check
                           disable check for CLooG version
   --enable-lto            enable link time optimization support