diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/configure b/configure index 76084ed5158..4af7b475754 100755 --- a/configure +++ b/configure @@ -3855,7 +3855,7 @@ case "${host}" in { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5 $as_echo_n "checking to see if cat works as expected... " >&6; } echo a >cygwin-cat-check -if test `cat cygwin-cat-check` == a ; then +if test `cat cygwin-cat-check` = a ; then rm cygwin-cat-check { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -5750,7 +5750,7 @@ pplinc= if test "${with_ppl+set}" = set; then : withval=$with_ppl; else - with_ppl=no + with_ppl=yes fi @@ -5770,10 +5770,11 @@ case $with_ppl in no) ppllibs= ;; + yes) + ;; *) 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 @@ -5781,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. @@ -5797,7 +5796,7 @@ else fi -if test "${ENABLE_PPL_CHECK}" = "yes"; then +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 $ppl_major_version.$ppl_minor_version of PPL" >&5 @@ -5822,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" @@ -5842,7 +5841,7 @@ clooginc=" -DCLOOG_PPL_BACKEND " if test "${with_cloog+set}" = set; then : withval=$with_cloog; else - with_cloog=no + with_cloog=yes fi @@ -5858,15 +5857,20 @@ if test "${with_cloog_lib+set}" = set; then : fi +if test "x$with_ppl" = "xno"; then + with_cloog=no +fi + case $with_cloog in no) clooglibs= clooginc= ;; + yes) + ;; *) 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 @@ -5874,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. @@ -5890,7 +5892,7 @@ else fi -if test "${ENABLE_CLOOG_CHECK}" = "yes"; then +if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct version of CLooG" >&5 @@ -5957,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" @@ -5985,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" @@ -6593,7 +6595,10 @@ if test -d ${srcdir}/gcc; then # If LTO is enabled, add the LTO front end. extra_host_libiberty_configure_flags= if test "$enable_lto" = "yes" ; then - new_enable_languages="${new_enable_languages}lto," + case ,${enable_languages}, in + *,lto,*) ;; + *) enable_languages="${enable_languages},lto" ;; + esac if test "${ENABLE_GOLD}" = "yes" ; then configdirs="$configdirs lto-plugin" extra_host_libiberty_configure_flags=--enable-shared |