summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in26
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 @@
4 from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> 4 from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>
5 - (djm) Work around Solaris' broken struct dirent. Diagnosis and suggested 5 - (djm) Work around Solaris' broken struct dirent. Diagnosis and suggested
6 fix from Philippe Levan <levan@epix.net> 6 fix from Philippe Levan <levan@epix.net>
7 - (djm) Rework krbIV tests to get us closer to building on Redhat. Still
8 doesn't work because of conflicts between krbIV's and OpenSSL's des.h
7 9
820010327 1020010327
9 - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID) 11 - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID)
@@ -4732,4 +4734,4 @@
4732 - Wrote replacements for strlcpy and mkdtemp 4734 - Wrote replacements for strlcpy and mkdtemp
4733 - Released 1.0pre1 4735 - Released 1.0pre1
4734 4736
4735$Id: ChangeLog,v 1.1023 2001/03/28 04:35:30 djm Exp $ 4737$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 @@
1# $Id: configure.in,v 1.269 2001/03/28 04:35:30 djm Exp $ 1# $Id: configure.in,v 1.270 2001/03/28 04:37:06 djm Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -1215,15 +1215,31 @@ AC_ARG_WITH(kerberos4,
1215 fi 1215 fi
1216 1216
1217 AC_CHECK_HEADERS(krb.h) 1217 AC_CHECK_HEADERS(krb.h)
1218 AC_CHECK_LIB(krb, main)
1219 if test "$ac_cv_header_krb_h" != yes; then 1218 if test "$ac_cv_header_krb_h" != yes; then
1220 AC_MSG_WARN([Cannot find krb.h, build may fail]) 1219 AC_MSG_WARN([Cannot find krb.h, build may fail])
1221 fi 1220 fi
1221 AC_CHECK_LIB(krb, main)
1222 if test "$ac_cv_lib_krb_main" != yes; then 1222 if test "$ac_cv_lib_krb_main" != yes; then
1223 AC_MSG_WARN([Cannot find libkrb, build may fail]) 1223 AC_CHECK_LIB(krb4, main)
1224 if test "$ac_cv_lib_krb4_main" != yes; then
1225 AC_MSG_WARN([Cannot find libkrb nor libkrb4, build may fail])
1226 else
1227 KLIBS="-lkrb4"
1228 fi
1229 else
1230 KLIBS="-lkrb"
1231 fi
1232 AC_CHECK_LIB(des, des_cbc_encrypt)
1233 if test "$ac_cv_lib_des_des_cbc_encrypt" != yes; then
1234 AC_CHECK_LIB(des425, des_cbc_encrypt)
1235 if test "$ac_cv_lib_des425_des_cbc_encrypt" != yes; then
1236 AC_MSG_WARN([Cannot find libdes nor libdes425, build may fail])
1237 else
1238 KLIBS="-ldes425"
1239 fi
1240 else
1241 KLIBS="-ldes"
1224 fi 1242 fi
1225
1226 KLIBS="-lkrb -ldes"
1227 AC_CHECK_LIB(resolv, dn_expand, , ) 1243 AC_CHECK_LIB(resolv, dn_expand, , )
1228 KRB4=yes 1244 KRB4=yes
1229 KRB4_MSG="yes" 1245 KRB4_MSG="yes"