tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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
This commit is contained in:
Damien Miller 2001-03-28 14:37:06 +10:00
parent 18bb473eb0
commit 9834474151
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,8 @@
from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE> from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>
- (djm) Work around Solaris' broken struct dirent. Diagnosis and suggested - (djm) Work around Solaris' broken struct dirent. Diagnosis and suggested
fix from Philippe Levan <levan@epix.net> 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 20010327
- Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID) - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID)
@ -4732,4 +4734,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - 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 $

26
configure.in
View File

@ -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) AC_INIT(ssh.c)
@ -1215,15 +1215,31 @@ AC_ARG_WITH(kerberos4,
fi fi
AC_CHECK_HEADERS(krb.h) AC_CHECK_HEADERS(krb.h)
AC_CHECK_LIB(krb, main)
if test "$ac_cv_header_krb_h" != yes; then if test "$ac_cv_header_krb_h" != yes; then
AC_MSG_WARN([Cannot find krb.h, build may fail]) AC_MSG_WARN([Cannot find krb.h, build may fail])
fi fi
AC_CHECK_LIB(krb, main)
if test "$ac_cv_lib_krb_main" != yes; then 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 fi
KLIBS="-lkrb -ldes"
AC_CHECK_LIB(resolv, dn_expand, , ) AC_CHECK_LIB(resolv, dn_expand, , )
KRB4=yes KRB4=yes
KRB4_MSG="yes" KRB4_MSG="yes"