summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar fab <fabrice.leal.ch@gmail.com>2018-12-17 22:05:18 +0000
committerGravatar fab <fabrice.leal.ch@gmail.com>2018-12-17 22:05:18 +0000
commitea79cb9fc1cfbb1418a8c4139200ba4b21dc2318 (patch)
tree1750cc733527a40da85ddd27e58e6afbc16d34fb
parente45f51c67dcba21af1036468b84bf6fd634835e9 (diff)
test 4
-rw-r--r--.travis.yml3
-rw-r--r--src/c/Makefile.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index b5a213c5..1becfb0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: c
os:
- osx
+ - linux
compiler:
- gcc
@@ -21,7 +22,9 @@ before_install:
- if command -v brew &>/dev/null; then brew uninstall libtool; fi
- if command -v brew &>/dev/null; then brew install libtool; fi
- if command -v brew &>/dev/null; then brew install openssl mlton icu4c; fi
+ - if command -v brew &>/dev/null; then brew ls --verbose icu4c; fi
- if command -v brew &>/dev/null; then export ICU_INCLUDES=-I"`brew --prefix icu4c`/include"; fi
+ - if command -v brew &>/dev/null; then export ICU_LIBS=-L"`brew --prefix icu4c`/lib"; fi
- if command -v brew &>/dev/null; then export CONFIGURE_ARGS="--with-openssl=/usr/local/opt/openssl"; fi
diff --git a/src/c/Makefile.am b/src/c/Makefile.am
index 8a2a81ec..819dd2c2 100644
--- a/src/c/Makefile.am
+++ b/src/c/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = -Wall -Wunused-parameter -Werror -Wno-format-security -Wno-deprecate
liburweb_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS) \
-export-symbols-regex '^(client_pruner|pthread_create_big|strcmp_nullsafe|uw_.*)' \
-version-info 1:0:0
-liburweb_la_LIBADD = $(PTHREAD_LIBS) -lm $(OPENSSL_LIBS) -licui18n -licuuc -licudata
+liburweb_la_LIBADD = $(PTHREAD_LIBS) -lm $(OPENSSL_LIBS) $(ICU_LIBS) -licui18n -licuuc -licudata
liburweb_http_la_LIBADD = liburweb.la
liburweb_http_la_LDFLAGS = -export-symbols-regex '^(main|uw_.*)' \
-version-info 1:0:0