diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2020-05-30 19:49:56 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2020-05-30 19:49:56 -0400 |
commit | c2f1e1096f602b1cbd4531352f3e1ea6d656a186 (patch) | |
tree | ae102982878bb0c31bdfe07209e60bfc14030490 /configure.ac | |
parent | 095c2640aa2070ed4e2765875238d5e6e6673856 (diff) | |
parent | 5a0b639dfbd7db9d16c6995f72ba17152a1f362d (diff) |
Merge branch 'upstream' into dfsg_clean20200209+dfsgdfsg_clean
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 44c6873f..1bd7fd3b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([urweb], [20180616]) +AC_INIT([urweb], [20200209]) WORKING_VERSION=0 AC_USE_SYSTEM_EXTENSIONS @@ -91,6 +91,20 @@ if test [-z $SQHEADER]; then SQHEADER=sqlite3.h fi +if test [-z $ICU_INCLUDES]; then + ICU_INCLUDES= +fi + +CPPFLAGS=$ICU_INCLUDES$CPPFLAGS + +if test [-z $ICU_LIBS]; then + ICU_LIBS= +fi + +AC_CHECK_HEADERS([unicode/utypes.h], + [], + [echo "You must install ICU."; exit 1]) + if test [$WORKING_VERSION = "1"]; then VERSION="$VERSION + `git log -1 --format="%H" || echo ?`" fi @@ -111,6 +125,8 @@ pthread_t a; AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) +AC_CHECK_FUNCS_ONCE([memmem]) + AC_SUBST(CC) AC_SUBST(BIN) AC_SUBST(LIB) @@ -125,6 +141,8 @@ AC_SUBST(SQHEADER) AC_SUBST(VERSION) AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_LIBS) +AC_SUBST(ICU_INCLUDES) +AC_SUBST(ICU_LIBS) AC_CONFIG_FILES([ Makefile @@ -148,6 +166,8 @@ Ur/Web configuration: Postgres C header: PGHEADER $PGHEADER MySQL C header: MSHEADER $MSHEADER SQLite C header: SQHEADER $SQHEADER + ICU includes: ICU_INCLUDES $ICU_INCLUDES + ICU libs: ICU_LIBS $ICU_LIBS OpenSSL: OPENSSL_LIBS $OPENSSL_LIBS pthreads: PTHREAD_CFLAGS $PTHREAD_CFLAGS PTHREAD_LIBS $PTHREAD_LIBS |