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 @@
  - (dtucker) [auth-passwd.c openbsd-compat/port-aix.c] Don't call
    disable_forwarding() from compat library. Prevent linker errrors trying
    to resolve it for binaries other than sshd.  ok djm@
-
-   when 
+ - (dtucker) [configure.ac] Bug #854: prepend pwd to relative --with-ssl-dir
+   paths.  ok djm@
 
 20050208
  - (dtucker) [regress/test-exec.sh] Bug #912: Set _POSIX2_VERSION for the
@@ -2112,4 +2112,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.3645 2005/02/09 06:08:23 dtucker Exp $
+$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 @@
-# $Id: configure.ac,v 1.237 2005/02/02 12:30:25 dtucker Exp $
+# $Id: configure.ac,v 1.238 2005/02/09 11:12:31 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -1226,6 +1226,10 @@ AC_ARG_WITH(ssl-dir,
         [  --with-ssl-dir=PATH     Specify path to OpenSSL installation ],
         [
                 if test "x$withval" != "xno" ; then
+                        case "$withval" in
+                                # Relative paths
+                                ./*|../*)       withval="`pwd`/$withval"
+                        esac
                         if test -d "$withval/lib"; then
                                 if test -n "${need_dash_r}"; then
                                         LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"