diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-04 10:56:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-07 11:53:46 +0200 |
| commit | 24d59c9e044dfc04013b5d364237245b314f62ed (patch) | |
| tree | 818abe2ed383f9bb65402b7573fd3569155a89d3 /configure.ac | |
| parent | 4d7867c3ac20083b5fd943f5bca44b102ccbe20e (diff) | |
configure option to disable libnumbertext
Because we get a crash in CppunitTest_sw_odfexport when compiling with
clang >= 6.0.0
Also had to fix the ENABLE_LIBNUMBERTEXT being propogated, and the
way the code checked it.
Change-Id: I68e4a0078016d176f478ca4c1110fc296b6ca921
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 52 |
1 files changed, 34 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index cb9ac08c1c47..50e96287124f 100644 --- a/configure.ac +++ b/configure.ac @@ -1169,6 +1169,10 @@ libo_FUZZ_ARG_ENABLE(ooenv, AS_HELP_STRING([--disable-ooenv], [Disable ooenv for the instdir installation.])) +libo_FUZZ_ARG_ENABLE(libnumbertext, + AS_HELP_STRING([--disable-libnumbertext], + [Disable use of numbertext external library.])) + AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable link-time optimization. Suitable for (optimised) product builds. Building might take @@ -9653,25 +9657,36 @@ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) dnl =================================================================== dnl Checking for libnumbertext dnl =================================================================== -ENABLE_LIBNUMBERTEXT=TRUE -libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 1.0.0]) -LIBNUMBERTEXT_CFLAGS="$LIBNUMBERTEXT_CFLAGS -DENABLE_LIBNUMBERTEXT" -if test "$with_system_libnumbertext" = "yes"; then - SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libnumbertext` - SYSTEM_LIBNUMBERTEXT=YES +AC_MSG_CHECKING([whether to use libnumbertext]) +if test "$enable_libnumbertext" = "no"; then + AC_MSG_RESULT([no]) + ENABLE_LIBNUMBERTEXT= + SYSTEM_LIBNUMBERTEXT= else - AC_LANG_PUSH([C++]) - save_CXXFLAGS=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" - AC_CHECK_HEADERS([codecvt regex]) - AS_IF([test "x$ac_cv_header_codecvt" != xyes -o "x$ac_cv_header_regex" != xyes], - [ ENABLE_LIBNUMBERTEXT='' - LIBNUMBERTEXT_CFLAGS='' - AC_MSG_WARN([No system-provided libnumbertext or codecvt/regex C++11 headers (min. libstdc++ 4.9). - Enable libnumbertext fallback (missing number to number name conversion).]) - ]) - CXXFLAGS=$save_CXXFLAGS - AC_LANG_POP([C++]) + AC_MSG_RESULT([yes]) + ENABLE_LIBNUMBERTEXT=TRUE + libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 1.0.0]) + if test "$with_system_libnumbertext" = "yes"; then + SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libnumbertext` + SYSTEM_LIBNUMBERTEXT=YES + else + SYSTEM_LIBNUMBERTEXT= + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" + AC_CHECK_HEADERS([codecvt regex]) + AS_IF([test "x$ac_cv_header_codecvt" != xyes -o "x$ac_cv_header_regex" != xyes], + [ ENABLE_LIBNUMBERTEXT='' + LIBNUMBERTEXT_CFLAGS='' + AC_MSG_WARN([No system-provided libnumbertext or codecvt/regex C++11 headers (min. libstdc++ 4.9). + Enable libnumbertext fallback (missing number to number name conversion).]) + ]) + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi + if test "$ENABLE_LIBNUMBERTEXT" = TRUE; then + AC_DEFINE(ENABLE_LIBNUMBERTEXT) + fi fi AC_SUBST(SYSTEM_LIBNUMBERTEXT) AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) @@ -12732,6 +12747,7 @@ AC_CONFIG_HEADERS([config_host/config_langs.h]) AC_CONFIG_HEADERS([config_host/config_lgpl.h]) AC_CONFIG_HEADERS([config_host/config_libcxx.h]) AC_CONFIG_HEADERS([config_host/config_liblangtag.h]) +AC_CONFIG_HEADERS([config_host/config_libnumbertext.h]) AC_CONFIG_HEADERS([config_host/config_locales.h]) AC_CONFIG_HEADERS([config_host/config_mpl.h]) AC_CONFIG_HEADERS([config_host/config_kde4.h]) |