diff options
| author | Dave Brolley <brolley@redhat.com> | 2010-02-05 14:53:06 -0500 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2010-02-05 14:53:06 -0500 |
| commit | 3cad5a57f0117dcb994b72db454b3fa1805e5dd5 (patch) | |
| tree | da14b364bdc906188c9d580e9238f0faf7e33cb1 /aclocal.m4 | |
| parent | c33bb0d60c14eac88bdc50589799e1d065dec565 (diff) | |
| parent | 08173df80b532dd000b32354bd0c765acaac4659 (diff) | |
| download | systemtap-steved-3cad5a57f0117dcb994b72db454b3fa1805e5dd5.tar.gz systemtap-steved-3cad5a57f0117dcb994b72db454b3fa1805e5dd5.tar.xz systemtap-steved-3cad5a57f0117dcb994b72db454b3fa1805e5dd5.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -87,16 +87,14 @@ fi]) # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[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 +[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 fi[]dnl ])# _PKG_CONFIG @@ -140,9 +138,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 |