Revert ax_check_openssl.m4 and instead compensate for Ubuntu weirdness in config.sml

1 files changed, 6 insertions, 0 deletions

diff --git a/src/config.sml.in b/src/config.sml.in
index 1d7e450f..03f3cc71 100644
--- a/src/config.sml.in
+++ b/src/config.sml.in
@@ -14,8 +14,14 @@ val libJs = OS.Path.joinDirFile {dir = lib,
 
 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@"