[ooo-build-commit] .: bin/setup.in configure.in distro-configs/CommonWin32.conf.in distro-configs/GoOoLinux.conf.in distro-configs/Raw.conf.in distro-configs/Solaris.conf.in

[Fridrich Strba]

 bin/setup.in                       |    1 +
 configure.in                       |    2 +-
 distro-configs/CommonWin32.conf.in |    2 +-
 distro-configs/GoOoLinux.conf.in   |    2 +-
 distro-configs/Raw.conf.in         |    2 +-
 distro-configs/Solaris.conf.in     |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 500b9d2ad05a2005be6a80ea86c61e4149dc4d6d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 20 17:43:06 2010 +0200

    Upgrade the "internal" ant to 1.8.1 and clean up the configury

diff --git a/bin/setup.in b/bin/setup.in
index 0af62b7..b312f50 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -89,6 +89,7 @@ GNUPATCH=@GNUPATCH@
 GNUTAR=@GNUTAR@
 DRINK="@DRINK@"
 APACHE_ANT_TARBALL=@APACHE_ANT_TARBALL@
+APACHE_ANT=`echo $APACHE_ANT_TARBALL | sed 's/\(apache-ant-.*\)-bin\..*/\1/g'`
 
 if [ -z "$TARFILE_LOCATION" ]; then TARFILE_LOCATION=$SRCDIR; fi
 
diff --git a/configure.in b/configure.in
index b739a6d..9d224d2 100644
--- a/configure.in
+++ b/configure.in
@@ -896,7 +896,7 @@ AC_SUBST(PREBUILT_EXTENSIONAIDS_TIMESTAMP)
 BUILD_MOZILLA_SOURCE='seamonkey-1.1.14.source.tar.gz'
 AC_SUBST(BUILD_MOZILLA_SOURCE)
 
-APACHE_ANT_TARBALL='apache-ant-1.7.0-bin.tar.gz'
+APACHE_ANT_TARBALL='apache-ant-1.8.1-bin.tar.gz'
 AC_SUBST(APACHE_ANT_TARBALL)
 
 AGFA_MONOTYPE_FONTS_SOURCE='agfa-monotype-fonts.tar.gz'
diff --git a/distro-configs/CommonWin32.conf.in b/distro-configs/CommonWin32.conf.in
index e36fb06..546cb33 100644
--- a/distro-configs/CommonWin32.conf.in
+++ b/distro-configs/CommonWin32.conf.in
@@ -1,2 +1,2 @@
---with-ant-home=$BUILDDIR/apache-ant-1.7.0
+--with-ant-home=$BUILDDIR/$APACHE_ANT
 --with-build-version=\"ooo-build `date +%Y-%m-%d`\"
diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in
index f7d7bd2..473f1ab 100644
--- a/distro-configs/GoOoLinux.conf.in
+++ b/distro-configs/GoOoLinux.conf.in
@@ -46,7 +46,7 @@
 --enable-report-builder 
 --with-extension-integration
 --with-linker-hash-style=both
---with-ant-home=$BUILDDIR/apache-ant-1.7.0
+--with-ant-home=$BUILDDIR/$APACHE_ANT
 --with-system-dicts
 --with-external-dict-dir=/usr/share/hunspell
 --with-external-hyph-dir=/usr/share/hyphen
diff --git a/distro-configs/Raw.conf.in b/distro-configs/Raw.conf.in
index d8ed64a..72cd097 100644
--- a/distro-configs/Raw.conf.in
+++ b/distro-configs/Raw.conf.in
@@ -1,3 +1,3 @@
 --with-vendor=\"Go-oo Project\"
 --with-java-target-version=1.5
---with-ant-home=$BUILDDIR/apache-ant-1.7.0
+--with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/Solaris.conf.in b/distro-configs/Solaris.conf.in
index 8437568..dc198e7 100644
--- a/distro-configs/Solaris.conf.in
+++ b/distro-configs/Solaris.conf.in
@@ -33,7 +33,7 @@
 --without-system-icu
 --without-nas
 --disable-kde
---with-ant-home=/opt/apache-ant-1.7.0/
+--with-ant-home=$BUILDDIR/$APACHE_ANT
 --with-jdk-home=/usr/jdk/jdk1.5.0_12
 --disable-scsolver
 --without-unix-wrapper