From e2afa97f51a1f72e6618533019aaaae07b7d3cf2 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 25 Aug 2002 18:38:05 +0000 Subject: Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. --- graphics/xpm/Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'graphics/xpm/Makefile') diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index 60daf90961a..d150f932df3 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2001/08/30 11:11:24 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2002/08/25 18:39:24 jlam Exp $ DISTNAME= xpm-3.4k CATEGORIES= graphics x11 @@ -9,12 +9,20 @@ MAINTAINER= mycroft@netbsd.org HOMEPAGE= http://www.inria.fr/koala/lehors/xpm.html COMMENT= The X Pixmap library -USE_IMAKE= # defined -CHECK_XPM= # defined +USE_BUILDLINK2= # defined +USE_IMAKE= # defined .include "../../mk/bsd.prefs.mk" -.if ${HAVE_BUILTIN_XPM} != "NO" +# Check if we got Xpm distributed with XFree86 4.x. +.if exists(${X11BASE}/include/X11/xpm.h) && \ + exists(${X11BASE}/lib/X11/config/X11.tmpl) +_IS_BUILTIN_XPM!= ${EGREP} -c NormalLibXpm ${X11BASE}/lib/X11/config/X11.tmpl || ${TRUE} +.else +_IS_BUILTIN_XPM= 0 +.endif + +.if ${_IS_BUILTIN_XPM} != "0" IGNORE= "The Xpm library is included in your X11 distribution." .endif -- cgit v1.2.3