From a587da17398ab570b3a43deab7d4a391d0b67567 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:07:23 +0000 Subject: [PATCH] 2005-06-26 Tollef Fog Heen Author: tfheen Date: 2005-06-26 20:04:10 GMT 2005-06-26 Tollef Fog Heen * pkg.m4: Get rid of caching again. This breaks too much stuff, and pkg-config doesn't take much time to run. --- ChangeLog | 3 +++ pkg.m4 | 12 +++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 606af0f..b5688ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-06-26 Tollef Fog Heen + * pkg.m4: Get rid of caching again. This breaks too much stuff, + and pkg-config doesn't take much time to run. + * glib-patches/configure.in-fd_set.diff: Patch to grep for fd_set rather than fd_mask. Thanks to David Wolfe for the fix. This should make pkg-config happier on QNX. diff --git a/pkg.m4 b/pkg.m4 index d126902..69a890c 100644 --- a/pkg.m4 +++ b/pkg.m4 @@ -46,9 +46,7 @@ fi[]dnl # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- 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 +[if test -n "$PKG_CONFIG"; 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 @@ -75,10 +73,10 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS], - [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])]) -AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS], - [_PKG_CONFIG([$1][_LIBS], [libs], [$2])]) +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) if test $pkg_failed = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -- 2.39.5