summaryrefslogtreecommitdiff
path: root/graphics/xpm
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-02 14:16:54 +0000
committerjlam <jlam@pkgsrc.org>2001-07-02 14:16:54 +0000
commitce1c571588f0a712b9a044dfc14016c9979582e2 (patch)
tree741e21fc8274c9edf7abe980b8d6897993518507 /graphics/xpm
parente6ddc645625ab76dd1d0c9215dfa9d9e3024bea9 (diff)
downloadpkgsrc-ce1c571588f0a712b9a044dfc14016c9979582e2.tar.gz
Copy the checks for built-in freetype2 and xpm into the buildlink.mk files
as they can't always use the logic in bsd.prefs.mk.
Diffstat (limited to 'graphics/xpm')
-rw-r--r--graphics/xpm/buildlink.mk18
1 files changed, 15 insertions, 3 deletions
diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk
index 9ce7c2215a7..2fa947d92be 100644
--- a/graphics/xpm/buildlink.mk
+++ b/graphics/xpm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 08:05:06 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/02 14:16:55 jlam Exp $
#
# This Makefile fragment is included by packages that use xpm.
#
@@ -16,11 +16,23 @@ XPM_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
BUILDLINK_DEPENDS.xpm?= xpm-3.4k
-CHECK_XPM= # defined
+# Check if we got Xpm distributed with XFree86 4.x or if we need to
+# depend on the Xpm package.
+#
.include "../../mk/bsd.prefs.mk"
+.if exists(${X11BASE}/include/X11/xpm.h)
+_IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE}
+.else
+_IS_BUILTIN_XPM= 0
+.endif
+.if ${_IS_BUILTIN_XPM} == "0"
+_NEED_XPM= YES
+.else
+_NEED_XPM= NO
+.endif
-.if ${HAVE_BUILTIN_XPM} == "NO"
+.if ${_NEED_XPM} == "YES"
DEPENDS+= ${BUILDLINK_DEPENDS.xpm}:../../graphics/xpm
BUILDLINK_PREFIX.xpm= ${X11PREFIX}
.else