diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cb39888..80c1040 100644 --- a/configure.ac +++ b/configure.ac @@ -5,12 +5,12 @@ # if not 1, append datestamp to the version number. m4_define([libpinyin_released], [1]) m4_define([libpinyin_major_version], [2]) -m4_define([libpinyin_minor_version], [3]) -m4_define([libpinyin_micro_version], [0]) +m4_define([libpinyin_minor_version], [8]) +m4_define([libpinyin_micro_version], [1]) m4_define(libpinyin_maybe_datestamp, m4_esyscmd([if test x]libpinyin_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi])) -m4_define([libpinyin_abi_current], [13]) +m4_define([libpinyin_abi_current], [15]) m4_define([libpinyin_abi_revision], [0]) m4_define([libpinyin_version], @@ -44,11 +44,19 @@ AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AC_PROG_LD AC_GNU_SOURCE AX_CXX_COMPILE_STDCXX([11]) +# Detect whether LLVM ld is being used +using_lld=no +if `$LD -v 2>&1 | grep 'LLVM' >/dev/null 2>&1` ; then + using_lld=yes +fi +AM_CONDITIONAL([LLVMLD], [test "$using_lld" = "yes"]) + # Init libtool AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) @@ -92,9 +100,9 @@ AC_ARG_WITH(dbm, if test x"$DBM" = x"BerkeleyDB"; then # Check Berkeley DB - AC_CHECK_HEADER([db.h], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 4])) + AC_CHECK_HEADER([db.h], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 5])) - AC_SEARCH_LIBS([db_create], [db], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 4])) + AC_SEARCH_LIBS([db_create], [db], [], AC_MSG_ERROR([Cannot find Berkeley DB library version 5])) AC_DEFINE([HAVE_BERKELEY_DB], [], [Have Berkeley DB.]) fi @@ -112,6 +120,9 @@ fi AM_CONDITIONAL([KYOTOCABINET], [test x"$DBM" = x"KyotoCabinet"]) +DATABASE_FORMAT="$DBM" +AC_SUBST(DATABASE_FORMAT) + # --enable-libzhuyin AC_ARG_ENABLE(libzhuyin, AC_HELP_STRING([--enable-libzhuyin], @@ -128,6 +139,7 @@ AC_CONFIG_FILES([libpinyin.pc Makefile doc/Makefile data/Makefile + data/table.conf src/Makefile src/include/Makefile src/storage/Makefile |