add fetch_Optional to have conditions for download in makefile

This is prepare commit for --with-all-tarballs.
We probably don't want to define the tarball names conditionally in configure.

Change-Id: Id41f73dd7094b3384ce43caf62018f53b3d86a81

Makefile.fetch

@@ -45,100 +45,104 @@ $(call fetch_Download__checksum_command,$2,$(firstword $(subst -, ,$2))) \
 
 endef
 
+define fetch_Optional
+$(if $(filter $1,$(BUILD_TYPE)),$2)
+endef
+
 fetch :
 	$(foreach item, \
-		$(BUILD_TARBALLS) \
+		$(if $(filter YES,$(CROSS_COMPILING)),$(BUILD_TARBALLS)) \
 		18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz \
 		7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz \
 		c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz \
 		4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz \
-		$(AFMS_TARBALL) \
-		$(APACHE_COMMONS_CODEC_TARBALL) \
-		$(APACHE_COMMONS_HTTPCLIENT_TARBALL) \
-		$(APACHE_COMMONS_LANG_TARBALL) \
-		$(APACHE_COMMONS_LOGGING_TARBALL) \
-		$(BOOST_TARBALL) \
-		$(BSH_TARBALL) \
-		$(CAIRO_TARBALL) \
-		$(CDR_TARBALL) \
-		$(CLUCENE_TARBALL) \
-		$(CMIS_TARBALL) \
-		$(CPPUNIT_TARBALL) \
-		$(CT2N_TARBALL) \
-		$(CURL_TARBALL) \
-		$(EPM_TARBALL) \
-		$(EXPAT_TARBALL) \
-		$(FONT_DEJAVU_TARBALL) \
-		$(FONT_GENTIUM_TARBALL) \
-		$(FONT_LIBERATION_NARROW_TARBALL) \
-		$(FONT_LIBERATION_TARBALL) \
-		$(FONT_LINLIBERTINEG_TARBALL) \
-		$(FONT_PTSERIF_TARBALL) \
-		$(FONT_OPENSANS_TARBALL) \
-		$(FONT_SOURCESANS_TARBALL) \
-		$(FONT_SOURCECODE_TARBALL) \
-		$(FONTCONFIG_TARBALL) \
-		$(FREETYPE_TARBALL) \
+		$(call fetch_Optional,AFMS,$(AFMS_TARBALL)) \
+		$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_CODEC_TARBALL)) \
+		$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_HTTPCLIENT_TARBALL)) \
+		$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_LANG_TARBALL)) \
+		$(call fetch_Optional,APACHE_COMMONS,$(APACHE_COMMONS_LOGGING_TARBALL)) \
+		$(call fetch_Optional,BOOST,$(BOOST_TARBALL)) \
+		$(call fetch_Optional,BSH,$(BSH_TARBALL)) \
+		$(call fetch_Optional,CAIRO,$(CAIRO_TARBALL)) \
+		$(call fetch_Optional,CDR,$(CDR_TARBALL)) \
+		$(call fetch_Optional,CLUCENE,$(CLUCENE_TARBALL)) \
+		$(call fetch_Optional,CMIS,$(CMIS_TARBALL)) \
+		$(call fetch_Optional,CPPUNIT,$(CPPUNIT_TARBALL)) \
+		$(call fetch_Optional,CT2N,$(CT2N_TARBALL)) \
+		$(call fetch_Optional,CURL,$(CURL_TARBALL)) \
+		$(call fetch_Optional,EPM,$(EPM_TARBALL)) \
+		$(call fetch_Optional,EXPAT,$(EXPAT_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_DEJAVU_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_GENTIUM_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_LIBERATION_NARROW_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_LIBERATION_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_LINLIBERTINEG_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_PTSERIF_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_OPENSANS_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_SOURCESANS_TARBALL)) \
+		$(call fetch_Optional,MORE_FONTS,$(FONT_SOURCECODE_TARBALL)) \
+		$(call fetch_Optional,FONTCONFIG,$(FONTCONFIG_TARBALL)) \
+		$(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \
 		$(GOOGLE_DOCS_EXTENSION_PACK) \
-		$(GRAPHITE_TARBALL) \
-		$(HSQLDB_TARBALL) \
-		$(HUNSPELL_TARBALL) \
-		$(HYPHEN_TARBALL) \
-		$(ICU_TARBALL) \
-		$(ICU_DATA_SUBSET_ZIP) \
-		$(JFREEREPORT_FLOW_ENGINE_TARBALL) \
-		$(JFREEREPORT_FLUTE_TARBALL) \
-		$(JFREEREPORT_LIBBASE_TARBALL) \
-		$(JFREEREPORT_LIBFONTS_TARBALL) \
-		$(JFREEREPORT_LIBFORMULA_TARBALL) \
-		$(JFREEREPORT_LIBLAYOUT_TARBALL) \
-		$(JFREEREPORT_LIBLOADER_TARBALL) \
-		$(JFREEREPORT_LIBREPOSITORY_TARBALL) \
-		$(JFREEREPORT_LIBSERIALIZER_TARBALL) \
-		$(JFREEREPORT_LIBXML_TARBALL) \
-		$(JFREEREPORT_SAC_TARBALL) \
-		$(JPEG_TARBALL) \
-		$(LANGUAGETOOL_TARBALL) \
-		$(LCMS2_TARBALL) \
-		$(LIBEXTTEXTCAT_TARBALL) \
-		$(LIBLANGTAG_TARBALL) \
-		$(LIBXML_TARBALL) \
+		$(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \
+		$(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \
+		$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
+		$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
+		$(call fetch_Optional,ICU,$(ICU_TARBALL)) \
+		$(call fetch_Optional,ICU,$(ICU_DATA_SUBSET_ZIP)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLOW_ENGINE_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_FLUTE_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBBASE_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBFONTS_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBFORMULA_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBLAYOUT_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBLOADER_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBREPOSITORY_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBSERIALIZER_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_LIBXML_TARBALL)) \
+		$(call fetch_Optional,JFREEREPORT,$(JFREEREPORT_SAC_TARBALL)) \
+		$(call fetch_Optional,JPEG,$(JPEG_TARBALL)) \
+		$(call fetch_Optional,LANGUAGETOOL,$(LANGUAGETOOL_TARBALL)) \
+		$(call fetch_Optional,LCMS2,$(LCMS2_TARBALL)) \
+		$(call fetch_Optional,LIBEXTTEXTCAT,$(LIBEXTTEXTCAT_TARBALL)) \
+		$(call fetch_Optional,LIBLANGTAG,$(LIBLANGTAG_TARBALL)) \
+		$(call fetch_Optional,LIBXML2,$(LIBXML_TARBALL)) \
 		$(LIBXMLSEC_TARBALL) \
-		$(LIBXSLT_TARBALL) \
-		$(LPSOLVE_TARBALL) \
-		$(MDDS_TARBALL) \
-		$(MOZ_TARBALL) \
-		$(MSPUB_TARBALL) \
-		$(MYSQLCPPCONN_TARBALL) \
-		$(MYTHES_TARBALL) \
-		$(NEON_TARBALL) \
-		$(NSS_TARBALL) \
-		$(OPENLDAP_TARBALL) \
-		$(OPENSSL_TARBALL) \
-		$(ORCUS_TARBALL) \
-		$(PIXMAN_TARBALL) \
-		$(PNG_TARBALL) \
-		$(POSTGRESQL_TARBALL) \
-		$(PYTHON_TARBALL) \
-		$(RAPTOR_TARBALL) \
-		$(RASQAL_TARBALL) \
-		$(REDLAND_TARBALL) \
-		$(RHINO_TARBALL) \
-		$(SWING_TARBALL) \
-		$(TOMCAT_TARBALL) \
-		$(UCPP_TARBALL) \
-		$(VIGRA_TARBALL) \
-		$(VISIO_TARBALL) \
-		$(WPD_TARBALL) \
-		$(WPG_TARBALL) \
-		$(WPS_TARBALL) \
-		$(XPDF_TARBALL) \
-		$(XSLTML_TARBALL) \
-		$(ZLIB_TARBALL) \
+		$(call fetch_Optional,LIBXSLT,$(LIBXSLT_TARBALL)) \
+		$(call fetch_Optional,LPSOLVE,$(LPSOLVE_TARBALL)) \
+		$(call fetch_Optional,MDDS,$(MDDS_TARBALL)) \
+		$(call fetch_Optional,MOZ,$(MOZ_TARBALL)) \
+		$(call fetch_Optional,MSPUB,$(MSPUB_TARBALL)) \
+		$(call fetch_Optional,MYSQLCPPCONN,$(MYSQLCPPCONN_TARBALL)) \
+		$(call fetch_Optional,MYTHES,$(MYTHES_TARBALL)) \
+		$(call fetch_Optional,NEON,$(NEON_TARBALL)) \
+		$(call fetch_Optional,NSS,$(NSS_TARBALL)) \
+		$(call fetch_Optional,OPENLDAP,$(OPENLDAP_TARBALL)) \
+		$(call fetch_Optional,OPENSSL,$(OPENSSL_TARBALL)) \
+		$(call fetch_Optional,ORCUS,$(ORCUS_TARBALL)) \
+		$(call fetch_Optional,CAIRO,$(PIXMAN_TARBALL)) \
+		$(call fetch_Optional,LIBPNG,$(PNG_TARBALL)) \
+		$(call fetch_Optional,POSTGRESQL,$(POSTGRESQL_TARBALL)) \
+		$(call fetch_Optional,PYTHON,$(PYTHON_TARBALL)) \
+		$(call fetch_Optional,REDLAND,$(RAPTOR_TARBALL)) \
+		$(call fetch_Optional,REDLAND,$(RASQAL_TARBALL)) \
+		$(call fetch_Optional,REDLAND,$(REDLAND_TARBALL)) \
+		$(call fetch_Optional,RHINO,$(RHINO_TARBALL)) \
+		$(call fetch_Optional,RHINO,$(SWING_TARBALL)) \
+		$(call fetch_Optional,TOMCAT,$(TOMCAT_TARBALL)) \
+		$(call fetch_Optional,UCPP,$(UCPP_TARBALL)) \
+		$(call fetch_Optional,VIGRA,$(VIGRA_TARBALL)) \
+		$(call fetch_Optional,VISIO,$(VISIO_TARBALL)) \
+		$(call fetch_Optional,WPD,$(WPD_TARBALL)) \
+		$(call fetch_Optional,WPG,$(WPG_TARBALL)) \
+		$(call fetch_Optional,WPS,$(WPS_TARBALL)) \
+		$(call fetch_Optional,XPDF,$(XPDF_TARBALL)) \
+		$(call fetch_Optional,XSLTML,$(XSLTML_TARBALL)) \
+		$(call fetch_Optional,ZLIB,$(ZLIB_TARBALL)) \
 	,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item)))
 	$(foreach item, \
-		$(DBGHELP_DLL) \
-		$(UNOWINREG_DLL) \
+		$(if $(filter WNT,$(OS)),$(DBGHELP_DLL)) \
+		$(call fetch_Optional,ODK,$(UNOWINREG_DLL)) \
 	,$(call fetch_Download_item,http://dev-www.libreoffice.org/extern,$(item)))
 	$(foreach item, \
 		$(BARCODE_EXTENSION_PACK) \
@@ -162,9 +166,9 @@ fetch :
 		$(WATCH_WINDOW_EXTENSION_PACK) \
 	,$(call fetch_Download_item,http://ooo.itc.hu/oxygenoffice/download/libreoffice,$(item)))
 	$(foreach item, \
-		$(MOZ_ZIP_INC) \
-		$(MOZ_ZIP_LIB) \
-		$(MOZ_ZIP_RUNTIME) \
+		$(call fetch_Optional,MOZ,$(MOZ_ZIP_INC)) \
+		$(call fetch_Optional,MOZ,$(MOZ_ZIP_LIB)) \
+		$(call fetch_Optional,MOZ,$(MOZ_ZIP_RUNTIME)) \
 	,$(call fetch_Download_item,http://dev-www.libreoffice.org/mozilla,$(item)))
 
 # vim: set noet sw=4 ts=4:

configure.ac

@@ -6958,6 +6958,7 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBCDR=NO
+    BUILD_TYPE="$BUILD_TYPE CDR"
     CDR_TARBALL=3c0037fb07dea2f0bbae8386fa7c6a9a-libcdr-0.0.9.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBCDR)
@@ -6979,6 +6980,7 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBMSPUB=NO
+    BUILD_TYPE="$BUILD_TYPE MSPUB"
     MSPUB_TARBALL=b2db54b6e96287ac995d7ed654ace4fc-libmspub-0.0.3.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBMSPUB)
@@ -7000,6 +7002,7 @@ elif test $_os = iOS; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBVISIO=NO
+    BUILD_TYPE="$BUILD_TYPE VISIO"
     VISIO_TARBALL=1e961f0112e5986105749640c2b9bc41-libvisio-0.0.21.tar.bz2
 fi
 AC_SUBST(SYSTEM_LIBVISIO)
@@ -7018,6 +7021,7 @@ if test "$with_system_libcmis" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBCMIS=NO
+    BUILD_TYPE="$BUILD_TYPE CMIS"
     CMIS_TARBALL=b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz
 fi
 AC_SUBST(SYSTEM_LIBCMIS)
@@ -7042,6 +7046,7 @@ else
     WPD_CFLAGS="-I${OUTDIR}/inc/external"
     WPD_LIBS="-L${OUTDIR}/lib -lwpdlib"
     WPD_TARBALL=e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
+    BUILD_TYPE="$BUILD_TYPE WPD"
 fi
 AC_SUBST(SYSTEM_LIBWPD)
 AC_SUBST(WPD_CFLAGS)
@@ -7128,6 +7133,7 @@ else
     WPS_CFLAGS="-I${OUTDIR}/inc/external"
     WPS_LIBS="-L${OUTDIR}/lib -lwpslib"
     WPS_TARBALL=d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
+    BUILD_TYPE="$BUILD_TYPE WPS"
 fi
 AC_SUBST(SYSTEM_LIBWPS)
 AC_SUBST(WPS_CFLAGS)
@@ -7150,6 +7156,7 @@ else
     WPG_CFLAGS="-I${OUTDIR}/inc/external"
     WPG_LIBS="-L${OUTDIR}/lib -lwpglib"
     WPG_TARBALL=9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
+    BUILD_TYPE="$BUILD_TYPE WPG"
 fi
 AC_SUBST(SYSTEM_LIBWPG)
 AC_SUBST(WPG_CFLAGS)
@@ -7985,6 +7992,7 @@ if test "$with_system_mdds" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     MDDS_TARBALL=9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2
+    BUILD_TYPE="$BUILD_TYPE MDDS"
     SYSTEM_MDDS=NO
 
     dnl ===================================================================
@@ -8012,6 +8020,7 @@ if test "$with_system_vigra" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     VIGRA_TARBALL=ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
+    BUILD_TYPE="$BUILD_TYPE VIGRA"
     SYSTEM_VIGRA=NO
 fi
 AC_SUBST(SYSTEM_VIGRA)
@@ -8859,6 +8868,7 @@ if test "$with_system_orcus" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     ORCUS_TARBALL=46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2
+    BUILD_TYPE="$BUILD_TYPE ORCUS"
     SYSTEM_LIBORCUS=NO
 
     if test "$SYSTEM_BOOST" = "YES"; then
@@ -9894,6 +9904,7 @@ if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integratio
   AC_MSG_RESULT([yes])
   ENABLE_MEDIAWIKI=YES
   XSLTML_TARBALL=a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+  BUILD_TYPE="$BUILD_TYPE XSLTML"
   if test  "x$with_java" = "xno"; then
     AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
   fi