Mercurial > urweb

changeset 1661:28b9b3d9414f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch default linking order for OpenSSL libs
author Adam Chlipala <adam@chlipala.net>
date Fri, 06 Jan 2012 18:09:50 -0500
parents b46c93ce7be2
children edf86cef0dba
files configure configure.ac m4/ax_check_openssl.m4
diffstat 3 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri Jan 06 09:40:20 2012 -0500
+++ b/configure	Fri Jan 06 18:09:50 2012 -0500
@@ -12348,7 +12348,7 @@
             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 @@
   Postgres C header:   PGHEADER       $PGHEADER
   MySQL C header:      MSHEADER       $MSHEADER
   SQLite C header:     SQHEADER       $SQHEADER
+  OpenSSL:             OPENSSL_LIBS   $OPENSSL_LIBS
 
   Version:             $VERSION
 EOF
--- a/configure.ac	Fri Jan 06 09:40:20 2012 -0500
+++ b/configure.ac	Fri Jan 06 18:09:50 2012 -0500
@@ -119,6 +119,7 @@
   Postgres C header:   PGHEADER       $PGHEADER
   MySQL C header:      MSHEADER       $MSHEADER
   SQLite C header:     SQHEADER       $SQHEADER
+  OpenSSL:             OPENSSL_LIBS   $OPENSSL_LIBS
 
   Version:             $VERSION
 EOF
--- a/m4/ax_check_openssl.m4	Fri Jan 06 09:40:20 2012 -0500
+++ b/m4/ax_check_openssl.m4	Fri Jan 06 18:09:50 2012 -0500
@@ -79,7 +79,7 @@
             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