diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 17:56:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 17:56:34 +0000 |
| commit | 36b44872afd090c85212718a3cbe86d0adaa0e0c (patch) | |
| tree | dafee5920874523f72dbd1509d3264e82d5477d0 | |
| parent | e49b110c3cfa9119a56f9a3b7dbff41986990470 (diff) | |
| download | pkgsrc-36b44872afd090c85212718a3cbe86d0adaa0e0c.tar.gz | |
Localize the code for CHECK_XPM from bsd.pkg.mk into the xpm Makefile.
| -rw-r--r-- | graphics/xpm/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile index b076ecea2c8..b243076ac6f 100644 --- a/graphics/xpm/Makefile +++ b/graphics/xpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23.2.2 2002/06/21 23:05:26 jlam Exp $ +# $NetBSD: Makefile,v 1.23.2.3 2002/08/25 17:56:34 jlam Exp $ DISTNAME= xpm-3.4k CATEGORIES= graphics x11 @@ -11,12 +11,19 @@ COMMENT= The X Pixmap library USE_BUILDLINK2= # defined USE_IMAKE= # defined -CHECK_XPM= # defined .include "../../mk/bsd.prefs.mk" -.if ${HAVE_BUILTIN_XPM} != "NO" -#IGNORE= "The Xpm library is included in your X11 distribution." +# 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 .if (${OPSYS} == SunOS) |