From 081a50bc09a07e72cd09b084ce7b015f916ab388 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Mon, 9 Jan 2012 08:38:53 -0500 Subject: Revert ax_check_openssl.m4 and instead compensate for Ubuntu weirdness in config.sml --- src/config.sml.in | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/config.sml.in') 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@" -- cgit v1.2.3