From 07ca6be82d08dc3b75cf7b2610441daac741274e Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 13 Sep 2001 22:06:33 +0000
Subject: Unify the special code to detect pre-installed Motif installations
 (whether 2.0 or 1.2-compatible) into one file, motif.buildlink.mk.
 lesstif12/buildlink.mk now assumes that if you include it, then you actually
 want lesstif12.

To select that you want a Motif-1.2-compatible installation, define
USE_MOTIF12 in the package Makefile.  If MOTIF12BASE is also defined, then
assume it points to a valid Motif-1.2 installation.  Otherwise, auto-detect
whether /usr/dt is valid, or if we need lesstif12.
---
 x11/lesstif12/buildlink.mk | 44 ++------------------------------------------
 1 file changed, 2 insertions(+), 42 deletions(-)

(limited to 'x11/lesstif12')

diff --git a/x11/lesstif12/buildlink.mk b/x11/lesstif12/buildlink.mk
index 91ac26ebb48..689d69aff38 100644
--- a/x11/lesstif12/buildlink.mk
+++ b/x11/lesstif12/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/06 10:53:48 tron Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/09/13 22:06:34 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lesstif12.
 #
@@ -18,45 +18,10 @@ LESSTIF12_BUILDLINK_MK=	# defined
 .include "../../mk/bsd.buildlink.mk"
 
 BUILDLINK_DEPENDS.lesstif12?=	lesstif12>=0.91.4
-
-.include "../../mk/bsd.prefs.mk"
-
-# On Solaris, assume that /usr/dt contains a valid Motif 1.2-compatible
-# installation.  Otherwise, check to see if <Xm/Gadget.h> is installed.
-# If it is, then this is a Motif 2.0-compatible installation, so we need
-# lesstif12.
-#
-.if ${OPSYS} == "SunOS"
-_NEED_LESSTIF12=	NO
-.else
-.if exists(${X11BASE}/include/Xm/Xm.h)
-.if exists(${X11BASE}/include/Xm/Gadget.h)
-_NEED_LESSTIF12=	YES
-.else
-_IS_LESSTIF!=		${EGREP} -c LESSTIF ${X11BASE}/include/Xm/Xm.h || ${TRUE}
-.if ${_IS_LESSTIF} == "0"
-_NEED_LESSTIF12=	NO
-.else
-_NEED_LESSTIF12=	YES
-.endif
-.endif
-.else
-_NEED_LESSTIF12=	YES
-.endif
-.endif
-
-.if ${_NEED_LESSTIF12} == "YES"
-MOTIFBASE?=	${X11PREFIX}/LessTif/Motif1.2
 DEPENDS+=	${BUILDLINK_DEPENDS.lesstif12}:../../x11/lesstif12
-.else
-.if ${OPSYS} == "SunOS"
-MOTIFBASE?=	/usr/dt
-.else
-MOTIFBASE?=	${X11BASE}
-.endif
-.endif
 
 EVAL_PREFIX+=			LESSTIF12_PREFIX=lesstif12
+LESSTIF12_PREFIX_DEFAULT=	${X11PREFIX}
 BUILDLINK_PREFIX.lesstif12=	${LESSTIF12_PREFIX}/LessTif/Motif1.2
 BUILDLINK_FILES.lesstif12=	include/Mrm/*
 BUILDLINK_FILES.lesstif12+=	include/Xm/*
@@ -68,11 +33,6 @@ BUILDLINK_FILES.lesstif12+=	lib/libXm.*
 BUILDLINK_TARGETS.lesstif12=	lesstif12-buildlink
 BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.lesstif12}
 
-USE_X11=	# defined
-MAKE_ENV+=	MOTIFLIB="${MOTIFLIB}"
-LDFLAGS+=	-Wl,-R${MOTIFBASE}/lib
-MOTIFLIB?=	-Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -L${X11BASE}/lib -lXm -lXp
-
 pre-configure: ${BUILDLINK_TARGETS.lesstif12}
 lesstif12-buildlink: _BUILDLINK_USE
 
-- 
cgit v1.2.3