fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-05 16:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Arch Librarian 2005-07-14 13:07:23 +00:00
parent 18c80f1cbb
commit a587da1739
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -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.

12
pkg.m4
View file

@ -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"`