From 76b1f44698232b08de6c39972b1128a4ec9700a0 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:07:00 +0000 Subject: [PATCH] 2005-04-12 Tollef Fog Heen Author: tfheen Date: 2005-04-12 17:06:32 GMT 2005-04-12 Tollef Fog Heen * pkg.m4: Apply patch from James Henstridge to have AC_RUN_LOG in the right place. (Freedesktop #2992) --- ChangeLog | 3 +++ pkg.m4 | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 573cc1b..257eef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-04-12 Tollef Fog Heen + * 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 485ad46..5122636 100644 --- 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 -- 2.39.5