diff --git a/ChangeLog b/ChangeLog index ee4c378bf..bf8f64995 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-03-21 Rainer Orth + + PR bootstrap/48120: + * configure.ac (pwllib): Use LIBS instead of LDFLAGS. + Add -lstdc++ -lm to LIBS. + * configure: Regenerate. + 2011-03-18 David Edelsohn * config.guess: Update to version 2011-02-02 diff --git a/configure b/configure index 5e97d0f6d..501caf060 100755 --- a/configure +++ b/configure @@ -5725,8 +5725,8 @@ fi if test "x$with_ppl" != xno; then if test "x$pwllib" = x; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $ppllibs" + saved_LIBS="$LIBS" + LIBS="$LIBS $ppllibs -lstdc++ -lm" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PWL_handle_timeout in -lpwl" >&5 $as_echo_n "checking for PWL_handle_timeout in -lpwl... " >&6; } if test "${ac_cv_lib_pwl_PWL_handle_timeout+set}" = set; then : @@ -5767,7 +5767,7 @@ if test "x$ac_cv_lib_pwl_PWL_handle_timeout" = x""yes; then : pwllib="-lpwl" fi - LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" fi ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx" diff --git a/configure.ac b/configure.ac index 233ce0a76..e036b5f50 100644 --- a/configure.ac +++ b/configure.ac @@ -1677,10 +1677,10 @@ fi if test "x$with_ppl" != xno; then if test "x$pwllib" = x; then - saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $ppllibs" - AC_CHECK_LIB(pwl,PWL_handle_timeout,[pwllib="-lpwl"]) - LDFLAGS="$saved_LDFLAGS" + saved_LIBS="$LIBS" + LIBS="$LIBS $ppllibs -lstdc++ -lm" + AC_CHECK_LIB(pwl, PWL_handle_timeout, [pwllib="-lpwl"]) + LIBS="$saved_LIBS" fi ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx"