1.1 --- a/aclocal.m4	Tue May 29 21:33:49 2012 +0200
     1.2 +++ b/aclocal.m4	Tue May 29 21:35:17 2012 +0200
     1.3 @@ -47,7 +47,8 @@
     1.4  # ----------------------------------
     1.5  AC_DEFUN([PKG_PROG_PKG_CONFIG],
     1.6  [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
     1.7 -m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
     1.8 +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
     1.9 +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
    1.10  AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
    1.11  AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
    1.12  AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
    1.13 @@ -93,7 +94,8 @@
    1.14      pkg_cv_[]$1="$$1"
    1.15   elif test -n "$PKG_CONFIG"; then
    1.16      PKG_CHECK_EXISTS([$3],
    1.17 -                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
    1.18 +                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
    1.19 +		      test "x$?" != "x0" && pkg_failed=yes ],
    1.20  		     [pkg_failed=yes])
    1.21   else
    1.22      pkg_failed=untried
    1.23 @@ -141,9 +143,9 @@
    1.24     	AC_MSG_RESULT([no])
    1.25          _PKG_SHORT_ERRORS_SUPPORTED
    1.26          if test $_pkg_short_errors_supported = yes; then
    1.27 -	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
    1.28 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
    1.29          else 
    1.30 -	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
    1.31 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
    1.32          fi
    1.33  	# Put the nasty error message in config.log where it belongs
    1.34  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD