- (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir

   in the openssl install directory (some newer openssl versions do this on at
   least some amd64 platforms).

2 files changed, 13 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3b345ecf2..6dbaa1647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20100423
+ - (dtucker) [configure.ac] Bug #1756: Check for the existence of a lib64 dir
+   in the openssl install directory (some newer openssl versions do this on at
+   least some amd64 platforms).
+
 20100418
  - OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2010/04/16 06:45:01
diff --git a/configure.ac b/configure.ac
index 0a0e2ea15..c5da72edb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.449 2010/04/10 12:58:01 dtucker Exp $
+# $Id: configure.ac,v 1.450 2010/04/23 01:12:06 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.449 $)
+AC_REVISION($Revision: 1.450 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1906,6 +1906,12 @@ AC_ARG_WITH(ssl-dir,
                                 else
                                         LDFLAGS="-L${withval}/lib ${LDFLAGS}"
                                 fi
+                        elif test -d "$withval/lib64"; then
+                                if test -n "${need_dash_r}"; then
+                                        LDFLAGS="-L${withval}/lib64 -R${withval}/lib64 ${LDFLAGS}"
+                                else
+                                        LDFLAGS="-L${withval}/lib64 ${LDFLAGS}"
+                                fi
                         else
                                 if test -n "${need_dash_r}"; then
                                         LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"