Committed Backport r171225 from mainline 2011-03-21 Rainer Orth <r...@cebitec.uni-bielefeld.de>
PR bootstrap/48120: * configure.ac (pwllib): Use LIBS instead of LDFLAGS. Add -lstdc++ -lm to LIBS. * configure: Regenerate. Index: configure =================================================================== --- configure (revision 171224) +++ configure (revision 171225) @@ -5725,8 +5725,8 @@ 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 @@ pwllib="-lpwl" fi - LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" fi ppllibs="$ppllibs -lppl_c -lppl $pwllib -lgmpxx" Index: configure.ac =================================================================== --- configure.ac (revision 171224) +++ configure.ac (revision 171225) @@ -1677,10 +1677,10 @@ 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"