/[gentoo-x86]/app-office/libreoffice/files/libreoffice-java.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-java.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Apr 26 11:53:14 2012 UTC (2 years, 3 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Stable on ppc wrt bug#411449. Cleanup.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

1 diff --git a/configure.in b/configure.in
2 index 1dc00d4..262fe00 100755
3 --- a/configure.in
4 +++ b/configure.in
5 @@ -4962,6 +4962,7 @@ AC_SUBST(DB_CPPLIB)
6 dnl ===================================================================
7 dnl Check for system lucene
8 dnl ===================================================================
9 +if test "$with_java" != "no"; then
10 AC_MSG_CHECKING([which lucene to use])
11 if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
12 test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
13 @@ -5021,6 +5022,7 @@ else
14 SYSTEM_LUCENE=NO
15 BUILD_TYPE="$BUILD_TYPE LUCENE"
16 fi
17 +fi
18 AC_SUBST(SYSTEM_LUCENE)
19 AC_SUBST(LUCENE_CORE_JAR)
20 AC_SUBST(LUCENE_ANALYZERS_JAR)
21 @@ -5189,6 +5191,7 @@ AC_SUBST(HSQLDB_JAR)
22 dnl ===================================================================
23 dnl Check for system beanshell
24 dnl ===================================================================
25 +if test "$with_java" != "no"; then
26 AC_MSG_CHECKING([which beanshell to use])
27 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
28 test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
29 @@ -5204,6 +5207,7 @@ else
30 SYSTEM_BSH=NO
31 BUILD_TYPE="$BUILD_TYPE BSH"
32 fi
33 +fi
34 AC_SUBST(SYSTEM_BSH)
35 AC_SUBST(BSH_JAR)
36
37 @@ -5211,6 +5215,7 @@ AC_SUBST(BSH_JAR)
38 dnl ===================================================================
39 dnl Check for system saxon
40 dnl ===================================================================
41 +if test "$with_java" != "no"; then
42 AC_MSG_CHECKING([which saxon to use])
43 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
44 test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
45 @@ -5310,6 +5315,7 @@ else
46 SYSTEM_SAXON=NO
47 NEED_SAXON=TRUE
48 fi
49 +fi
50 AC_SUBST(SYSTEM_SAXON)
51 AC_SUBST(SAXON_JAR)
52

  ViewVC Help
Powered by ViewVC 1.1.20