[ooo-build-commit] bin/unpack

[Tor Lillqvist]

 bin/unpack |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 0f6d65c4b600ed6002a10432a7ce24becc466587
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Sep 29 01:51:23 2009 +0300

    Always require Apache Ant tarball in Windows build
    
    * bin/unpack: Always require Apache Ant tarball in Windows build.

diff --git a/bin/unpack b/bin/unpack
index 18a2fe4..809195a 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -591,7 +591,10 @@ fi
 APACHE_ANT='apache-ant-1.7.0'
 APACHE_ANT_TARBALL=$APACHE_ANT-bin.tar.gz
 ANT_VERSION=`ant -version | awk '{ print $4 }'`
-if test -x /usr/bin/ant && \
+
+if test "z$BUILD_WIN32" != "z"; then
+	check_file $SRCDIR/$APACHE_ANT_TARBALL
+elif test -x /usr/bin/ant && \
 	test "`echo $ANT_VERSION | cut -d. -f1`" = "1" \
           -a "`echo $ANT_VERSION | cut -d. -f2`" -lt "7" ]; then
 	check_file $SRCDIR/$APACHE_ANT_TARBALL