diff options
| author | tron <tron> | 2000-11-29 12:40:55 +0000 |
|---|---|---|
| committer | tron <tron> | 2000-11-29 12:40:55 +0000 |
| commit | 2bc9aadfeffe77a206ecab430b74a73a23e6248e (patch) | |
| tree | bfa1d8d40210da05f1bb644bf2c6998d36691558 /mk | |
| parent | 0c2b0d0e3c7d0a4dde4c4238b5b91dd4462d5f88 (diff) | |
| download | pkgsrc-2bc9aadfeffe77a206ecab430b74a73a23e6248e.tar.gz | |
Explicitly set "IS_BUILTIN_XPM" to "0" if the "xpm" library is not
installed because the "xpm" package will refuse to be built otherwise.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d9897cb2448..6633d7a6d8f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.622 2000/11/29 11:39:25 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.623 2000/11/29 12:40:55 tron Exp $ # # This file is in the public domain. # @@ -777,10 +777,13 @@ DEPENDS+= ${LESSTIF_DEPENDS} # Check if we got Xpm distributed with XFree86 4.0 or newer or if we # need to use the package. .if defined(USE_XPM) -.if exists(${X11BASE}/include/X11/xpm.h) .if !defined(IS_BUILTIN_XPM) +.if exists(${X11BASE}/include/X11/xpm.h) IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} MAKEFLAGS+= IS_BUILTIN_XPM=${IS_BUILTIN_XPM} +.else +IS_BUILTIN_XPM= 0 +.endif .endif .if (${IS_BUILTIN_XPM} == "0") DEPENDS+= xpm-3.4k:../../graphics/xpm @@ -788,10 +791,6 @@ XPMDIR_DEFAULT= ${X11PREFIX} .else XPMDIR_DEFAULT= ${X11BASE} .endif -.else -DEPENDS+= xpm-3.4k:../../graphics/xpm -XPMDIR_DEFAULT= ${X11PREFIX} -.endif .endif # USE_XPM # If USE_MESA is set, depend on Mesa (or Mesa-glx if USE_GLX is defined and |