From 8d8eef9acce4ee4356d42584846e34169a66060d Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 12 Feb 2011 14:40:09 +0000 Subject: Sync toplevel and config/ from GCC. /: Sync from GCC: 2011-02-12 Alexandre Oliva PR lto/47225 * Makefile.def (lto-plugin): Double dash for enable-shared. (configure-gcc): Depend on all-lto-plugin. * Makefile.in: Rebuilt. 2011-02-11 Ralf Wildenhues * configure.ac: Remove extra bracket. * configure: Regenerate. 2011-02-06 Kai Tietz PR lto/47225 * Makefile.def: Add dependency for install-gcc on install-lto-plugin. * Makfile.in: Regenerated 2011-01-25 Jakub Jelinek * configure.ac: If with_ppl is no, move setting with_cloog=no after CLOOG_REQUESTED check. * configure: Regenerated. 2011-01-25 Sebastian Pop * configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and CLooG has been requested. * configure: Regenerated. 2011-01-25 Sebastian Pop * configure: Regenerated. * configure.ac: Check for version 0.11 (or later revision) of PPL. 2011-01-25 Tobias Grosser * configure: Regenerated. * configure.ac: Use CLOOG_CHECK_VERSION(0,16,1). 2011-01-07 Jan Hubicka PR lto/47225 * Makefile.in: Regenerate. * Makefile.def (lto-plugin): Always pass enable-shared to the plugin configure. config/: 2011-01-25 Jakub Jelinek * cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog. 2011-01-10 Jan Hubicka * bootstrap-lto.mk: -fuse-linker-plugin is default now; pass -fno-lto to STAGEprofile. --- configure | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 518fe6a..501c6ff 100755 --- a/configure +++ b/configure @@ -5716,8 +5716,8 @@ fi if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $pplinc $gmpinc" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 (or later revision) of PPL" >&5 -$as_echo_n "checking for version 0.10 (or later revision) of PPL... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 (or later revision) of PPL" >&5 +$as_echo_n "checking for version 0.11 (or later revision) of PPL... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include "ppl_c.h" @@ -5725,7 +5725,7 @@ int main () { - #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10 + #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11 choke me #endif @@ -5817,6 +5817,23 @@ fi if test "x$with_ppl" = "xno"; then + + + + if test "x${with_cloog}" = xno; then + graphite_requested=no + elif test "x${with_cloog}" != x \ + || test "x${with_cloog_include}" != x \ + || test "x${with_cloog_lib}" != x ; then + graphite_requested=yes + else + graphite_requested=no + fi + + + if test "${graphite_requested}" = yes; then + as_fn_error "Unable to find a usable PPL. See config.log for details." "$LINENO" 5 + fi with_cloog=no fi if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ @@ -5978,8 +5995,8 @@ $as_echo "$gcc_cv_cloog_type" >&6; } LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" if test "${cloog_org}" = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.14.0 of CLooG" >&5 -$as_echo_n "checking for version 0.14.0 of CLooG... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 +$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -5990,8 +6007,8 @@ int main () { #if CLOOG_VERSION_MAJOR != 0 \ - || CLOOG_VERSION_MINOR != 14 \ - || CLOOG_VERSION_REVISION < 0 + || CLOOG_VERSION_MINOR != 16 \ + || CLOOG_VERSION_REVISION < 1 choke me #endif ; @@ -6069,7 +6086,9 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - if test "x${with_cloog}" != x \ + if test "x${with_cloog}" = xno; then + graphite_requested=no + elif test "x${with_cloog}" != x \ || test "x${with_cloog_include}" != x \ || test "x${with_cloog_lib}" != x ; then graphite_requested=yes @@ -6090,7 +6109,7 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } && test "x${clooglibs}" = x \ && test "x${clooginc}" = x ; then - as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5 + as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5 fi -- cgit v1.1