diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 16:56:49 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 18:28:00 +0200 |
| commit | d7a5df7e3dea928a2748d6eae9e7263cd23e76fd (patch) | |
| tree | 4d25f589791104bb202c48012eda356e424bc831 | |
| parent | deaac6fffa883d5604a35eb0706c7526b87398cc (diff) | |
download clucene tarball only when it's going to be used
Change-Id: I568be2e912d5700ef5d24443e48cf7d0a384292a
| -rw-r--r-- | clucene/UnpackedTarball_clucene.mk | 2 | ||||
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ooo.lst.in | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk index 0d446fe98fd8..de974da9ebc2 100644 --- a/clucene/UnpackedTarball_clucene.mk +++ b/clucene/UnpackedTarball_clucene.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,clucene)) -$(eval $(call gb_UnpackedTarball_set_tarball,clucene,48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz)) +$(eval $(call gb_UnpackedTarball_set_tarball,clucene,$(CLUCENE_TARBALL))) $(eval $(call gb_UnpackedTarball_fix_cxx_suffix,clucene,cpp)) diff --git a/config_host.mk.in b/config_host.mk.in index 13e8094a3da0..2653e31b756c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -50,6 +50,7 @@ export CLASSPATH=@CLASSPATH@ export CL_X64=@CL_X64@ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@ export CLUCENE_LIBS=@CLUCENE_LIBS@ +export CLUCENE_TARBALL=@CLUCENE_TARBALL@ export COM=@COM@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@ export COMEX=@COMEX@ diff --git a/configure.in b/configure.in index 2630af3b8537..7d61b1192a20 100644 --- a/configure.in +++ b/configure.in @@ -6526,11 +6526,13 @@ if test "$with_system_clucene" = "yes"; then else AC_MSG_RESULT([internal]) SYSTEM_CLUCENE=NO + CLUCENE_TARBALL=48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz BUILD_TYPE="$BUILD_TYPE CLUCENE" fi AC_SUBST(SYSTEM_CLUCENE) AC_SUBST(CLUCENE_CFLAGS) AC_SUBST(CLUCENE_LIBS) +AC_SUBST(CLUCENE_TARBALL) dnl =================================================================== dnl Check for system expat diff --git a/ooo.lst.in b/ooo.lst.in index 6ee538e6a54d..17e6842db654 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -22,7 +22,7 @@ cfbf1ac6f61bf6cf45342a0cc9381be5-liberation-fonts-ttf-2.00.0.tar.gz 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt -48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz +@CLUCENE_TARBALL@ 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz |