svn commit: samba r11290 - in branches/SAMBA_4_0/source/heimdal_build: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-25 12:38:35 +0000 (Tue, 25 Oct 2005)
New Revision: 11290

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11290

Log:
Make it clear that Heimdal is always included, no need for the test
any more.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/heimdal_build/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.m4	2005-10-25 12:37:20 UTC (rev 11289)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4	2005-10-25 12:38:35 UTC (rev 11290)
@@ -212,17 +212,17 @@
 AC_PROG_LEX
 AC_PROG_YACC
 
-# to enable kerberos, unpack a heimdal source tree in the heimdal directory
-# of the samba source tree
-if test -d heimdal; then
-	AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
-	CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc -Iheimdal/lib/roken -Iheimdal/lib/des"
-	HAVE_KRB5=YES
-	SMB_SUBSYSTEM_ENABLE(KERBEROS_LIB, YES)
-	SMB_BINARY_ENABLE(asn1_compile, YES)
-	SMB_BINARY_ENABLE(compile_et, YES)
-fi
+# Portions of heimdal kerberos are unpacked into source/heimdal
+# of the samba source tree.  
 
+# if we ever get to using a host kerberos, we might add conditionals here
+AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
+CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc -Iheimdal/lib/roken -Iheimdal/lib/des"
+HAVE_KRB5=YES
+SMB_SUBSYSTEM_ENABLE(KERBEROS_LIB, YES)
+SMB_BINARY_ENABLE(asn1_compile, YES)
+SMB_BINARY_ENABLE(compile_et, YES)
+
 # only add getaddrinfo and related functions if needed
 SMB_SUBSYSTEM_ENABLE(HEIMDAL_ROKEN_ADDRINFO, NO)
 if test t$ac_cv_func_getaddrinfo != tyes; then