diff options
| author | Ritesh Raj Sarraf <rrs@researchut.com> | 2010-05-20 01:24:36 +0530 |
|---|---|---|
| committer | Ritesh Raj Sarraf <rrs@researchut.com> | 2010-05-20 01:24:36 +0530 |
| commit | dfac47cf3aa4279c25915a1a8f892722d1ffe4e5 (patch) | |
| tree | dcbc3ae2245e7b5bc7b32d9f6db848475e9d80ac /aclocal.m4 | |
| parent | a2c4d1e83d89a4451726b769faf855eb02d15cb3 (diff) | |
Imported Upstream version 1.0.12upstream/1.0.12
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 24 |
1 files changed, 11 insertions, 13 deletions
@@ -927,16 +927,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 @@ -980,9 +978,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 @@ -1007,7 +1005,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |