From 3ef4da6120b88efb9c3d83dd652f6c838f105053 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 22 Oct 2009 08:56:00 +0000 Subject: 2009-10-22 Richard Guenther * configure.ac: Do not set LIBS for ppl/cloog checks. Disable cloog if the ppl version check failed. Move flags saving before setting in libelf check. * configure: Regenerate. git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@153447 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 7 +++++++ configure | 18 +++++------------- configure.ac | 18 +++++------------- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdb434be79a..00cd7e3e019 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-10-22 Richard Guenther + + * configure.ac: Do not set LIBS for ppl/cloog checks. Disable + cloog if the ppl version check failed. Move flags saving + before setting in libelf check. + * configure: Regenerate. + 2009-10-21 Richard Guenther * configure.ac: Adjust the ppl and cloog configure to work as diff --git a/configure b/configure index aa8af62cf92..7ceaafc4a15 100755 --- a/configure +++ b/configure @@ -5771,12 +5771,10 @@ case $with_ppl in ppllibs= ;; yes) - LIBS="$ppllibs $LIBS" ;; *) ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx" pplinc="-I$with_ppl/include $pplinc" - LIBS="$ppllibs $LIBS" ;; esac if test "x$with_ppl_include" != x; then @@ -5784,12 +5782,10 @@ if test "x$with_ppl_include" != x; then fi if test "x$with_ppl_lib" != x; then ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx" - LIBS="$ppllibs $LIBS" fi if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx ' pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include ' - LIBS="$ppllibs $LIBS" fi # Check whether --enable-ppl-version-check was given. @@ -5825,7 +5821,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; ppllibs= ; pplinc= +$as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CFLAGS="$saved_CFLAGS" @@ -5871,12 +5867,10 @@ case $with_cloog in clooginc= ;; yes) - LIBS="$clooglibs $LIBS" ;; *) clooglibs="-L$with_cloog/lib -lcloog" clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " - LIBS="$clooglibs $LIBS" ;; esac if test "x$with_cloog_include" != x; then @@ -5884,12 +5878,10 @@ if test "x$with_cloog_include" != x; then fi if test "x$with_cloog_lib" != x; then clooglibs="-L$with_cloog_lib -lcloog" - LIBS="$clooglibs $LIBS" fi if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog ' clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND ' - LIBS="$clooglibs $LIBS" fi # Check whether --enable-cloog-version-check was given. @@ -5967,6 +5959,10 @@ if test "${with_libelf_lib+set}" = set; then : fi + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + case $with_libelf in "") libelflibs="-lelf" @@ -5995,10 +5991,6 @@ fi LIBS="$libelflibs $LIBS" fi - saved_CFLAGS="$CFLAGS" - saved_CPPFLAGS="$CPPFLAGS" - saved_LIBS="$LIBS" - CFLAGS="$CFLAGS $libelfinc" CPPFLAGS="$CPPFLAGS $libelfinc" LIBS="$LIBS $libelflibs" diff --git a/configure.ac b/configure.ac index 431d89cdb86..34c34959b87 100644 --- a/configure.ac +++ b/configure.ac @@ -1523,12 +1523,10 @@ case $with_ppl in ppllibs= ;; yes) - LIBS="$ppllibs $LIBS" ;; *) ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx" pplinc="-I$with_ppl/include $pplinc" - LIBS="$ppllibs $LIBS" ;; esac if test "x$with_ppl_include" != x; then @@ -1536,12 +1534,10 @@ if test "x$with_ppl_include" != x; then fi if test "x$with_ppl_lib" != x; then ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx" - LIBS="$ppllibs $LIBS" fi if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx ' pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include ' - LIBS="$ppllibs $LIBS" fi AC_ARG_ENABLE(ppl-version-check, @@ -1557,7 +1553,7 @@ if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version choke me #endif - ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ]) + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ]) CFLAGS="$saved_CFLAGS" fi @@ -1586,12 +1582,10 @@ case $with_cloog in clooginc= ;; yes) - LIBS="$clooglibs $LIBS" ;; *) clooglibs="-L$with_cloog/lib -lcloog" clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND " - LIBS="$clooglibs $LIBS" ;; esac if test "x$with_cloog_include" != x; then @@ -1599,12 +1593,10 @@ if test "x$with_cloog_include" != x; then fi if test "x$with_cloog_lib" != x; then clooglibs="-L$with_cloog_lib -lcloog" - LIBS="$clooglibs $LIBS" fi if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog ' clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND ' - LIBS="$clooglibs $LIBS" fi AC_ARG_ENABLE(cloog-version-check, @@ -1644,6 +1636,10 @@ if test x"$enable_lto" = x"yes" ; then AC_ARG_WITH(libelf_lib, [ --with-libelf-lib=PATH Specify the directory for the installed libelf library]) + saved_CFLAGS="$CFLAGS" + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" + case $with_libelf in "") libelflibs="-lelf" @@ -1672,10 +1668,6 @@ if test x"$enable_lto" = x"yes" ; then LIBS="$libelflibs $LIBS" fi - saved_CFLAGS="$CFLAGS" - saved_CPPFLAGS="$CPPFLAGS" - saved_LIBS="$LIBS" - CFLAGS="$CFLAGS $libelfinc" CPPFLAGS="$CPPFLAGS $libelfinc" LIBS="$LIBS $libelflibs" -- cgit v1.2.3