[ooo-build-commit] .: bin/unpack configure.in download.in patches/dev300

[Fridrich Strba]

 bin/unpack                                   |    7 -------
 configure.in                                 |    2 +-
 download.in                                  |    2 +-
 patches/dev300/languagetool-makefile-mk.diff |    3 ++-
 4 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 5eb02878462bf7f583d8e987dd628a614a828e3c
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Jul 16 07:58:21 2010 +0200

    Fix the in-tree build of languagetool
    
    * bin/unpack:
    * configure.in:
    * download.in:
    * patches/dev300/languagetool-makefile-mk.diff:

diff --git a/bin/unpack b/bin/unpack
index e661f98..cfb8f4c 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -923,13 +923,6 @@ if test "x$GOOGLE_DOCS_EXTENSION" != "x"; then
     $GNUCP $SRCDIR/$GOOGLE_DOCS_EXTENSION -d $OOBUILDDIR/extras/source/extensions/gdocs.oxt || exit 1
 fi
 
-if test "x$LANGUAGETOOL_EXTENSION" != "x"; then
-    check_file $SRCDIR/$LANGUAGETOOL_EXTENSION
-    echo "Copying LanguageTool extension into the tree"
-    mkdir -p $OOBUILDDIR/languagetool/download || exit 1
-    $GNUCP $SRCDIR/$LANGUAGETOOL_EXTENSION -d $OOBUILDDIR/languagetool/download || exit 1
-fi
-
 if test "x$OOOBLOGGER_EXTENSION" != "x"; then
     check_file $SRCDIR/$OOOBLOGGER_EXTENSION
     echo "Copying oooblogger extension into the tree"
diff --git a/configure.in b/configure.in
index fc0280e..a2de45a 100644
--- a/configure.in
+++ b/configure.in
@@ -1446,7 +1446,7 @@ AC_SUBST(NLPSOLVER_EXTENSION)
 AC_MSG_CHECKING([whether to include LanguageTool extension])
 if test "$enable_extensions" != "no" ; then
     if test "z$with_languagetool" = "zyes" ; then
-	LANGUAGETOOL_EXTENSION="JLanguageTool-1.0.0.tar.bz2"
+	LANGUAGETOOL_EXTENSION="47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
 	WITH_LANGUAGETOOL=YES
         AC_MSG_RESULT([yes])
     else
diff --git a/download.in b/download.in
index 9ec856d..562506e 100755
--- a/download.in
+++ b/download.in
@@ -176,7 +176,7 @@ sub download_tests_dependencies() {
     '*nlpsolver*'                => 'http://download.go-oo.org/src/',
 
 # LanguageTool Extension
-    'JLanguageTool*'            => 'http://download.go-oo.org/src/',
+    '*JLanguageTool*'            => 'http://download.go-oo.org/src/',
 
 # oooblogger Extension
     'oooblogger*'                => 'http://download.go-oo.org/src/',
diff --git a/patches/dev300/languagetool-makefile-mk.diff b/patches/dev300/languagetool-makefile-mk.diff
index b15cf67..d99502e 100644
--- a/patches/dev300/languagetool-makefile-mk.diff
+++ b/patches/dev300/languagetool-makefile-mk.diff
@@ -1,6 +1,6 @@
 --- /dev/null	
 +++ languagetool/makefile.mk	
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,67 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,6 +46,7 @@
 +# --- Files --------------------------------------------------------
 +
 +TARFILE_NAME=JLanguageTool-1.0.0
++TARFILE_MD5=47e1edaa44269bc537ae8cabebb0f638
 +TARFILE_ROOTDIR=JLanguageTool-1.0.0
 +PATCH_FILES=JLanguageTool-1.0.0.patch
 +