diff options
author | obrien <obrien@FreeBSD.org> | 2007-10-09 23:31:11 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2007-10-09 23:31:11 +0000 |
commit | a1598920aa3588377d6110e88ea72d957c11f95e (patch) | |
tree | b7ca891b36f892551fbd2415b0541698736bf095 /usr.sbin | |
parent | afb9b9ad446f13c595ddabec23d957cdef03e657 (diff) | |
download | FreeBSD-src-a1598920aa3588377d6110e88ea72d957c11f95e.zip FreeBSD-src-a1598920aa3588377d6110e88ea72d957c11f95e.tar.gz |
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)
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/ngctl/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index c4bfd25..f6a2fcc 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -268,7 +268,7 @@ _ypset= ypset _authpf= authpf .endif -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _pppctl= pppctl .endif @@ -277,7 +277,7 @@ _lpr= lpr .endif .if ${MK_NS_CACHING} != "no" -.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") +.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no" _nscd= nscd .endif .endif diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index 1a9e50b..e02265d 100644 --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -13,7 +13,7 @@ WARNS?= 3 NGCTL_NO_LIBEDIT= .endif -.if ${MK_LIBPTHREAD} == "no" && ${MK_LIBTHR} == "no" && ${MK_LIBKSE} +.if ${MK_LIBTHR} == "no" && ${MK_LIBKSE} == "no" NGCTL_NO_LIBEDIT= .endif |