summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-04-20 20:28:55 +1000
committerDamien Miller <djm@mindrot.org>2004-04-20 20:28:55 +1000
commit5561e0b73dcaf0d6cf56afcff2a09d87ae14f34e (patch)
tree4f164a5ae793afebd9bf6505c9e46e384c5cccd5
parent50bec89baf0d70f4833ed24fc93300d7f04471f9 (diff)
- (djm) [configure.ac] Check whether libroken is required when building
with Heimdal
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac7
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cd324049..39dae04cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@
23 spotted by cschneid AT cschneid.com 23 spotted by cschneid AT cschneid.com
24 - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for 24 - (djm) [openbsd-compat/sys-queue.h] Sync with OpenBSD, needed for
25 above change 25 above change
26 - (djm) [configure.ac] Check whether libroken is required when building
27 with Heimdal
26 28
2720040419 2920040419
28 - (dtucker) OpenBSD CVS Sync 30 - (dtucker) OpenBSD CVS Sync
@@ -1027,4 +1029,4 @@
1027 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1029 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1028 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1030 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1029 1031
1030$Id: ChangeLog,v 1.3328 2004/04/20 10:20:40 djm Exp $ 1032$Id: ChangeLog,v 1.3329 2004/04/20 10:28:55 djm Exp $
diff --git a/configure.ac b/configure.ac
index 6ba4d244a..3e1ee8aae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.214 2004/04/17 03:03:07 tim Exp $ 1# $Id: configure.ac,v 1.215 2004/04/20 10:28:56 djm Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -2207,7 +2207,10 @@ AC_ARG_WITH(kerberos5,
2207 [ char *tmp = heimdal_version; ], 2207 [ char *tmp = heimdal_version; ],
2208 [ AC_MSG_RESULT(yes) 2208 [ AC_MSG_RESULT(yes)
2209 AC_DEFINE(HEIMDAL) 2209 AC_DEFINE(HEIMDAL)
2210 K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" 2210 K5LIBS="-lkrb5 -ldes"
2211 K5LIBS="$K5LIBS -lcom_err -lasn1"
2212 AC_CHECK_LIB(roken, net_write,
2213 [K5LIBS="$K5LIBS -lroken"])
2211 ], 2214 ],
2212 [ AC_MSG_RESULT(no) 2215 [ AC_MSG_RESULT(no)
2213 K5LIBS="-lkrb5 -lk5crypto -lcom_err" 2216 K5LIBS="-lkrb5 -lk5crypto -lcom_err"