test 5

6 files changed, 11 insertions, 3 deletions

diff --git a/configure.ac b/configure.ac
index bd52aa4c..d6b1c98f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,7 @@ AC_SUBST(VERSION)
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)
 AC_SUBST(ICU_INCLUDES)
+AC_SUBST(ICU_LIBS)
 
 AC_CONFIG_FILES([
         Makefile
diff --git a/src/compiler.sml b/src/compiler.sml
index 9ee88c9b..06615bcf 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -1585,9 +1585,9 @@ fun compileC {cname, oname, ename, libs, profile, debug, linker, link = link'} =
         val proto = Settings.currentProtocol ()
 
         val lib = if Settings.getBootLinking () then
-                      !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a -licui18n -licuuc -licudata"
+                      !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata"
                   else if Settings.getStaticLinking () then
-                      " -static " ^ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a -licui18n -licuuc -licudata"
+                      " -static " ^ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata"
                   else
                       "-L" ^ !Settings.configLib ^ " " ^ #linkDynamic proto ^ " -lurweb"
 
diff --git a/src/config.sig b/src/config.sig
index a3ad7d76..be72a8cc 100644
--- a/src/config.sig
+++ b/src/config.sig
@@ -20,4 +20,7 @@ signature CONFIG = sig
 
     val pthreadCflags : string
     val pthreadLibs : string
+
+    val icuIncludes : string
+    val icuLibs : string
 end
diff --git a/src/config.sml.in b/src/config.sml.in
index ebcdb7b6..2d12e28d 100644
--- a/src/config.sml.in
+++ b/src/config.sml.in
@@ -28,6 +28,9 @@ val pgheader = "@PGHEADER@"
 val msheader = "@MSHEADER@"
 val sqheader = "@SQHEADER@"
 
+val icuIncludes = "@ICU_INCLUDES@"
+val icuLibs = "@ICU_LIBS@"
+
 val versionNumber  = "@VERSION@"
 val versionString  = "The Ur/Web compiler, version " ^ versionNumber
 
diff --git a/src/settings.sig b/src/settings.sig
index 986d6ed7..22dc80a2 100644
--- a/src/settings.sig
+++ b/src/settings.sig
@@ -37,6 +37,7 @@ signature SETTINGS = sig
     val configSrcLib : string ref
     val configInclude : string ref
     val configSitelisp : string ref
+    val configIcuLibs : string ref
 
     val libUr : unit -> string
     val libC : unit -> string
diff --git a/src/settings.sml b/src/settings.sml
index cfbe98a5..8ae2d377 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -32,7 +32,7 @@ val configLib = ref Config.lib
 val configSrcLib = ref Config.srclib
 val configInclude = ref Config.includ
 val configSitelisp = ref Config.sitelisp
-
+val configIcuLibs = ref Config.icuLibs
 val configCCompiler = ref Config.ccompiler
 
 fun getCCompiler () = !configCCompiler