diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-09-26 22:21:04 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-09-26 22:21:04 +0200 |
| commit | aeda5d1ae9171f5059d44065796984f390832c6a (patch) | |
| tree | adb5fbda13da5ce1d6175468cb9f847c570a123c /aclocal.m4 | |
| parent | Document changes and release 3.0.1-1 (diff) | |
| parent | New upstream version 3.2.0 (diff) | |
| download | krb5-auth-dialog-aeda5d1ae9171f5059d44065796984f390832c6a.tar.gz krb5-auth-dialog-aeda5d1ae9171f5059d44065796984f390832c6a.tar.bz2 krb5-auth-dialog-aeda5d1ae9171f5059d44065796984f390832c6a.zip | |
Merge commit 'upstream/3.2.0'
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -9199,7 +9199,8 @@ AC_DEFUN([AM_NLS], # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -9245,7 +9246,8 @@ m4_define([_PKG_CONFIG], 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_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried @@ -9293,9 +9295,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _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 --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |