[ooo-build-commit] bin/unpack configure.in download.in

[Jan Holesovsky]

 bin/unpack   |    4 ++--
 configure.in |    4 ++--
 download.in  |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 51e21d7b225d9195be281d7b9acfe04a16c935c3
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri May 29 18:18:47 2009 +0200

    When no --with-git is used, set OOO_GIT to empty string.
    
    This helps transition when one forgets to re-run configure.
    
    * bin/unpack: "NO" -> ""
    * configure.in: "NO" -> ""
    * download.in: "NO" -> "", fetch -t, instead of just fetch.

diff --git a/bin/unpack b/bin/unpack
index a592188..0656bf4 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -73,7 +73,7 @@ fi
 
 # this will become the 'normal' way to do an all-through build name is misleading
 ALL_CORE_PKGS="sdk ure base calc help extras writer impress artwork filters testing bootstrap libs-gui libs-core libs-extern libs-extern-sys components postprocess extensions"
-if test "z$OOO_GIT" = "zNO" ; then
+if test "z$OOO_GIT" = "z" ; then
     if test "z$SPLIT" = "zyes" ; then
 	if test "z$PIECE" != "z"; then
 	    CORE_PKGS=$PIECE
@@ -215,7 +215,7 @@ if test "z$SYSTEM_GCC" = "z"; then
 fi
 
 echo "Unpacking OO.o build tree - [ go and have some $DRINK ] ..."
-if test "z$OOO_GIT" = "zNO" ; then
+if test "z$OOO_GIT" = "z" ; then
     if test "z$SPLIT" != "zyes"; then
 	echo "Unpacking $OOO_TARBALL..."
 	($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_TARBALL | $GNUTAR xpf - ) || exit 1
diff --git a/configure.in b/configure.in
index 0cad57c..ffefb9f 100644
--- a/configure.in
+++ b/configure.in
@@ -1310,7 +1310,7 @@ fi
 AC_MSG_RESULT([$build_product])
 
 AC_MSG_CHECKING([whether to use git to get the up-stream sources])
-OOO_GIT="NO"
+OOO_GIT=
 if test -z "$with_git" -o "$with_git" = "no"; then
     AC_MSG_RESULT([no])
 else
@@ -1513,7 +1513,7 @@ if test "$MAX_JOBS" -gt 1; then
 else
     max_job_message="'1'"
 fi
-if test "$OOO_GIT" = "NO" ; then
+if test "$OOO_GIT" = "" ; then
     if test "$UPSTREAM_SOURCE" = "YES" ; then
 	upstream_sources="download tarballs from '$UPSTREAM_URI'"
     else
diff --git a/download.in b/download.in
index 60213ae..a98701b 100755
--- a/download.in
+++ b/download.in
@@ -149,8 +149,8 @@ sub source_file($)
     }
 
     my $tag = '@CVSTAG@';
-    if ( '@OOO_GIT@' ne "NO" ) {
-        system( "cd @SRCDIR@/clone ; if [ -d $what ] ; then cd $what ; git fetch origin ; else git clone -n @OOO_GIT@/$what ; fi" );
+    if ( '@OOO_GIT@' ne "" ) {
+        system( "cd @SRCDIR@/clone ; if [ -d $what ] ; then cd $what ; git fetch -t origin ; else git clone -n @OOO_GIT@/$what ; fi" );
     }
     elsif ( '@UPSTREAM_SOURCE@' eq "YES" ) {
         die "Up-stream doesn't have a package split" if ($SPLIT);
@@ -208,7 +208,7 @@ sub download_files($$$)
 if (!-d "@SRCDIR@") {
     `mkdir -p @SRCDIR@`;
 }
-if ( '@OOO_GIT@' ne "NO" && !-d "@SRCDIR@/clone" ) {
+if ( '@OOO_GIT@' ne "" && !-d "@SRCDIR@/clone" ) {
     `mkdir -p @SRCDIR@/clone`;
 }