Guard against M4 versions with a buggy strstr.

[thirdparty/binutils-gdb.git] / config / cloog.m4

diff --git a/config/cloog.m4 b/config/cloog.m4
index 96ebd4d134ba1f8f31adf7af6d2f288225956f4d..e95b98d31478880545ef9c18e0241b8409e18543 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
@@ -89,7 +88,9 @@ AC_DEFUN([CLOOG_REQUESTED],
 [
   AC_REQUIRE([CLOOG_INIT_FLAGS])
 
-  if test "x${with_cloog}" != x \
+  if test "x${with_cloog}" = xno; then
+    $2
+  elif test "x${with_cloog}" != x \
     || test "x${with_cloog_include}" != x \
     || test "x${with_cloog_lib}" != x ; then
     $1
@@ -178,7 +179,7 @@ AC_DEFUN([CLOOG_FIND_FLAGS],
       ;;
     "ISL")
       clooginc="${clooginc} ${_cloogorginc}"
-      clooglibs="${clooglibs} -lcloog-isl"
+      clooglibs="${clooglibs} -lcloog-isl -lisl"
       cloog_org=yes
       ;;
     "PPL")