From 0dab2e31e5ab493233daf8e2feab24c6053fcb95 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 29 Sep 2012 15:22:16 +0000
Subject: [PATCH] Sync config with GCC

2012-09-03  Richard Guenther  <rguenther@suse.de>

	PR bootstrap/54138
	* config/cloog.m4: Adjust for toplevel reorg.
	* config/isl.m4: Adjust.
---
 config/ChangeLog |  6 ++++++
 config/cloog.m4  | 12 +-----------
 config/isl.m4    | 12 ------------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index 42eacd42606..7db0c6b04c3 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -2,6 +2,12 @@
 
 	* mt-sde: Change -mcode-xonly to -mcode-readable=pcrel.
 
+2012-09-03  Richard Guenther  <rguenther@suse.de>
+
+	PR bootstrap/54138
+	* config/cloog.m4: Adjust for toplevel reorg.
+	* config/isl.m4: Adjust.
+
 2012-08-26  Art Haas <ahaas@impactweather.com>
 
 	* cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test.
diff --git a/config/cloog.m4 b/config/cloog.m4
index 5193f4e45d7..a92ef2ea7bd 100644
--- a/config/cloog.m4
+++ b/config/cloog.m4
@@ -22,12 +22,6 @@
 # Initialize clooglibs/clooginc according to the user input.
 AC_DEFUN([CLOOG_INIT_FLAGS],
 [
-  AC_ARG_WITH(cloog,
-    [AS_HELP_STRING(
-      [--with-cloog=PATH],
-      [Specify prefix directory for the installed CLooG-PPL package.
-       Equivalent to --with-cloog-include=PATH/include
-       plus --with-cloog-lib=PATH/lib])])
   AC_ARG_WITH([cloog-include],
     [AS_HELP_STRING(
       [--with-cloog-include=PATH],
@@ -72,11 +66,7 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
   fi
 
   clooginc="-DCLOOG_INT_GMP ${clooginc}"
-  clooglibs="${clooglibs} -lcloog-isl ${isllibs}"
-
-  dnl Flags needed for CLOOG
-  AC_SUBST(clooglibs)
-  AC_SUBST(clooginc)
+  clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl"
 ]
 )
 
diff --git a/config/isl.m4 b/config/isl.m4
index 4f397246e2e..ba3fa1b7f83 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -23,12 +23,6 @@
 # Initialize isllibs/islinc according to the user input.
 AC_DEFUN([ISL_INIT_FLAGS],
 [
-  AC_ARG_WITH(isl,
-    [AS_HELP_STRING(
-      [--with-isl=PATH],
-      [Specify prefix directory for the installed ISL package.
-       Equivalent to --with-isl-include=PATH/include
-       plus --with-isl-lib=PATH/lib])])
   AC_ARG_WITH([isl-include],
     [AS_HELP_STRING(
       [--with-isl-include=PATH],
@@ -73,12 +67,6 @@ AC_DEFUN([ISL_INIT_FLAGS],
     islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
     ENABLE_ISL_CHECK=no
   fi
-
-  isllibs="${isllibs} -lisl"
-
-  dnl Flags needed for ISL
-  AC_SUBST(isllibs)
-  AC_SUBST(islinc)
 ]
 )
 
-- 
2.30.2