[Libreoffice-commits] .: Branch 'libreoffice-3-4-1' - bootstrap.1 configure.in Makefile.in set_soenv.in

[Caolán McNamara]

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

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

    only fetch external tarballs if --disable-fetch-external is not defined
    (cherry picked from commit 4b333b2c9b4f35a58c1f1b5183013837f6380181)

diff --git a/Makefile.in b/Makefile.in
index 37c1389..ced0ed2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,8 +47,12 @@ dmake/dmake at EXEEXT@:
         ./bootstrap
 
 src.downloaded: ooo.lst download
+ifeq (@DO_FETCH_TARBALLS@,YES)
 	@. ./*[Ee]nv.[Ss]et.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/bootstrap.1 b/bootstrap.1
index 3daa1e2..dcee078 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -75,6 +75,6 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 if [ ! -d $SRC_ROOT/src ] ; then
     mkdir $SRC_ROOT/src
 fi
-if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
+if [ "$DO_FETCH_TARBALLS" = "YES" ]; then
 	$SRC_ROOT/download $SRC_ROOT/ooo.lst
 fi
diff --git a/configure.in b/configure.in
index 3257668..5ad2e37 100755
--- a/configure.in
+++ b/configure.in
@@ -1729,7 +1729,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 414dae2..779fb3e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1694,7 +1694,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" );