[ooo-build-commit] .: configure.in download.in

[Fridrich Strba]

 configure.in |    8 --------
 download.in  |   14 --------------
 2 files changed, 22 deletions(-)

New commits:
commit c77666e339b0bcbe13c6aa58b191c7e1b89a5408
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 20 10:00:08 2010 +0200

    Don't download again tarballs downloaded by the upstream fetch_tarballs.sh

diff --git a/configure.in b/configure.in
index c61ba90..c92ad2c 100644
--- a/configure.in
+++ b/configure.in
@@ -1304,8 +1304,6 @@ else
     SYSTEM_LIBWPD=NO
     if test "$UNSTABLE_WP" = "YES"; then
         LIBWPD_TARBALL=32c8599f6f4cbb420e485288f74b398a-libwpd-0.9.0~CVS20081118.tar.gz
-    else
-        LIBWPD_TARBALL=64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPD)
@@ -1317,8 +1315,6 @@ else
     SYSTEM_LIBWPS=NO
     if test "$UNSTABLE_WP" = "YES"; then
         LIBWPS_TARBALL=3c77ef8cb348ab6f98ebf53961cc59ea-libwps-0.2.0~CVS20081118.tar.gz
-    else
-        LIBWPS_TARBALL=799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPS)
@@ -1330,8 +1326,6 @@ else
     SYSTEM_LIBWPG=NO
     if test "$UNSTABLE_WP" = "YES"; then
         LIBWPG_TARBALL=6f0defec3c4342c0f3e1a1fe50f3f5f9-libwpg-0.2.0~CVS20081118.tar.gz
-    else
-        LIBWPG_TARBALL=db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPG)
@@ -1342,10 +1336,8 @@ if test "$with_system_zlib" = "yes"; then
     SYSTEM_ZLIB=YES
 else
     SYSTEM_ZLIB=NO
-        ZLIB_TARBALL=debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 fi
 AC_SUBST(SYSTEM_ZLIB)
-AC_SUBST(ZLIB_TARBALL)
 
 
 AC_MSG_CHECKING([for Sun Professional Template Pack integration (only supported languages displayed)])
diff --git a/download.in b/download.in
index 94002e9..044e404 100755
--- a/download.in
+++ b/download.in
@@ -204,9 +204,6 @@ sub download_tests_dependencies() {
     'NLPSolver*'                	 => 'http://download.go-oo.org/src/',
     '*nlpsolver*'                	 => 'http://download.go-oo.org/src/',
 
-# LanguageTool Extension
-    '*JLanguageTool*'            	 => 'http://download.go-oo.org/src/',
-
 # oooblogger Extension
     'oooblogger*'                	 => 'http://download.go-oo.org/src/',
 
@@ -218,9 +215,6 @@ sub download_tests_dependencies() {
 
 # Multi-dimensional data structure
     'cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2' => 'http://hg.services.openoffice.org/binaries/',
-
-# Updated zlib
-    '*-zlib-*' 				 => 'http://download.go-oo.org/src/',
 );
 
 
@@ -542,10 +536,6 @@ if ('@SYSTEM_LIBWPG@' eq 'NO') {
    source_file( '@LIBWPG_TARBALL@' );
 }
 
-if ('@SYSTEM_ZLIB@' ne 'YES') {
-   source_file( '@ZLIB_TARBALL@' );
-}
-
 if ('@OOOP_FONTS_PACK@' ne '') {
     source_file( '@OOOP_FONTS_PACK@' );
 }
@@ -597,10 +587,6 @@ if ('@NLPSOLVER_EXTENSION@' ne '') {
     source_file( '@NLPSOLVER_EXTENSION@' );
 }
 
-if ('@LANGUAGETOOL_EXTENSION@' ne '') {
-    source_file( '@LANGUAGETOOL_EXTENSION@' );
-}
-
 if ('@OOOBLOGGER_EXTENSION@' ne '') {
     source_file( '@OOOBLOGGER_EXTENSION@' );
 }