diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-08 12:33:26 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-09-08 12:33:26 +0000 |
| commit | 84ccee17e5fd544e116814522dad046219c45a76 (patch) | |
| tree | 0780bace4a8a2da0a8f4432019b5e5dd17229fe2 /app-office/libreoffice/files | |
| parent | Version bump, closing bug #382189 (diff) | |
| download | gentoo-2-84ccee17e5fd544e116814522dad046219c45a76.tar.gz gentoo-2-84ccee17e5fd544e116814522dad046219c45a76.tar.bz2 gentoo-2-84ccee17e5fd544e116814522dad046219c45a76.zip | |
Fix the case of passing without-system-libs when using -java.
(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice/files')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-java.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-java.patch b/app-office/libreoffice/files/libreoffice-java.patch new file mode 100644 index 000000000000..ac5b394de356 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-java.patch @@ -0,0 +1,52 @@ +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) + |