[Libreoffice-commits] .: Branch 'feature/bootstrap-build' - 2 commits - configure.in download post_download.in

[Jan Holesovsky]

 configure.in     |   13 ++++++++-----
 download         |    7 +++----
 post_download.in |    3 +--
 3 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 1a57b2b974522604b89e224c6b2477bf34a8269a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 29 13:51:34 2010 +0100

    configure.in: Move the post_download creation up a bit.
    
    So that the message about what to do now (issue make and make dev-install) is
    the last thing the user sees.

diff --git a/configure.in b/configure.in
index 7ec28fa..0dc4222 100644
--- a/configure.in
+++ b/configure.in
@@ -7976,6 +7976,14 @@ AC_SUBST(BUILD_TYPE)
 # make sure config.guess is +x; we execute config.guess, so it has to be so;
 chmod +x ./config.guess
 
+dnl Setting up the post_download check script
+dnl Using autoconf here, so that the migration from the previous state
+dnl (checks for the additional Windows downloads were directly in
+dnl configure.in) is as easy as possible
+echo "setting up the post_download check script"
+autoconf post_download.in > post_download
+chmod +x post_download
+
 # Generate a configuration timestamp we can use for deps
 if test -f set_soenv; then
    mv -f set_soenv set_soenv.last
@@ -8016,8 +8024,3 @@ else
    fi
    echo
 fi
-
-dnl Setting up the post_download check script
-echo "setting up the post_download check script"
-autoconf post_download.in > post_download
-chmod +x post_download
commit 380790ff2e5e765ff7a1c947c361dfd727f95ff7
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Nov 29 11:05:10 2010 +0100

    download: Fix minor typos to make it work on Windows.

diff --git a/download b/download
index 9ab936f..a17a1e4 100755
--- a/download
+++ b/download
@@ -159,10 +159,6 @@ done
 rm $TARFILE_LOCATION/tmp/*-*
 cd $start_dir
 
-if [ -e post_download ] ; then
-    ./post_download
-fi
-
 if [ ! -z "$failed" ]; then
     echo
     echo ERROR: failed on:
@@ -172,3 +168,6 @@ if [ ! -z "$failed" ]; then
     exit 1
 fi
 
+[ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; }
+
+./post_download || exit 1
diff --git a/post_download.in b/post_download.in
index 674d6b1..b17f395 100644
--- a/post_download.in
+++ b/post_download.in
@@ -10,8 +10,7 @@ echo "********************************************************************"
 dnl ===================================================================
 dnl The following is a list of supported systems.
 dnl ===================================================================
-#defaults unless the os test overrides this:
-
+AC_CANONICAL_SYSTEM
 case "$build_os" in
     solaris*)
         _os=SunOS