summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-07-12 13:15:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:57:32 -0500
commit39c3f220348b2bf2f9b81e8972cc65a2cc7e4b63 (patch)
tree403a5ed16652ea395cd7aed72ec4be53f2f8c8d9 /source4
parent88002b851bd30e3c03a5a9442baf3ced7aa6090f (diff)
downloadsamba-39c3f220348b2bf2f9b81e8972cc65a2cc7e4b63.tar.gz
samba-39c3f220348b2bf2f9b81e8972cc65a2cc7e4b63.tar.bz2
samba-39c3f220348b2bf2f9b81e8972cc65a2cc7e4b63.zip
r1463: fix the krb5 build
metze (This used to be commit fc8d00b8ab28535da4ec0b7e6931bbf402a37013)
Diffstat (limited to 'source4')
-rw-r--r--source4/libads/config.m41
-rw-r--r--source4/libcli/auth/gensec.m45
-rw-r--r--source4/libcli/auth/gensec.mk1
3 files changed, 6 insertions, 1 deletions
diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index 2e4041829d..545f6246cb 100644
--- a/source4/libads/config.m4
+++ b/source4/libads/config.m4
@@ -420,6 +420,7 @@ if test x"$with_ads_support" != x"no"; then
AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
AC_MSG_CHECKING(whether Active Directory and krb5 support is used)
+ SMB_EXT_LIB_ENABLE(KRB5,YES)
AC_MSG_RESULT(yes)
else
if test x"$with_ads_support" = x"yes"; then
diff --git a/source4/libcli/auth/gensec.m4 b/source4/libcli/auth/gensec.m4
index 8f8faf5d7c..673db77f82 100644
--- a/source4/libcli/auth/gensec.m4
+++ b/source4/libcli/auth/gensec.m4
@@ -1,5 +1,8 @@
+if test t$SMB_EXT_LIB_ENABLE_KRB5 = tYES; then
+ SMB_MODULE_DEFAULT(gensec_krb5, STATIC)
+fi
+
SMB_SUBSYSTEM_MK(GENSEC,libcli/auth/gensec.mk)
SMB_MODULE_MK(gensec_krb5, GENSEC, NOT, libcli/auth/gensec.mk)
SMB_MODULE_MK(gensec_ntlmssp, GENSEC, STATIC, libcli/auth/gensec.mk)
SMB_MODULE_MK(gensec_spnego, GENSEC, STATIC, libcli/auth/gensec.mk)
-
diff --git a/source4/libcli/auth/gensec.mk b/source4/libcli/auth/gensec.mk
index 5c6a8260e5..bab79ea2fd 100644
--- a/source4/libcli/auth/gensec.mk
+++ b/source4/libcli/auth/gensec.mk
@@ -17,6 +17,7 @@ ADD_OBJ_FILES = \
libcli/auth/kerberos_verify.o \
libcli/auth/gssapi_parse.o
REQUIRED_SUBSYSTEMS = GENSEC
+REQUIRED_LIBRARIES = KRB5
# End MODULE gensec_krb5
################################################