Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


As requested in the fdo#40687 attaching the from the bug.
From 86454d6b5b1c6aff1466b174ffcf2ad73ea8a5f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.cz>
Date: Thu, 8 Sep 2011 14:20:48 +0200
Subject: [PATCH] Do not search for java packages if --without-java is passed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


Signed-off-by: Tomáš Chvátal <tchvatal@suse.cz>
---
 configure.in |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

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)
 
-- 
1.7.6.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.