diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-01-29 04:00:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:21 -0500 |
| commit | 1a013ce4d31821e97b785ab0df6c8f8aef0eae91 (patch) | |
| tree | bdefff027c42ffb53cc998f2ebc7b92c069043c3 | |
| parent | 7d43a2bdfef260ebcb948d6d856345e51721ab6b (diff) | |
| download | samba-1a013ce4d31821e97b785ab0df6c8f8aef0eae91.tar.gz samba-1a013ce4d31821e97b785ab0df6c8f8aef0eae91.tar.bz2 samba-1a013ce4d31821e97b785ab0df6c8f8aef0eae91.zip | |
r5088: Push some of the heimdal tests into a 'if we didn't have krb5-config' block.
This lets krb5-config handle this without us stuffing things up.
Add back the test tridge removed
Andrew Bartlett
(This used to be commit 2206b0e8ca4b9d0be137bd6676e252c3b66faf81)
| -rw-r--r-- | source4/libads/config.m4 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source4/libads/config.m4 b/source4/libads/config.m4 index 5da58faf16..f7225a4e15 100644 --- a/source4/libads/config.m4 +++ b/source4/libads/config.m4 @@ -128,6 +128,7 @@ AC_ARG_WITH(krb5, if test x$with_krb5_support != x"no"; then FOUND_KRB5=no + FOUND_KRB5_VIA_CONFIG=no ################################################# # check for krb5-config from recent MIT and Heimdal kerberos 5 @@ -144,6 +145,7 @@ if test x$with_krb5_support != x"no"; then CFLAGS=$ac_save_CFLAGS;export CFLAGS LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS FOUND_KRB5=yes + FOUND_KRB5_VIA_CONFIG=yes AC_MSG_RESULT(yes. Found $KRB5CONFIG) else AC_MSG_RESULT(no. Fallback to specified directory) @@ -165,6 +167,7 @@ if test x$with_krb5_support != x"no"; then CFLAGS=$ac_save_CFLAGS;export CFLAGS LDFLAGS=$ac_save_LDFLAGS;export LDFLAGS FOUND_KRB5=yes + FOUND_KRB5_VIA_CONFIG=yes AC_MSG_RESULT(yes. Found $KRB5CONFIG) else AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy) @@ -288,8 +291,12 @@ if test x"$with_krb5_support" != x"no"; then AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data) # Heimdal checks. - AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) - AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) + # But only if we didn't have a krb5-config to tell us this already + if x"$FOUND_KRB5_VIA_CONFIG" != x"yes"; then + AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key) + AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator) + AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec) + fi # Heimdal checks. On static Heimdal gssapi must be linked before krb5. AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status,[],[], |