[Libreoffice-commits] .: 2 commits - configure.in

[Tomáš Chvátal]

 configure.in |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit f9f8d9ac12979e7ec2f269e7f42f1408da9b6795
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Apr 17 09:57:19 2012 +0200

    --enable-ext-languagetool requires --with-java now bit more sanely.

diff --git a/configure.in b/configure.in
index d1dff86..13cc862 100644
--- a/configure.in
+++ b/configure.in
@@ -9655,7 +9655,7 @@ dnl ===================================================================
 dnl Test whether to include LanguageTool extension
 dnl ===================================================================
 AC_MSG_CHECKING([for LanguageTool extension integration])
-if test "x$enable_ext_languagetool" = "xyes" -a "x$enable_extension_integration" != "xno"; then
+if test "x$enable_ext_languagetool" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
     BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
     AC_MSG_RESULT([yes])
commit a774c6e38503975fdeea165db914176ef1c9a3be
Author: Tomas Chvatal <tchvatal at suse.cz>
Date:   Tue Apr 17 09:55:28 2012 +0200

    Revert "--enable-ext-languagetool requires --with-java"
    
    This reverts commit 844b4520a9f0879d7b756654cef8fdbaa03a9000.

diff --git a/configure.in b/configure.in
index eb4e746..d1dff86 100644
--- a/configure.in
+++ b/configure.in
@@ -435,7 +435,7 @@ AC_ARG_ENABLE(ext-hunart,
 
 AC_ARG_ENABLE(ext-languagetool,
     AS_HELP_STRING([--enable-ext-languagetool],
-        [Enable the LanguageTool extension. Does not work --without-java.])
+        [Enable the LanguageTool extension.])
 )
 
 AC_ARG_ENABLE(ext-mysql-connector,
@@ -9656,9 +9656,6 @@ dnl Test whether to include LanguageTool extension
 dnl ===================================================================
 AC_MSG_CHECKING([for LanguageTool extension integration])
 if test "x$enable_ext_languagetool" = "xyes" -a "x$enable_extension_integration" != "xno"; then
-    if test -z "$SOLAR_JAVA"; then
-        AC_MSG_ERROR([--enable_ext_languagetool requires --with-java])
-    fi
     BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
     AC_MSG_RESULT([yes])