Author: pfg
Date: Mon Oct 15 00:57:47 2012
New Revision: 1398163

URL: http://svn.apache.org/viewvc?rev=1398163&view=rev
Log:
#121191# Avoid downloading some tarballs when using system versions.

Modified:
    incubator/ooo/trunk/main/external_deps.lst

Modified: incubator/ooo/trunk/main/external_deps.lst
URL: 
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/external_deps.lst?rev=1398163&r1=1398162&r2=1398163&view=diff
==============================================================================
--- incubator/ooo/trunk/main/external_deps.lst (original)
+++ incubator/ooo/trunk/main/external_deps.lst Mon Oct 15 00:57:47 2012
@@ -47,7 +47,7 @@ if ( true )
     URL1 = 
http://sourceforge.net/projects/hunspell/files/MyThes/1.2.0/mythes-1.2.0.tar.gz/download
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if ( true )
+if (SYSTEM_MDDS != YES)
     MD5 = 0dd138efff4412c707e239290fb82d4f
     name = mdds_0.3.1.tar.bz2
     URL1 = http://multidimalgorithm.googlecode.com/files/mdds_0.3.1.tar.bz2
@@ -270,7 +270,7 @@ if (RAT_JAR_HOME==BUILD)
 # Libraries with category B license
 #
 
-if (ENABLE_CATEGORY_B==YES)
+if (ENABLE_CATEGORY_B==YES && SYSTEM_COINMP!=YES)
     MD5 = 2b5f1ca58d6ef30f18f1415b65bed81c
     name = CoinMP-1.6.0.tgz
     URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
@@ -282,7 +282,7 @@ if (WITH_CATB_FONTS == YES)
     # URL1 = 
http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=GentiumBasic_110&filename=GentiumBasic_110.zip
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (ENABLE_CATEGORY_B==YES && ENABLE_HYPHEN==YES)
+if (ENABLE_CATEGORY_B==YES && SYSTEM_HYPH!=YES)
     MD5 = 48a9f787f43a09c0a9b7b00cd1fddbbf
     name = hyphen-2.7.1.tar.gz
     URL1 = 
http://sourceforge.net/projects/hunspell/files/Hyphen/2.7/hyphen-2.7.1.tar.gz/download
@@ -293,7 +293,7 @@ if (ENABLE_CATEGORY_B==YES && WITH_CATB_
     name = croscorefonts-1.21.0.tar.gz
     URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (ENABLE_CATEGORY_B==YES && ENABLE_HUNSPELL==YES)
+if (ENABLE_CATEGORY_B==YES && SYSTEM_HUNSPELL!=YES)
     name = hunspell-1.3.2.tar.gz
     MD5 = 3121aaf3e13e5d88dfff13fb4a5f1ab8
     URL1 = 
http://sourceforge.net/projects/hunspell/files/Hunspell/1.3.2/hunspell-1.3.2.tar.gz/download
@@ -343,7 +343,7 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_GRA
     URL1 = 
http://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/silgraphite-2.3.1.tar.gz/download
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && DISABLE_BEANSHELL!=YES)
+if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES)
     MD5 = ea570af93c284aa9e5621cd563f54f4d
     name = bsh-2.0b1-src.tar.gz
     # This used to be the original host, but the link is broken.


Reply via email to