2007-12-29 Tollef Fog Heen <tfheen@err.no>

	* 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

diff --git a/ChangeLog b/ChangeLog
index edc6965065269eb503be2d1ae9dd06af148d3a34..8ade6f835c8787103beab9960363296bf0d02877 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-12-29  Tollef Fog Heen  <tfheen@err.no>
 
+       * 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 dd4d4903fb512c052fa7ac0d5fcf19ed9a1ce28f..a0b9cd45dfc3c16325a03686e39a081ce766c5b0 100644 (file)
--- 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