2 files changed, 24 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 87a4ec649..6f7e8ae0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>
  - (djm) Work around Solaris' broken struct dirent. Diagnosis and suggested
    fix from Philippe Levan <levan@epix.net>
+ - (djm) Rework krbIV tests to get us closer to building on Redhat. Still
+   doesn't work because of conflicts between krbIV's and OpenSSL's des.h
 
 20010327
  - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID)
@@ -4732,4 +4734,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1023 2001/03/28 04:35:30 djm Exp $
+$Id: ChangeLog,v 1.1024 2001/03/28 04:37:06 djm Exp $
diff --git a/configure.in b/configure.in
index f6a0a6926..256443a93 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.269 2001/03/28 04:35:30 djm Exp $
+# $Id: configure.in,v 1.270 2001/03/28 04:37:06 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -1215,15 +1215,31 @@ AC_ARG_WITH(kerberos4,
                         fi
 
                         AC_CHECK_HEADERS(krb.h)
-                        AC_CHECK_LIB(krb, main)
                         if test "$ac_cv_header_krb_h" != yes; then
                                 AC_MSG_WARN([Cannot find krb.h, build may fail])
                         fi
+                        AC_CHECK_LIB(krb, main)
                         if test "$ac_cv_lib_krb_main" != yes; then
-                                AC_MSG_WARN([Cannot find libkrb, build may fail])
+                                AC_CHECK_LIB(krb4, main)
+                                if test "$ac_cv_lib_krb4_main" != yes; then
+                                        AC_MSG_WARN([Cannot find libkrb nor libkrb4, build may fail])
+                                else
+                                        KLIBS="-lkrb4"
+                                fi
+                        else
+                                KLIBS="-lkrb"
+                        fi
+                        AC_CHECK_LIB(des, des_cbc_encrypt)
+                        if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then
+                                AC_CHECK_LIB(des425, des_cbc_encrypt)
+                                if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then
+                                        AC_MSG_WARN([Cannot find libdes nor libdes425, build may fail])
+                                else
+                                        KLIBS="-ldes425"
+                                fi
+                        else
+                                KLIBS="-ldes"
                         fi
-
-                        KLIBS="-lkrb -ldes"
                         AC_CHECK_LIB(resolv, dn_expand, , )
                         KRB4=yes
                         KRB4_MSG="yes"