|
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
|
|
|
# ----------------------------------
|
|
|
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)?$])
|
|
|
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])
|
|
@@ -315,7 +315,7 @@ $$1_PKG_ERRORS
|
|
|
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
|
|
installed software in a non-standard prefix.
|
|
|
|
|
|
-_PKG_TEXT])dnl
|
|
|
+_PKG_TEXT])[]dnl
|
|
|
])
|
|
|
elif test $pkg_failed = untried; then
|
|
|
AC_MSG_RESULT([no])
|
|
@@ -326,7 +326,7 @@ path to pkg-config.
|
|
|
|
|
|
_PKG_TEXT
|
|
|
|
|
|
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
|
|
|
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
|
|
])
|
|
|
else
|
|
|
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|