Mercurial > urweb

diff src/config.sml.in @ 1666:df8f18d50746

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert ax_check_openssl.m4 and instead compensate for Ubuntu weirdness in config.sml
author Adam Chlipala <adam@chlipala.net>
date Mon, 09 Jan 2012 08:38:53 -0500
parents 7770ef82c463
children dae2c6fbf16c
line wrap: on
line diff
--- 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@"