Mercurial > urweb

comparison 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
comparison
equal deleted inserted replaced
1665:f9ffe8497742 1666:df8f18d50746
12 val libJs = OS.Path.joinDirFile {dir = lib, 12 val libJs = OS.Path.joinDirFile {dir = lib,
13 file = "js"} 13 file = "js"}
14 14
15 val ccompiler = "@CC@" 15 val ccompiler = "@CC@"
16 val ccArgs = "@CCARGS@" 16 val ccArgs = "@CCARGS@"
17
17 val openssl = "@OPENSSL_LDFLAGS@ @OPENSSL_LIBS@" 18 val openssl = "@OPENSSL_LDFLAGS@ @OPENSSL_LIBS@"
19
20 (* Something is rotten in the state of Ubuntu 11.10, so here's a manual fix that I hope doesn't break other platforms. *)
21 val openssl = case String.tokens Char.isSpace openssl of
22 ["-lssl", "-lcrypto"] => "-lcrypto -lssl"
23 | _ => openssl
18 24
19 val pgheader = "@PGHEADER@" 25 val pgheader = "@PGHEADER@"
20 val msheader = "@MSHEADER@" 26 val msheader = "@MSHEADER@"
21 val sqheader = "@SQHEADER@" 27 val sqheader = "@SQHEADER@"
22 28