diff options
| author |  fab <fabrice.leal.ch@gmail.com> | 2018-12-17 21:41:10 +0000 |
|---|---|---|
| committer | fab <fabrice.leal.ch@gmail.com> | 2018-12-17 21:41:10 +0000 |
| commit | 3f70998a08b5169b3846537a8b6114465fca2b1a (patch) | |
| tree | 27b6d74206b1aa8e07eb95389e969bedaad52fcc | |
| parent | d036b4badacc7e683fa5e3ba79570bc560c47aa6 (diff) | |
test2
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/c/Makefile.am | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index eaeefd7e..2c798801 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,7 @@ 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 brew --prefix icu4c; fi - - if command -v brew &>/dev/null; then brew unlink icu4c && brew link icu4c; fi + - if command -v brew &>/dev/null; then export ICU_INCLUDES=`brew --prefix icu4c`/include; fi - if command -v brew &>/dev/null; then export CONFIGURE_ARGS="--with-openssl=/usr/local/opt/openssl"; fi diff --git a/configure.ac b/configure.ac index 54eac40e..bd52aa4c 100644 --- a/configure.ac +++ b/configure.ac @@ -125,6 +125,7 @@ AC_SUBST(SQHEADER) AC_SUBST(VERSION) AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) +AC_SUBST(ICU_INCLUDES) AC_CONFIG_FILES([ Makefile diff --git a/src/c/Makefile.am b/src/c/Makefile.am index 96c1d92f..8a2a81ec 100644 --- a/src/c/Makefile.am +++ b/src/c/Makefile.am @@ -6,7 +6,7 @@ liburweb_cgi_la_SOURCES = cgi.c liburweb_fastcgi_la_SOURCES = fastcgi.c fastcgi.h liburweb_static_la_SOURCES = static.c -AM_CPPFLAGS = -I$(srcdir)/../../include/urweb $(OPENSSL_INCLUDES) +AM_CPPFLAGS = -I$(srcdir)/../../include/urweb $(OPENSSL_INCLUDES) $(ICU_INCLUDES) AM_CFLAGS = -Wall -Wunused-parameter -Werror -Wno-format-security -Wno-deprecated-declarations -U_FORTIFY_SOURCE $(PTHREAD_CFLAGS) liburweb_la_LDFLAGS = $(AM_LDFLAGS) $(OPENSSL_LDFLAGS) \ -export-symbols-regex '^(client_pruner|pthread_create_big|strcmp_nullsafe|uw_.*)' \ |