diff options
| author | jmmv <jmmv> | 2005-06-11 08:49:33 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2005-06-11 08:49:33 +0000 |
| commit | d3e54827bd56ffff4beb88fa9c3bb8a2f0a963d9 (patch) | |
| tree | c7b924cd1287bf07715c1a12b18aeafe351ae5ba /x11 | |
| parent | 70dd5525eb76f7a2ed158206d9c3ac757277ae64 (diff) | |
| download | pkgsrc-d3e54827bd56ffff4beb88fa9c3bb8a2f0a963d9.tar.gz | |
Revision 1.2 of this file added a check for the presence of xextensions.pc
to decide whether the builtin version was enough or not. This check was
removed in 1.3 during the conversion to the new builtin structure, hence
breaking, at least, compositeext (on which many other packages depend).
Given this, readd the check.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xextensions/builtin.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/x11/xextensions/builtin.mk b/x11/xextensions/builtin.mk index b4fbc38c006..8bac099e3f4 100644 --- a/x11/xextensions/builtin.mk +++ b/x11/xextensions/builtin.mk @@ -1,10 +1,12 @@ -# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:32 jlam Exp $ +# $NetBSD: builtin.mk,v 1.4 2005/06/11 08:49:33 jmmv Exp $ BUILTIN_PKG:= xextensions -BUILTIN_FIND_FILES_VAR:= H_XEXTENSIONS +BUILTIN_FIND_FILES_VAR:= H_XEXTENSIONS PC_XEXTENSIONS BUILTIN_FIND_FILES.H_XEXTENSIONS= \ ${X11BASE}/include/X11/extensions/extutil.h +BUILTIN_FIND_FILES.PC_XEXTENSIONS= \ + ${X11BASE}/lib/pkgconfig/xextensions.pc .include "../../mk/buildlink3/bsd.builtin.mk" @@ -19,7 +21,7 @@ IS_BUILTIN.xextensions= no # we'll consider this X11 package to be built-in even if it's a part # of one of the pkgsrc-installed X11 distributions. # -. if exists(${H_XEXTENSIONS}) +. if exists(${H_XEXTENSIONS}) && exists(${PC_XEXTENSIONS}) IS_BUILTIN.xextensions= yes . endif .endif |