diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-10-25 12:38:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:14 -0500 |
| commit | f3cac0433db2f08b1948a8b5073c7bad12a4fbf4 (patch) | |
| tree | d1233a6dd24fcf774ab413c63e0b2a405fbd784e | |
| parent | 1e7bc73e009e1c0adcd06129ae75ddc134956b40 (diff) | |
| download | samba-f3cac0433db2f08b1948a8b5073c7bad12a4fbf4.tar.gz samba-f3cac0433db2f08b1948a8b5073c7bad12a4fbf4.tar.bz2 samba-f3cac0433db2f08b1948a8b5073c7bad12a4fbf4.zip | |
r11290: Make it clear that Heimdal is always included, no need for the test
any more.
Andrew Bartlett
(This used to be commit ec56590b063caa99f29be2b18409a69c3f22cf29)
| -rw-r--r-- | source4/heimdal_build/config.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4 index a98fe728f8..6713730a84 100644 --- a/source4/heimdal_build/config.m4 +++ b/source4/heimdal_build/config.m4 @@ -212,16 +212,16 @@ SMB_BINARY_ENABLE(compile_et, NO) 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) |