summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-03-22 22:01:48 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-03-22 22:01:48 +0000
commitda40f7303ae2546abd26dcccdb04979fbaa98530 (patch)
tree5fd920f87a79bb20deab2a04fbd1e12ce6d9ef16
parent25fc7699d5a5d4391d082a8a217987aa9f1be91c (diff)
downloadsamba-da40f7303ae2546abd26dcccdb04979fbaa98530.tar.gz
samba-da40f7303ae2546abd26dcccdb04979fbaa98530.tar.bz2
samba-da40f7303ae2546abd26dcccdb04979fbaa98530.zip
Merge from HEAD - Detect missing -lroken properly on machines without krb5-config
(This used to be commit 70634d248e74395c05d9980b07d53a20327a30a8)
-rw-r--r--source3/configure.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index bc86473428..344ce2e350 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2227,9 +2227,10 @@ fi
AC_CHECK_LIB(k5crypto, krb5_encrypt_data, [LIBS="$LIBS -lk5crypto"])
# Heimdal checks.
AC_CHECK_LIB(crypto, des_set_key, [LIBS="$LIBS -lcrypto"])
- AC_CHECK_LIB(asn1, copy_Authenticator, [LIBS="$LIBS -lasn1 -lroken"])
+ AC_CHECK_LIB(asn1, copy_Authenticator, [LIBS="$LIBS -lasn1"])
+ AC_CHECK_LIB(roken, roken_getaddrinfo_hostspec, [LIBS="$LIBS -lroken"])
# Heimdal checks. On static Heimdal gssapi must be linked before krb5.
- AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5 -lasn1";
+ AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5";
AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
AC_CHECK_LIB(krb5, krb5_set_real_time, [AC_DEFINE(HAVE_KRB5_SET_REAL_TIME,1,[Whether krb5_set_real_time is available])])