# HG changeset patch # User Matti Hamalainen # Date 1208724207 -10800 # Node ID 973f75277ce42ce06889847adc9c2562e4e66c76 # Parent 4d1dffd9ebf78df478a4362e7e73f5b924a1080f Some old versions of pkg-config don't _really_ obey --errors-to-stdout, so we redirect stderr to stdout on shell level. diff -r 4d1dffd9ebf7 -r 973f75277ce4 m4/pkg.m4 --- a/m4/pkg.m4 Sun Apr 20 23:17:22 2008 +0300 +++ b/m4/pkg.m4 Sun Apr 20 23:43:27 2008 +0300 @@ -33,7 +33,7 @@ if test "x$PKG_CONFIG" != "x"; then _pkg_min_version=m4_default([$1], [0.9.0]) AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version ; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -119,9 +119,9 @@ if test "x$pkg_failed" = "xyes"; then _PKG_SHORT_ERRORS_SUPPORTED if test "x$_pkg_short_errors_supported" = "xyes"; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD