From ff939e0dc77366add1742d37d4ed3fb8f9a9aba1 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 18 Feb 2004 16:35:27 +0000
Subject: Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
 environment overrides all other settings.

---
 textproc/expat/buildlink3.mk | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'textproc/expat')

diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk
index 6fdb602e5d1..db6d64d3d98 100644
--- a/textproc/expat/buildlink3.mk
+++ b/textproc/expat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 10:55:02 recht Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:35:27 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EXPAT_BUILDLINK3_MK:=	${EXPAT_BUILDLINK3_MK}+
@@ -61,29 +61,31 @@ BUILDLINK_IS_BUILTIN.expat!=		\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.expat=${BUILDLINK_IS_BUILTIN.expat}
 .endif
 
-.if !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.expat:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.expat=	YES
-.else
-BUILDLINK_USE_BUILTIN.expat=	NO
 .endif
 
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
-    !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.expat)
+.  if !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.expat=	YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+.  else
 BUILDLINK_USE_BUILTIN.expat=	NO
-.endif
-.if !empty(PREFER_NATIVE:Mexpat) && \
-    !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS])
+.  endif
+
+.  if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+      !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.expat=	YES
-.endif
-.if !empty(PREFER_PKGSRC:Mexpat)
+.  endif
+.  if !empty(PREFER_PKGSRC:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.expat=	NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.expat:M[yY][eE][sS])
+.  endif
+.  if !empty(PREFER_NATIVE:Mexpat) && \
+      !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS])
 BUILDLINK_USE_BUILTIN.expat=	YES
+.  endif
+.  if !empty(PREFER_PKGSRC:Mexpat)
+BUILDLINK_USE_BUILTIN.expat=	NO
+.  endif
 .endif
 
 .if !empty(BUILDLINK_USE_BUILTIN.expat:M[nN][oO])
-- 
cgit v1.2.3