[Libreoffice-commits] .: configure.in Makefile.in set_soenv.in

[Robert Nagy]

 Makefile.in  |    4 ++++
 configure.in |    2 +-
 set_soenv.in |    1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit b246ad5ff409a7a51091c0b3c1fe50e0eb468fc4
Author: Robert Nagy <robert at openbsd.org>
Date:   Wed Jun 15 12:51:41 2011 +0200

    only fetch external tarballs if --disable-fetch-external is not defined

diff --git a/Makefile.in b/Makefile.in
index 7c78ee6..cfbea5e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,8 +134,12 @@ dmake/dmake at EXEEXT_FOR_BUILD@:
 	./bootstrap
 
 src.downloaded: ooo.lst download
+ifeq (@DO_FETCH_TARBALLS@,YES)
 	@. ./*Env.Set.sh && \
 	$$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@
+else
+        @echo "Automatic fetching of external tarballs is disabled."
+endif
 
 fetch: src.downloaded
 
diff --git a/configure.in b/configure.in
index 0695bc0..58dfaab 100755
--- a/configure.in
+++ b/configure.in
@@ -1934,7 +1934,7 @@ AC_SUBST(TARFILE_LOCATION)
 
 if test "z$enable_fetch_external" != "zno" \
    && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then
-   DO_FETCH_TARBALLS="yes"
+   DO_FETCH_TARBALLS="YES"
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
diff --git a/set_soenv.in b/set_soenv.in
index 754d451..b9e42a8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1602,7 +1602,6 @@ ToFile( "PSPRINT",           "TRUE",             "e" );
 ToFile( "MKDEPENDSOLVER",    "TRUE",             "e" );
 ToFile( "nodep",             "@nodep@",          "e" );
 ToFile( "TARFILE_LOCATION",  $TARFILE_LOCATION,  "e" );
-ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@",  "e" );
 ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@",  "e" );
 ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@",  "e" );