From 0f0375e36afcaac1c92436bbe24263b7e74a3331 Mon Sep 17 00:00:00 2001 From: ru Date: Sat, 29 Mar 2008 17:44:40 +0000 Subject: Remove options MK_LIBKSE and DEFAULT_THREAD_LIB now that we no longer build libkse. This should fix WITHOUT_LIBTHR builds as a side effect. --- Makefile.inc1 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'Makefile.inc1') diff --git a/Makefile.inc1 b/Makefile.inc1 index 86fe56d..d742d89 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1039,18 +1039,14 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam ${_default_thread_lib} \ + lib/libopie lib/libpam ${_lib_libthr} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} -.if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no" -_default_thread_lib= lib/${DEFAULT_THREAD_LIB} -.elif ${MK_LIBTHR} != "no" -_default_thread_lib= lib/libthr -.elif ${MK_LIBKSE} != "no" -_default_thread_lib= lib/libkse +.if ${MK_LIBTHR} != "no" +_lib_libthr= lib/libthr .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib -- cgit v1.1