From d251a97fa6b6bef222d3eacddd4ebe42ed7f8e9c Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 29 Dec 2007 16:00:37 +0100 Subject: [PATCH] 2007-12-29 Tollef Fog Heen * pkg.m4: Don't use --errors-to-stdout in pkg.m4, but rather redirect stderr to stdout. This makes pkg.m4 with old (pre 0.15) pkg-config look good, and it makes newer pkg-config with ancient pkg.m4 work well. Gnome #111054 --- ChangeLog | 5 +++++ pkg.m4 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index edc6965..8ade6f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-12-29 Tollef Fog Heen + * pkg.m4: Don't use --errors-to-stdout in pkg.m4, but rather + redirect stderr to stdout. This makes pkg.m4 with old (pre 0.15) + pkg-config look good, and it makes newer pkg-config with ancient + pkg.m4 work well. Gnome #111054 + * Update to glib 1.2.10, adjust lots of the glib patches. Gnome #81847. diff --git a/pkg.m4 b/pkg.m4 index dd4d490..a0b9cd4 100644 --- a/pkg.m4 +++ b/pkg.m4 @@ -117,9 +117,9 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --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 -- 2.39.5