changeset 4472:973f75277ce4

Some old versions of pkg-config don't _really_ obey --errors-to-stdout, so we redirect stderr to stdout on shell level.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 20 Apr 2008 23:43:27 +0300
parents 4d1dffd9ebf7
children 6f4ae7e116e7
files m4/pkg.m4
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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