summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-03-28 14:37:06 +1000
committerDamien Miller <djm@mindrot.org>2001-03-28 14:37:06 +1000
commit98344741512e0171567409c5c7208af5cebd4fe1 (patch)
tree430bc7827f579ca1daf728dbda6e98948fce68bf /configure.in
parent18bb473eb0509ef74cb7eb644925a9afaa8efaae (diff)
- (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
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in26
1 files changed, 21 insertions, 5 deletions
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"