# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1326116333 18000
# Node ID df8f18d50746f0b4a8ece92b9381e319f9cd5b2e
# Parent  f9ffe8497742e7620cfe0ebdd0f328e8e5c460cd
Revert ax_check_openssl.m4 and instead compensate for Ubuntu weirdness in config.sml

diff -r f9ffe8497742 -r df8f18d50746 configure
--- a/configure	Sun Jan 08 15:47:05 2012 -0500
+++ b/configure	Mon Jan 09 08:38:53 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=" -lcrypto -lssl"
+                OPENSSL_LIBS="-lssl -lcrypto"
                 found=true
                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
diff -r f9ffe8497742 -r df8f18d50746 m4/ax_check_openssl.m4
--- a/m4/ax_check_openssl.m4	Sun Jan 08 15:47:05 2012 -0500
+++ b/m4/ax_check_openssl.m4	Mon Jan 09 08:38:53 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=" -lcrypto -lssl"
+                OPENSSL_LIBS="-lssl -lcrypto"
                 found=true
                 AC_MSG_RESULT([yes])
                 break
diff -r f9ffe8497742 -r df8f18d50746 src/config.sml.in
--- a/src/config.sml.in	Sun Jan 08 15:47:05 2012 -0500
+++ b/src/config.sml.in	Mon Jan 09 08:38:53 2012 -0500
@@ -14,8 +14,14 @@
 
 val ccompiler = "@CC@"
 val ccArgs = "@CCARGS@"
+
 val openssl = "@OPENSSL_LDFLAGS@ @OPENSSL_LIBS@"
 
+(* Something is rotten in the state of Ubuntu 11.10, so here's a manual fix that I hope doesn't break other platforms. *)
+val openssl = case String.tokens Char.isSpace openssl of
+                  ["-lssl", "-lcrypto"] => "-lcrypto -lssl"
+                | _ => openssl
+
 val pgheader = "@PGHEADER@"
 val msheader = "@MSHEADER@"
 val sqheader = "@SQHEADER@"