2005-06-26 Tollef Fog Heen <tfheen@err.no>

Author: tfheen
Date: 2005-06-26 20:04:10 GMT
2005-06-26  Tollef Fog Heen  <tfheen@err.no>

    * pkg.m4: Get rid of caching again.  This breaks too much stuff,
    and pkg-config doesn't take much time to run.

diff --git a/ChangeLog b/ChangeLog
index 606af0f0c3de7bd918a41b31bf8fd53154c3966a..b5688ea1448066d4337e6118295546e38b5457ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-26  Tollef Fog Heen  <tfheen@err.no>
 
+       * 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 d126902b1a2219a2423af348e1ce430ef6c5a900..69a890cab67cc95072a4288fe3b40157ac17694d 100644 (file)
--- 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"`