From 87cd4f01bb611d65ea6914ce2d588f6c2a924c58 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Fri, 6 Jan 2012 18:09:50 -0500
Subject: Switch default linking order for OpenSSL libs

---
 configure              | 3 ++-
 configure.ac           | 1 +
 m4/ax_check_openssl.m4 | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 734371d0..aab4b47e 100755
--- a/configure
+++ b/configure
@@ -12348,7 +12348,7 @@ $as_echo_n "checking for openssl/ssl.h in $ssldir... " >&6; }
             if test -f "$ssldir/include/openssl/ssl.h"; then
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib"
-                OPENSSL_LIBS="-lssl -lcrypto"
+                OPENSSL_LIBS=" -lcrypto -lssl"
                 found=true
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -15028,6 +15028,7 @@ Ur/Web configuration:
   Postgres C header:   PGHEADER       $PGHEADER
   MySQL C header:      MSHEADER       $MSHEADER
   SQLite C header:     SQHEADER       $SQHEADER
+  OpenSSL:             OPENSSL_LIBS   $OPENSSL_LIBS
 
   Version:             $VERSION
 EOF
diff --git a/configure.ac b/configure.ac
index 6e35edb3..11ce7ced 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,6 +119,7 @@ Ur/Web configuration:
   Postgres C header:   PGHEADER       $PGHEADER
   MySQL C header:      MSHEADER       $MSHEADER
   SQLite C header:     SQHEADER       $SQHEADER
+  OpenSSL:             OPENSSL_LIBS   $OPENSSL_LIBS
 
   Version:             $VERSION
 EOF
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index 065fff85..e653e8b9 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -79,7 +79,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [
             if test -f "$ssldir/include/openssl/ssl.h"; then
                 OPENSSL_INCLUDES="-I$ssldir/include"
                 OPENSSL_LDFLAGS="-L$ssldir/lib"
-                OPENSSL_LIBS="-lssl -lcrypto"
+                OPENSSL_LIBS=" -lcrypto -lssl"
                 found=true
                 AC_MSG_RESULT([yes])
                 break
-- 
cgit v1.2.3