summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2001-09-13 19:32:11 +0000
committerjlam <jlam>2001-09-13 19:32:11 +0000
commit1ad7a1ada8626eb62d4fb26d0bd3495f01eb559c (patch)
tree68d4c4bf668dff955dfbf5049bbeb1973b650593 /mk
parenta7502aea7ebb66b788a6a4902837e4e06f6c0321 (diff)
downloadpkgsrc-1ad7a1ada8626eb62d4fb26d0bd3495f01eb559c.tar.gz
To verify a Motif-2.0 installation, test for the presence of <Xm/Xm.h> and
<Xm/Gadget.h> instead of only <Xm/Xm.h>. This differentiates between Motif-2.0 and Motif-1.2 installations.
Diffstat (limited to 'mk')
-rw-r--r--mk/motif.buildlink.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/motif.buildlink.mk b/mk/motif.buildlink.mk
index 0e3956f37cf..e706dff210f 100644
--- a/mk/motif.buildlink.mk
+++ b/mk/motif.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: motif.buildlink.mk,v 1.5 2001/09/13 19:22:17 jlam Exp $
+# $NetBSD: motif.buildlink.mk,v 1.6 2001/09/13 19:32:11 jlam Exp $
#
# This Makefile fragment is included by packages that use Motif-2.0.
#
@@ -28,7 +28,7 @@ MOTIF_TYPE_DEFAULT?= openmotif
# Otherwise, if ${X11BASE} is valid, then use it. Otherwise, use the
# Motif-2.0 specified by ${MOTIF_TYPE_DEFAULT}.
#
-.if exists(/usr/dt/include/Xm/Xm.h)
+.if exists(/usr/dt/include/Xm/Xm.h) && exists(/usr/dt/include/Xm/Gadget.h)
_MOTIF_TYPE= dt
.elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \
exists(${LOCALBASE}/lib/X11/config/OpenMotif.tmpl)
@@ -36,7 +36,7 @@ _MOTIF_TYPE= openmotif
.elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \
exists(${LOCALBASE}/lib/X11/config/LessTif.tmpl)
_MOTIF_TYPE= lesstif
-.elif exists(${X11BASE}/include/Xm/Xm.h)
+.elif exists(${X11BASE}/include/Xm.h) && exists(${X11BASE}/include/Xm/Gadget.h)
_MOTIF_TYPE= none
.else
_MOTIF_TYPE= ${MOTIF_TYPE_DEFAULT}