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.

diff --git a/config/ChangeLog b/config/ChangeLog
index 42eacd4260687b92797ef20d2c85d465e7cb1bf2..7db0c6b04c301ea275832064986fc750a7e342a0 100644 (file)
--- 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 5193f4e45d77a983decda361ed31f3279b569587..a92ef2ea7bd7e615fd8e86e73eeb861ec8550e2c 100644 (file)
--- 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 4f397246e2e6fa0b9ee4df030d6fd72589694226..ba3fa1b7f83c2d2c2d8eb0038ec0426c1fda343f 100644 (file)
--- 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)
 ]
 )