summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-10 20:25:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-10 20:25:51 +1000
commit57b2920ad896b4c1b7a6f5ba0171bdb311e8cc36 (patch)
tree8c034054d8a86f471ad343f1258b4deb3deb33fe
parentf376669328e6df2dc78936786787150d98a1df80 (diff)
- (dtucker) [configure.ac] Add -lcrypt to let DragonFly build OOTB.
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac7
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b746504c5..226373ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
120060910 120060910
2 - (dtucker) [contrib/aix/buildbff.sh] Ensure that perl is available. 2 - (dtucker) [contrib/aix/buildbff.sh] Ensure that perl is available.
3 - (dtucker) [configure.ac] Add -lcrypt to let DragonFly build OOTB.
3 4
420060909 520060909
5 - (dtucker) [openbsd-compat/bsd-snprintf.c] Add stdarg.h. 6 - (dtucker) [openbsd-compat/bsd-snprintf.c] Add stdarg.h.
@@ -5423,4 +5424,4 @@
5423 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5424 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5424 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5425 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5425 5426
5426$Id: ChangeLog,v 1.4541 2006/09/10 03:24:18 dtucker Exp $ 5427$Id: ChangeLog,v 1.4542 2006/09/10 10:25:51 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 4a3c39fcb..80b0360c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.362 2006/09/08 15:05:21 dtucker Exp $ 1# $Id: configure.ac,v 1.363 2006/09/10 10:25:51 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.362 $) 18AC_REVISION($Revision: 1.363 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -253,6 +253,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
253 AC_DEFINE(SSH_TUN_PREPEND_AF, 1, 253 AC_DEFINE(SSH_TUN_PREPEND_AF, 1,
254 [Prepend the address family to IP tunnel traffic]) 254 [Prepend the address family to IP tunnel traffic])
255 ;; 255 ;;
256*-*-dragonfly*)
257 SSHDLIBS="$SSHDLIBS -lcrypt"
258 ;;
256*-*-hpux*) 259*-*-hpux*)
257 # first we define all of the options common to all HP-UX releases 260 # first we define all of the options common to all HP-UX releases
258 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" 261 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"