- (djm) [configure.ac] Check whether libroken is required when building
with Heimdal
diff --git a/ChangeLog b/ChangeLog
index 1cd3240..39dae04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
spotted by cschneid AT cschneid.com
- (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for
above change
+ - (djm) [configure.ac] Check whether libroken is required when building
+ with Heimdal
20040419
- (dtucker) OpenBSD CVS Sync
@@ -1027,4 +1029,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3328 2004/04/20 10:20:40 djm Exp $
+$Id: ChangeLog,v 1.3329 2004/04/20 10:28:55 djm Exp $
diff --git a/configure.ac b/configure.ac
index 6ba4d24..3e1ee8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.214 2004/04/17 03:03:07 tim Exp $
+# $Id: configure.ac,v 1.215 2004/04/20 10:28:56 djm Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -2207,7 +2207,10 @@
[ char *tmp = heimdal_version; ],
[ AC_MSG_RESULT(yes)
AC_DEFINE(HEIMDAL)
- K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken"
+ K5LIBS="-lkrb5 -ldes"
+ K5LIBS="$K5LIBS -lcom_err -lasn1"
+ AC_CHECK_LIB(roken, net_write,
+ [K5LIBS="$K5LIBS -lroken"])
],
[ AC_MSG_RESULT(no)
K5LIBS="-lkrb5 -lk5crypto -lcom_err"