PERFORCE change 142774 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=142774

Change 142774 by jb at freebsd3 on 2008/06/02 23:12:31

	Merging this file from current wasn't a good idea.

Affected files ...

.. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#8 edit

Differences ...

==== //depot/projects/dtrace7/src/share/mk/bsd.own.mk#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.75 2008/05/26 10:39:52 bz Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.67.2.4 2008/01/28 08:42:15 dougb Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
@@ -162,6 +162,8 @@
 NLSGRP?=	${SHAREGRP}
 NLSMODE?=	${NOBINMODE}
 
+DEFAULT_THREAD_LIB?=	libthr
+
 INCLUDEDIR?=	/usr/include
 
 # Common variables
@@ -229,6 +231,7 @@
     GPIB \
     GROFF \
     HTML \
+    I4B \
     INET6 \
     INFO \
     IPFILTER \
@@ -315,6 +318,7 @@
     GPIB \
     GROFF \
     HTML \
+    I4B \
     INET6 \
     INFO \
     INSTALLLIB \
@@ -324,6 +328,7 @@
     KVM \
     LIB32 \
     LIBPTHREAD \
+    LIBKSE \
     LIBTHR \
     LOCALES \
     LPR \
@@ -354,8 +359,8 @@
     TOOLCHAIN \
     USB \
     WPA_SUPPLICANT_EAPOL \
-    ZFS \
-    ZONEINFO
+    ZONEINFO \
+    ZFS
 .if defined(WITH_${var}) && defined(WITHOUT_${var})
 .error WITH_${var} and WITHOUT_${var} can't both be set.
 .endif
@@ -394,10 +399,11 @@
 # Order is somewhat important.
 #
 .if ${MK_LIBPTHREAD} == "no"
+MK_LIBKSE:=	no
 MK_LIBTHR:=	no
 .endif
 
-.if ${MK_LIBTHR} == "no"
+.if ${MK_LIBKSE} == "no" && ${MK_LIBTHR} == "no"
 MK_BIND:=	no
 .endif