diff options
author | Adam Chlipala <adam@chlipala.net> | 2012-01-09 08:38:53 -0500 |
---|---|---|
committer | Adam Chlipala <adam@chlipala.net> | 2012-01-09 08:38:53 -0500 |
commit | 081a50bc09a07e72cd09b084ce7b015f916ab388 (patch) | |
tree | e496185cae6811f7e909ba2291e970198c671626 /src | |
parent | 70eb9a740815d7eeb64092d8ae53b189c73420e5 (diff) |
Revert ax_check_openssl.m4 and instead compensate for Ubuntu weirdness in config.sml
Diffstat (limited to 'src')
-rw-r--r-- | src/config.sml.in | 6 |
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@" |