aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in13
2 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e4c31b1bdd..337a3b9141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-21 Rodney Dawes <dobey@ximian.com>
+
+ * configure.in: Fix the mit krb5+krb4 check to work with --without-kr5
+
2003-03-19 Ettore Perazzoli <ettore@ximian.com>
* README: Updated considerably.
diff --git a/configure.in b/configure.in
index dcd30208c3..f1d50f830f 100644
--- a/configure.in
+++ b/configure.in
@@ -623,14 +623,11 @@ if test "x${with_krb4}" != "xno"; then
AC_CACHE_CHECK(for Kerberos 4, ac_cv_lib_kerberos4,
[
ac_cv_lib_kerberos4="no"
-
- case $ac_cv_lib_kerberos5 in
- *k5crypto*)
- # Look for MIT krb5 compat krb4
- LDFLAGS="$LDFLAGS -L$with_krb4/lib -lkrb4 -ldes425 $KRB5_LDFLAGS"
- AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="-lkrb4 -ldes425 $KRB5_LDFLAGS")
- ;;
- esac
+
+ mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
+ # Look for MIT krb5 compat krb4
+ LDFLAGS="$LDFLAGS -L$with_krb4/lib $mitcompatlibs"
+ AC_TRY_LINK_FUNC(krb_mk_req, ac_cv_lib_kerberos4="$mitcompatlibs")
if test "$ac_cv_lib_kerberos4" = "no"; then
# Look for KTH krb4