Author: antoine
Date: Sat Feb 20 12:48:44 2010
New Revision: 204117
URL: http://svn.freebsd.org/changeset/base/204117
Log:
MFC from head to stable/8:
r202896:
Unbreak world:
- WITHOUT_OPENSSH (and WITH_KERBEROS)
- WITHOUT_KERBEROS and WITH_GSSAPI
PR: 137483
Submitted by: bf
r203016 by ru@:
Regen the list of prebuild libraries using tools/make_libdeps.sh.
Reviewed by: ru@
Modified:
stable/8/Makefile.inc1 (contents, props changed)
Modified: stable/8/Makefile.inc1
==============================================================================
--- stable/8/Makefile.inc1 Sat Feb 20 12:34:14 2010 (r204116)
+++ stable/8/Makefile.inc1 Sat Feb 20 12:48:44 2010 (r204117)
@@ -1087,19 +1087,19 @@ _startup_libs+= lib/libc
gnu/lib/libgcc__L: lib/libc__L
-_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
- ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libroken} \
- ${_kerberos5_lib_libheimntlm} ${_kerberos5_lib_libgssapi_krb5} \
- lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+_prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm}
\
+ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
+ ${_kerberos5_lib_libroken} \
+ lib/libbz2 lib/libcom_err lib/libcrypt \
lib/libexpat \
- ${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
+ ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
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} lib/libdwarf lib/libproc
+ ${_secure_lib_libssl}
.if ${MK_LIBTHR} != "no"
_lib_libthr= lib/libthr
@@ -1121,18 +1121,20 @@ lib/libradius__L secure/lib/libssl__L: s
.if ${MK_OPENSSH} != "no"
_secure_lib_libssh= secure/lib/libssh
secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
-.if ${MK_KERBEROS} != "no"
-kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
+.if ${MK_KERBEROS_SUPPORT} != "no"
+secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
- lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \
- lib/libcrypt__L
-secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L
+ lib/libmd__L kerberos5/lib/libroken__L
.endif
.endif
.endif
_secure_lib= secure/lib
.endif
+.if ${MK_GSSAPI} != "no"
+_lib_libgssapi= lib/libgssapi
+.endif
+
.if ${MK_IPX} != "no"
_lib_libipx= lib/libipx
.endif
@@ -1144,8 +1146,6 @@ _kerberos5_lib_libkrb5= kerberos5/lib/li
_kerberos5_lib_libhx509= kerberos5/lib/libhx509
_kerberos5_lib_libroken= kerberos5/lib/libroken
_kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
-_kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5
-_lib_libgssapi= lib/libgssapi
.endif
.if ${MK_NIS} != "no"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
