From 15ce1f9d78c0f75df55f724bcd798769b53680c2 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:06:54 +0000 Subject: [PATCH] 2005-04-12 Tollef Fog Heen Author: tfheen Date: 2005-04-12 10:49:11 GMT 2005-04-12 Tollef Fog Heen * pkg.m4: wrap running pkg-config in AC_RUN_LOG per James Henstridge's suggestion. --- ChangeLog | 3 +++ pkg.m4 | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index e349b36..b256f25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-12 Tollef Fog Heen + * 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 a34c2c0..e93384a 100644 --- 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 -- 2.39.5