aboutsummaryrefslogtreecommitdiff
path: root/mesalib/aclocal.m4
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-16 15:32:19 +0000
committermarha <marha@users.sourceforge.net>2010-06-16 15:32:19 +0000
commit243edb24f5179d93c849ea326fb489d3f846db71 (patch)
tree3649730a6be58d10e03a7d5b7825c1a82e5e0def /mesalib/aclocal.m4
parent2a31e38d82566c4f93773ecf9c79f2cc9abef169 (diff)
downloadvcxsrv-243edb24f5179d93c849ea326fb489d3f846db71.tar.gz
vcxsrv-243edb24f5179d93c849ea326fb489d3f846db71.tar.bz2
vcxsrv-243edb24f5179d93c849ea326fb489d3f846db71.zip
Updated to mesa-7.8.1
Diffstat (limited to 'mesalib/aclocal.m4')
-rw-r--r--mesalib/aclocal.m422
1 files changed, 12 insertions, 10 deletions
diff --git a/mesalib/aclocal.m4 b/mesalib/aclocal.m4
index 65419c757..e46192caf 100644
--- a/mesalib/aclocal.m4
+++ b/mesalib/aclocal.m4
@@ -79,14 +79,16 @@ fi])
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -130,9 +132,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 --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD