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

Author: tfheen
Date: 2005-04-12 17:06:32 GMT
2005-04-12  Tollef Fog Heen  <tfheen@err.no>

    * pkg.m4: Apply patch from James Henstridge to have AC_RUN_LOG in
    the right place.  (Freedesktop #2992)

diff --git a/ChangeLog b/ChangeLog
index 573cc1b91885e97b50fae42a71386680e1139ae8..257eef9be7b63bd5e077ad63ba15cd1a566bf605 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-12  Tollef Fog Heen  <tfheen@err.no>
 
+       * pkg.m4: Apply patch from James Henstridge to have AC_RUN_LOG in
+       the right place.  (Freedesktop #2992)
+       
        * pkg.m4: Add note that PKG_PROG_PKG_CONFIG must be called
        explicitly if the first call to PKG_CHECK_MODULES might not
        happen.  (Debian #303211)

diff --git a/pkg.m4 b/pkg.m4
index 485ad46dcb08d879f0a630fa7638ba3248791ced..512263646aa29c7695caee82f4399d7f1c335738 100644 (file)
--- a/pkg.m4
+++ b/pkg.m4
@@ -49,13 +49,11 @@ 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
+       if AC_RUN_LOG([$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