config_host.mk.in | 1 +
configure.ac | 30 ++----------------------------
2 files changed, 3 insertions(+), 28 deletions(-)
New commits:
commit d951a054445ad3741d678f422a5b605feae06a6b
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Dec 25 08:41:04 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Dec 30 04:18:01 2021 +0100
Use libo_CHECK_SYSTEM_MODULE for clucene
Change-Id: I8b3e6ae8e66b894119784a6ac9190dee4c7ca407
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127640
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index 2717ef888d13..7a4bf2cdcce0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -140,6 +140,7 @@ export DEFAULT_CRASHDUMP_VALUE=@DEFAULT_CRASHDUMP_VALUE@
export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
export ENABLE_CIPHER_OPENSSL_BACKEND=@ENABLE_CIPHER_OPENSSL_BACKEND@
+export ENABLE_CLUCENE=@ENABLE_CLUCENE@
export ENABLE_LIBCMIS=@ENABLE_LIBCMIS@
export ENABLE_COINMP=@ENABLE_COINMP@
export SYSTEM_COINMP=@SYSTEM_COINMP@
diff --git a/configure.ac b/configure.ac
index 93076f8692c9..ee16840053ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2133,11 +2133,6 @@ AC_ARG_WITH(system-jpeg,
[Use jpeg already on system.]),,
[with_system_jpeg="$with_system_libs"])
-AC_ARG_WITH(system-clucene,
- AS_HELP_STRING([--with-system-clucene],
- [Use clucene already on system.]),,
- [with_system_clucene="$with_system_libs"])
-
AC_ARG_WITH(system-expat,
AS_HELP_STRING([--with-system-expat],
[Use expat already on system.]),,
@@ -9309,18 +9304,8 @@ AC_SUBST(SYSTEM_LIBJPEG)
dnl ===================================================================
dnl Check for system clucene
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
-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
- PKG_CHECK_MODULES(CLUCENE, libclucene-core)
- CLUCENE_CFLAGS=[$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 's@-I[^
]*/CLucene/ext@@' -e "s/-I/${ISYSTEM?}/g")]
- FilterLibs "${CLUCENE_LIBS}"
- CLUCENE_LIBS="${filteredlibs}"
+libo_CHECK_SYSTEM_MODULE([clucene],[CLUCENE],[liblucence-core])
+if test "$SYSTEM_CLUCENE" = TRUE; then
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
@@ -9333,19 +9318,8 @@ if test "$with_system_clucene" = "yes"; then
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++])
-
CLUCENE_LIBS="$CLUCENE_LIBS -lclucene-contribs-lib"
-else
- AC_MSG_RESULT([internal])
- SYSTEM_CLUCENE=
- BUILD_TYPE="$BUILD_TYPE CLUCENE"
-fi
-else
- AC_MSG_RESULT([not needed])
fi
-AC_SUBST(SYSTEM_CLUCENE)
-AC_SUBST(CLUCENE_CFLAGS)
-AC_SUBST(CLUCENE_LIBS)
dnl ===================================================================
dnl Check for system expat
