Changeset 1106 for trunk/m4/pkg.m4

Timestamp:

Jun 23, 2010, 3:59:14 AM (13 years ago)

Author:

Peter Johansson

Message:

update pkg.m4 to version 0.24 (pkg-config)

File:

• trunk/m4/pkg.m4 (modified) (9 diffs)

trunk/m4/pkg.m4

@@ -1 +1 @@
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -27 +28 @@
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+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])
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
   AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
@@ -40 +44 @@
     PKG_CONFIG=""
   fi
-    
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
@@ -49 +52 @@
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
@@ -58 +61 @@
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
+  m4_default([$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
-
 
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
@@ -116 +118 @@
 
 if test $pkg_failed = yes; then
+    AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
@@ -125 +128 @@
   echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-  ifelse([$4], , [AC_MSG_ERROR(dnl
+  m4_default([$4], [AC_MSG_ERROR(
 [Package requirements ($2) were not met:
 
@@ -133 +136 @@
 installed software in a non-standard prefix.
 
-_PKG_TEXT
-])],
-    [AC_MSG_RESULT([no])
-                $4])
+_PKG_TEXT])dnl
+        ])
 elif test $pkg_failed = untried; then
-  ifelse([$4], , [AC_MSG_FAILURE(dnl
+      AC_MSG_RESULT([no])
+  m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -145 +147 @@
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-    [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+        ])
 else
   $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
   $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-  ifelse([$3], , :, [$3])
+  $3
 fi[]dnl
 ])# PKG_CHECK_MODULES