mirror of
https://gitlab.freedesktop.org/pkg-config/pkg-config.git
synced 2026-02-04 02:30:26 +01:00
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
This commit is contained in:
parent
4fe6610368
commit
d251a97fa6
2 changed files with 7 additions and 2 deletions
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
4
pkg.m4
4
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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue