summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 633d70c36..a1e2c6836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,8 +21,8 @@
21 - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call 21 - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call
22 disable_forwarding() from compat library. Prevent linker errrors trying 22 disable_forwarding() from compat library. Prevent linker errrors trying
23 to resolve it for binaries other than sshd. ok djm@ 23 to resolve it for binaries other than sshd. ok djm@
24 24 - (dtucker) [configure.ac] Bug #854: prepend pwd to relative --with-ssl-dir
25 when 25 paths. ok djm@
26 26
2720050208 2720050208
28 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the 28 - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
@@ -2112,4 +2112,4 @@
2112 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2112 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2113 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2113 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2114 2114
2115$Id: ChangeLog,v 1.3645 2005/02/09 06:08:23 dtucker Exp $ 2115$Id: ChangeLog,v 1.3646 2005/02/09 11:12:30 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 86b26daf9..3ccbbaf0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.237 2005/02/02 12:30:25 dtucker Exp $ 1# $Id: configure.ac,v 1.238 2005/02/09 11:12:31 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -1226,6 +1226,10 @@ AC_ARG_WITH(ssl-dir,
1226 [ --with-ssl-dir=PATH Specify path to OpenSSL installation ], 1226 [ --with-ssl-dir=PATH Specify path to OpenSSL installation ],
1227 [ 1227 [
1228 if test "x$withval" != "xno" ; then 1228 if test "x$withval" != "xno" ; then
1229 case "$withval" in
1230 # Relative paths
1231 ./*|../*) withval="`pwd`/$withval"
1232 esac
1229 if test -d "$withval/lib"; then 1233 if test -d "$withval/lib"; then
1230 if test -n "${need_dash_r}"; then 1234 if test -n "${need_dash_r}"; then
1231 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" 1235 LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"