- (djm) [configure.ac] Check whether libdes is needed when building

   with Heimdal krb5 support. On OpenBSD this library no longer exists,
   so linking it unconditionally causes a build failure; ok dtucker

diff --git a/ChangeLog b/ChangeLog
index 5007e8c520daa2934ee347b94120e1d540742261..a1828c1f98bb1157de60a9864df97412ea66082e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 20110102
  - (djm) [loginrec.c] Fix some fd leaks on error paths. ok dtucker
+ - (djm) [configure.ac] Check whether libdes is needed when building
+   with Heimdal krb5 support. On OpenBSD this library no longer exists,
+   so linking it unconditionally causes a build failure; ok dtucker
 
 20101226
  - (dtucker) OpenBSD CVS Sync

diff --git a/Makefile.in b/Makefile.in
index bfd37d51ed0830a11cf6bce494b0c92e125ecb5f..889b23db361d4a010c2f12ef7ce79417142045ad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.311 2010/08/31 12:47:15 djm Exp $
+# $Id: Makefile.in,v 1.312 2011/01/02 10:53:08 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -230,7 +230,7 @@ catman-do:
        @for f in $(MANPAGES_IN) ; do \
                base=`echo $$f | sed 's/\..*$$//'` ; \
                echo "$$f -> $$base.0" ; \
-               nroff -mandoc $$f | cat -v | sed -e 's/.\^H//g' \
+               mandoc $$f | cat -v | sed -e 's/.\^H//g' \
                        >$$base.0 ; \
        done
 

diff --git a/configure.ac b/configure.ac
index 0ea76c8fd1367ca585d63b4335d70b03d672285a..ec562b1c29e02332d6b4b8080aa5a1adce1e9a2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.459 2010/12/04 12:20:50 dtucker Exp $
+# $Id: configure.ac,v 1.460 2011/01/02 10:53:09 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.459 $)
+AC_REVISION($Revision: 1.460 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -3516,10 +3516,12 @@ AC_ARG_WITH(kerberos5,
                                       [ char *tmp = heimdal_version; ],
                                       [ AC_MSG_RESULT(yes)
                                         AC_DEFINE(HEIMDAL)
-                                        K5LIBS="-lkrb5 -ldes"
+                                        K5LIBS="-lkrb5"
                                         K5LIBS="$K5LIBS -lcom_err -lasn1"
                                         AC_CHECK_LIB(roken, net_write,
                                           [K5LIBS="$K5LIBS -lroken"])
+                                        AC_CHECK_LIB(des, des_cbc_encrypt,
+                                          [K5LIBS="$K5LIBS -ldes"])
                                       ],
                                       [ AC_MSG_RESULT(no)
                                         K5LIBS="-lkrb5 -lk5crypto -lcom_err"