Tweak the handling of "WITHOUT_LIBPTHREAD". Also remove the accidental

treatment of 'LIBKSE' as an "old style" knob.

Submitted by:	ru
Approved by:	re(kensmith)

4 files changed, 25 insertions, 14 deletions

diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index 5ff093f..a3da4e6 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -146,7 +146,7 @@ MLINKS+=	tree.3 RB_EMPTY.3 \
 		tree.3 SPLAY_RIGHT.3 \
 		tree.3 SPLAY_ROOT.3
 
-.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no")
+.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
 PTHREAD_MAN=	pthread.3 \
 		pthread_atfork.3 \
 		pthread_attr.3 \
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 3a38aef..40f8922 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: src/tools/build/options/makeman,v 1.6 2006/09/11 13:39:44 ru Exp
 .\" $FreeBSD$
-.Dd August 27, 2007
+.Dd October  9, 2007
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -380,26 +380,34 @@ On amd64, set to not build 32-bit library set and a
 .Nm ld-elf32.so.1
 runtime linker.
 .It Va WITHOUT_LIBKSE
-.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBKSE,v 1.1 2006/03/21 07:50:50 obrien Exp
+.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBKSE,v 1.1 2007/10/09 13:42:33 obrien Exp
 Set to not build the
 .Nm libkse
 (M:N threading)
 library.
-.It Va WITHOUT_LIBTHR
-.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBTHR,v 1.1 2006/03/21 07:50:50 ru Exp
-Set to not build the
-.Nm libthr
-(1:1 threading)
-library.
 .It Va WITHOUT_LIBPTHREAD
-.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.1 2006/03/21 07:50:50 ru Exp
+.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.2 2007/10/09 13:42:33 obrien Exp
 Set to not build either of the
 .Nm libpthread
-providing libraries (
-.Nm libthr
+providing libraries
+.Nm ( libthr
 (1:1) &
 .Nm libkse
 (M:N)).
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_LIBKSE
+.It
+.Va WITHOUT_LIBTHR
+.El
+.It Va WITHOUT_LIBTHR
+.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBTHR,v 1.1 2006/03/21 07:50:50 ru Exp
+Set to not build the
+.Nm libthr
+(1:1 threading)
+library.
 .It Va WITHOUT_LOCALES
 .\" from FreeBSD: src/tools/build/options/WITHOUT_LOCALES,v 1.1 2006/03/21 07:50:50 ru Exp
 Set to not build localization files; see
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 5c3a875..dfa5dfc 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -16,7 +16,6 @@
 	NOINFOCOMPRESS:NO_INFOCOMPRESS \
 	NOINSTALLLIB:NO_INSTALLLIB \
 	NOLIBPTHREAD:NO_LIBPTHREAD \
-	NOLIBKSE:NO_LIBKSE \
 	NOLIBTHR:NO_LIBTHR \
 	NOLINT:NO_LINT \
 	NOMAN:NO_MAN \
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 92f3b3b..941950f 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -239,7 +239,6 @@ WITHOUT_${var}=
     KERBEROS \
     LIB32 \
     LIBPTHREAD \
-    LIBKSE \
     LIBTHR \
     LOCALES \
     LPR \
@@ -426,6 +425,11 @@ MK_KERBEROS:=	no
 MK_NCP:=	no
 .endif
 
+.if ${MK_LIBPTHREAD} == "no"
+MK_LIBKSE:=	no
+MK_LIBTHR:=	no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no