diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-02 08:02:33 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-02 08:02:33 +0000 |
| commit | 8d8c3630b3328e42368bc308d7442aedae942c76 (patch) | |
| tree | eebe7253c1ff451f8d52cacd70bf787c01c9b8e9 /mk/bsd.pkg.mk | |
| parent | 06a4225afc13172d6c58e26741dd6e90a1d79f11 (diff) | |
| download | pkgsrc-8d8c3630b3328e42368bc308d7442aedae942c76.tar.gz | |
Make check for Xpm in XFree86 look like the checks for Mesa and freetype2.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index a71e91f5754..426281f665f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.774 2001/07/01 21:13:20 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.775 2001/07/02 08:02:33 jlam Exp $ # # This file is in the public domain. # @@ -723,23 +723,15 @@ DEPENDS+= ${LESSTIF_DEPENDS} .endif .endif # USE_MOTIF -# Check if we got Xpm distributed with XFree86 4.0 or newer or if we -# need to use the package. +# If USE_XPM is set, depend on xpm. .if defined(USE_XPM) -.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") +.if ${HAVE_BUILTIN_XPM} == "NO" DEPENDS+= xpm-3.4k:../../graphics/xpm XPMDIR_DEFAULT= ${X11PREFIX} .else XPMDIR_DEFAULT= ${X11BASE} .endif +.undef __BUILTIN_XPM .endif # USE_XPM # If USE_MESA is set, depend on Mesa (or Mesa-glx if USE_GLX is defined and |