2005-04-12 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-04-12 10:49:11 GMT
2005-04-12  Tollef Fog Heen  <tfheen@err.no>

    * pkg.m4: wrap running pkg-config in AC_RUN_LOG per James
    Henstridge's suggestion.

diff --git a/ChangeLog b/ChangeLog
index e349b368969eec96474d881f58a87a8dd98a13f9..b256f25e29986db1f8ed4e71d89a95d39efeb4fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-12  Tollef Fog Heen  <tfheen@err.no>
 
+       * pkg.m4: wrap running pkg-config in AC_RUN_LOG per James
+       Henstridge's suggestion.
+
        * pkg.m4: Patch from James Henstridge to evaluate second argument
        again.  (Freedesktop #2987, Gnome #300232, Debian #303878,
        #303969)

diff --git a/pkg.m4 b/pkg.m4
index a34c2c05b5004b86d5e4e4a8942a2dbe5bfd975c..e93384afa275a8738f958b55251631db0143f01c 100644 (file)
--- a/pkg.m4
+++ b/pkg.m4
@@ -49,11 +49,13 @@ m4_define([_PKG_CONFIG],
 [if test "x$ac_cv_env_[]$1[]_set" = "xset"; then
        pkg_cv_[]$1=$ac_cv_env_[]$1[]_value
 elif test -n "$PKG_CONFIG"; then
+       AC_RUN_LOG([
        if $PKG_CONFIG --exists "$3" >/dev/null 2>&1; then
                pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
        else
                pkg_failed=yes
        fi
+       ])
 else
        pkg_failed=untried
 fi[]dnl