PR binutils/12665binutils-2_21_1binutils-2_21-branch

	* configure.ac: Correct for minimum CLOOG version.
	* configure: Regenerate.

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f672eea8..767d17a67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-03  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/12665
+	* configure.ac: Correct for minimum CLOOG version.
+	* configure: Regenerate.
+
 2010-12-10  Tristan Gingold  <gingold@adacore.com>
 
 	* src-release (ETC_SUPPORT): add gnu-oids.texi
diff --git a/configure b/configure
index 7212797be..57c32f095 100755
--- a/configure
+++ b/configure
@@ -5759,7 +5759,7 @@ int
 main ()
 {
 
-  #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 5
+  #if ((CLOOG_VERSION_MAJOR < 0) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR < 15) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR == 15 && CLOOG_VERSION_REVISION < 5))
   choke me
   #endif
 
@@ -5775,7 +5775,7 @@ int
 main ()
 {
 
-  #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 9
+  #if ((CLOOG_VERSION_MAJOR < 0) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR < 15) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR == 15 && CLOOG_VERSION_REVISION < 5))
   choke me
   #endif
 
diff --git a/configure.ac b/configure.ac
index 19cf53f6a..fa26f9afa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1666,11 +1666,11 @@ if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then
   CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
   AC_MSG_CHECKING([for version 0.15.5 (or later revision) of CLooG])
   AC_TRY_COMPILE([#include "cloog/cloog.h"],[
-  #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 5
+  #if ((CLOOG_VERSION_MAJOR < 0) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR < 15) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR == 15 && CLOOG_VERSION_REVISION < 5))
   choke me
   #endif
   ], [AC_TRY_COMPILE([#include "cloog/cloog.h"],[
-  #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 9
+  #if ((CLOOG_VERSION_MAJOR < 0) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR < 15) || (CLOOG_VERSION_MAJOR == 0 && CLOOG_VERSION_MINOR == 15 && CLOOG_VERSION_REVISION < 5))
   choke me
   #endif
   ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],