diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-21 14:12:10 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-21 17:29:55 +0100 |
| commit | 87cdb3e51f90267be77d535b3acd368bad2f5999 (patch) | |
| tree | ad183e032ae8b35c8260a63e4bc108cdc78933af /configure.ac | |
| parent | 82233965486f88f4ce1313dcf35b4bc688e1832a (diff) | |
Don't build clucene if not needed
Just build it if HELPTOOLS or XMLHELP are in BUILD_TYPE. And
simply tets for clucene just in this case. And since XMLHELP
is not in the list of PERMITTED_BUILD_TARGETS, disable it.
Change-Id: I13fdbf096c60191a428e23c22344f7e22e8c5d66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127231
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 57c3cc5ad5f0..a33f91557e5e 100644 --- a/configure.ac +++ b/configure.ac @@ -818,6 +818,7 @@ disable_database_connectivity_dependencies() # This is also true for most test_* variables. # =================================================================== build_crypto=yes +test_clucene=no test_gdb_index=no test_openldap=yes test_split_debug=no @@ -5373,6 +5374,7 @@ fi AC_MSG_CHECKING([if we need to build the help index tooling]) if test "$with_help" = yes -o "$enable_extension_integration" != no; then BUILD_TYPE="$BUILD_TYPE HELPTOOLS" + test_clucene=yes AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -5402,6 +5404,7 @@ fi AC_MSG_CHECKING([whether to include the XML-help support]) if test "$enable_xmlhelp" = yes; then BUILD_TYPE="$BUILD_TYPE XMLHELP" + test_clucene=yes AC_DEFINE(HAVE_FEATURE_XMLHELP) AC_MSG_RESULT([yes]) else @@ -5514,6 +5517,7 @@ if test "$cross_compiling" = "yes"; then --build="$build_alias" \ --disable-cairo-canvas \ --disable-cups \ + --disable-customtarget-components \ --disable-firebird-sdbc \ --disable-gpgmepp \ --disable-gstreamer-1-0 \ @@ -5526,8 +5530,8 @@ if test "$cross_compiling" = "yes"; then --disable-opencl \ --disable-pdfimport \ --disable-postgresql-sdbc \ - --disable-customtarget-components \ --disable-skia \ + --disable-xmlhelp \ --enable-icecream="$enable_icecream" \ --without-doxygen \ --without-webdav \ @@ -9297,8 +9301,8 @@ dnl =================================================================== dnl we should rather be using dnl libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) here dnl but the contribs-lib check seems tricky -if test "$enable_xmlhelp" = yes -o "$enable_extension_integration" = yes; then AC_MSG_CHECKING([which clucene to use]) +if test "$test_clucene" = yes; then if test "$with_system_clucene" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_CLUCENE=TRUE @@ -9325,6 +9329,8 @@ else SYSTEM_CLUCENE= BUILD_TYPE="$BUILD_TYPE CLUCENE" fi +else + AC_MSG_RESULT([not needed]) fi AC_SUBST(SYSTEM_CLUCENE) AC_SUBST(CLUCENE_CFLAGS) |