You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/app-office/libreoffice/files/libreoffice-java.patch

53 lines
1.8 KiB

diff --git a/configure.in b/configure.in
index 1dc00d4..262fe00 100755
--- a/configure.in
+++ b/configure.in
@@ -4962,6 +4962,7 @@ AC_SUBST(DB_CPPLIB)
dnl ===================================================================
dnl Check for system lucene
dnl ===================================================================
+if test "$with_java" != "no"; then
AC_MSG_CHECKING([which lucene to use])
if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
@@ -5021,6 +5022,7 @@ else
SYSTEM_LUCENE=NO
BUILD_TYPE="$BUILD_TYPE LUCENE"
fi
+fi
AC_SUBST(SYSTEM_LUCENE)
AC_SUBST(LUCENE_CORE_JAR)
AC_SUBST(LUCENE_ANALYZERS_JAR)
@@ -5189,6 +5191,7 @@ AC_SUBST(HSQLDB_JAR)
dnl ===================================================================
dnl Check for system beanshell
dnl ===================================================================
+if test "$with_java" != "no"; then
AC_MSG_CHECKING([which beanshell to use])
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
@@ -5204,6 +5207,7 @@ else
SYSTEM_BSH=NO
BUILD_TYPE="$BUILD_TYPE BSH"
fi
+fi
AC_SUBST(SYSTEM_BSH)
AC_SUBST(BSH_JAR)
@@ -5211,6 +5215,7 @@ AC_SUBST(BSH_JAR)
dnl ===================================================================
dnl Check for system saxon
dnl ===================================================================
+if test "$with_java" != "no"; then
AC_MSG_CHECKING([which saxon to use])
if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
@@ -5310,6 +5315,7 @@ else
SYSTEM_SAXON=NO
NEED_SAXON=TRUE
fi
+fi
AC_SUBST(SYSTEM_SAXON)
AC_SUBST(SAXON_JAR)