summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2007-10-09 13:42:34 +0000
committerobrien <obrien@FreeBSD.org>2007-10-09 13:42:34 +0000
commiteb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98 (patch)
treec47a609d11ee2b49fc8234ffe6ee4e508318db84 /usr.sbin
parent8e21b1f738e3a7d52ec50aa5730787013a76a4d5 (diff)
downloadFreeBSD-src-eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98.zip
FreeBSD-src-eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98.tar.gz
Repo copy libpthreads to libkse.
This introduces the WITHOUT_LIBKSE nob, and changes WITHOUT_LIBPTHREADS to mean with neither threading libs. Approved by: re(kensmith)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile4
-rw-r--r--usr.sbin/ngctl/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 066ffa0..c4bfd25 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -268,7 +268,7 @@ _ypset= ypset
_authpf= authpf
.endif
-.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no")
_pppctl= pppctl
.endif
@@ -277,7 +277,7 @@ _lpr= lpr
.endif
.if ${MK_NS_CACHING} != "no"
-.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no")
_nscd= nscd
.endif
.endif
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index cf17d2e..1a9e50b 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -13,7 +13,7 @@ WARNS?= 3
NGCTL_NO_LIBEDIT=
.endif
-.if ${MK_LIBTHR} == "no" && ${MK_LIBPTHREAD} == "no"
+.if ${MK_LIBPTHREAD} == "no" && ${MK_LIBTHR} == "no" && ${MK_LIBKSE}
NGCTL_NO_LIBEDIT=
.endif
OpenPOWER on IntegriCloud