diff options
| author | wiz <wiz> | 2007-06-01 19:03:46 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2007-06-01 19:03:46 +0000 |
| commit | 8c992fc736c38d60e2f888a5ed53e0373863bd91 (patch) | |
| tree | 19092686bd18979297ba84ba50455cf5d1e0a06a /devel/pkg-config/patches | |
| parent | f82a6e92633833cb44c1ed11913a5652531f8c4c (diff) | |
| download | pkgsrc-8c992fc736c38d60e2f888a5ed53e0373863bd91.tar.gz | |
Fix pkg.m4: it was broken in the case when pkg-config is not installed,
but the path to an installed dependency is passed via FOO_CFLAGS/FOO_LIBS.
Bump PKGREVISION.
Diffstat (limited to 'devel/pkg-config/patches')
| -rw-r--r-- | devel/pkg-config/patches/patch-af | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/devel/pkg-config/patches/patch-af b/devel/pkg-config/patches/patch-af new file mode 100644 index 00000000000..67ccd9ab4bb --- /dev/null +++ b/devel/pkg-config/patches/patch-af @@ -0,0 +1,29 @@ +$NetBSD: patch-af,v 1.1 2007/06/01 19:03:46 wiz Exp $ + +--- pkg.m4.orig 2006-08-16 17:05:30.000000000 +0000 ++++ pkg.m4 +@@ -66,16 +66,14 @@ fi]) + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$PKG_CONFIG"; then +- if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- else +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- fi +-else +- pkg_failed=untried ++[if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ elif test -n "$PKG_CONFIG"; then ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + |