diff options
| author | Damien Miller <djm@mindrot.org> | 2001-03-28 14:37:52 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-03-28 14:37:52 +1000 |
| commit | a42a811824e4c0bb8be3453d7ce3c2be0d3912e9 (patch) | |
| tree | ff58e415bdc5a7525122c93a046060446eb3aec7 | |
| parent | e24bfc17bed4e245ad88baa9420ed29423ccc17d (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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 26 |
2 files changed, 24 insertions, 6 deletions
@@ -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 - (djm) Reestablish PAM credentials (which can be supplemental group @@ -4685,4 +4687,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.991.2.13 2001/03/28 04:37:37 djm Exp $ +$Id: ChangeLog,v 1.991.2.14 2001/03/28 04:37:52 djm Exp $ diff --git a/configure.in b/configure.in index 2a891eb2..0c263f2b 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# $Id: configure.in,v 1.267.2.2 2001/03/28 04:37:38 djm Exp $ +# $Id: configure.in,v 1.267.2.3 2001/03/28 04:37:53 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" |