diff options
author | Robert Nagy <robert@openbsd.org> | 2011-06-15 12:55:51 +0200 |
---|---|---|
committer | Robert Nagy <robert@openbsd.org> | 2011-06-15 12:55:51 +0200 |
commit | 4b333b2c9b4f35a58c1f1b5183013837f6380181 (patch) | |
tree | 15087e6d49193459dff0db818406a855ba620ea3 | |
parent | 2b4067e05c12dec97b6569dd936de393529fbc6c (diff) |
only fetch external tarballs if --disable-fetch-external is not defined
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | bootstrap.1 | 2 | ||||
-rwxr-xr-x | configure.in | 2 | ||||
-rwxr-xr-x | set_soenv.in | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 37c138982..ced0ed2bf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,8 +47,12 @@ dmake/dmake@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 3daa1e253..dcee0781f 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 325766885..5ad2e37c3 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 414dae21a..779fb3e95 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" ); |