changeset in /hg/icedtea: 2007-10-02 Lillian Angel <langel at red...

[Lillian Angel]

changeset ecb4f38aa21d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ecb4f38aa21d
description:
	2007-10-02  Lillian Angel  <langel at redhat.com>

	        * AUTHORS: Added Matthias Klose.

	2007-10-02  Matthias Klose  <doko at ubuntu.com>

	        * configure.ac: Add --with-ant-home support.
	        * Makefile.am: Use SYSTEM_ANT_DIR.
	        * configure, Makefile.in: Regenerate.

diffstat:

6 files changed, 51 insertions(+), 1 deletion(-)
AUTHORS      |    1 +
ChangeLog    |   10 ++++++++++
Makefile.am  |    2 +-
Makefile.in  |    1 +
configure    |   22 ++++++++++++++++++++++
configure.ac |   16 ++++++++++++++++

diffs (130 lines):

diff -r d6c8a3c304a3 -r ecb4f38aa21d AUTHORS
--- a/AUTHORS	Mon Oct 01 10:15:59 2007 -0400
+++ b/AUTHORS	Tue Oct 02 09:04:05 2007 -0400
@@ -7,6 +7,7 @@ Thomas Fitzsimmons <fitzsim at redhat.com>
 Thomas Fitzsimmons <fitzsim at redhat.com>
 Kyle Galloway <kgallowa at redhat.com>
 Andrew Haley <aph at redhat.com>
+Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
 Casey Marshall <csm at gnu.org>
 Raif Naffah <admin at naffah-raif.name>
diff -r d6c8a3c304a3 -r ecb4f38aa21d ChangeLog
--- a/ChangeLog	Mon Oct 01 10:15:59 2007 -0400
+++ b/ChangeLog	Tue Oct 02 09:04:05 2007 -0400
@@ -1,3 +1,13 @@ 2007-10-01  Lillian Angel  <langel at redha
+2007-10-02  Lillian Angel  <langel at redhat.com>
+
+	* AUTHORS: Added Matthias Klose.
+
+2007-10-02  Matthias Klose  <doko at ubuntu.com>
+
+	* configure.ac: Add --with-ant-home support.
+	* Makefile.am: Use SYSTEM_ANT_DIR.
+	* configure, Makefile.in: Regenerate.
+
 2007-10-01  Lillian Angel  <langel at redhat.com>
 
 	* patches/icedtea-java-home.patch: Removed
diff -r d6c8a3c304a3 -r ecb4f38aa21d Makefile.am
--- a/Makefile.am	Mon Oct 01 10:15:59 2007 -0400
+++ b/Makefile.am	Tue Oct 02 09:04:05 2007 -0400
@@ -39,7 +39,7 @@ ICEDTEA_ENDORSED_DIR = \
 ICEDTEA_ENDORSED_DIR = \
 	$(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed
 ICEDTEA_ENV = \
-	"ANT_HOME=/usr" \
+	"ANT_HOME=@SYSTEM_ANT_DIR@" \
 	"BUILD_NUMBER=b21" \
 	"JRE_RELEASE_VERSION=1.7.0-b21" \
 	"HOTSPOT_RELEASE_VERSION=1.7.0-b21" \
diff -r d6c8a3c304a3 -r ecb4f38aa21d Makefile.in
--- a/Makefile.in	Mon Oct 01 10:15:59 2007 -0400
+++ b/Makefile.in	Tue Oct 02 09:04:05 2007 -0400
@@ -144,6 +144,7 @@ SET_MAKE = @SET_MAKE@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@
 SYSTEM_ICEDTEA_DIR = @SYSTEM_ICEDTEA_DIR@
 UNZIP = @UNZIP@
 VERSION = @VERSION@
diff -r d6c8a3c304a3 -r ecb4f38aa21d configure
--- a/configure	Mon Oct 01 10:15:59 2007 -0400
+++ b/configure	Tue Oct 02 09:04:05 2007 -0400
@@ -712,6 +712,7 @@ CHMOD
 CHMOD
 GAWK
 SYSTEM_ICEDTEA_DIR
+SYSTEM_ANT_DIR
 BUILD_ARCH_DIR
 INSTALL_ARCH_DIR
 JAVA
@@ -1352,6 +1353,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-icedtea-home     IcedTea home directory (default is
                           /usr/lib/jvm/java-icedtea)
+  --with-ant-home         Ant home directory (default is /usr)
   --with-openjdk-src-zip  specify the location of the openjdk source zip
   --with-openjdk-src-dir  specify the location of the openjdk sources
   --with-cacao            use CACAO as VM
@@ -4800,6 +4802,25 @@ else
 else
 
               SYSTEM_ICEDTEA_DIR=/usr/lib/jvm/java-icedtea
+
+fi
+
+
+
+
+# Check whether --with-ant-home was given.
+if test "${with_ant_home+set}" = set; then
+  withval=$with_ant_home;
+              if test "x${withval}" == x
+              then
+                SYSTEM_ANT_DIR=/usr
+              else
+                SYSTEM_ANT_DIR=${withval}
+              fi
+
+else
+
+              SYSTEM_ANT_DIR=/usr
 
 fi
 
@@ -8485,6 +8506,7 @@ ac_delim='%!_!# '
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim
 BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
 INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
 JAVA!$JAVA$ac_delim
diff -r d6c8a3c304a3 -r ecb4f38aa21d configure.ac
--- a/configure.ac	Mon Oct 01 10:15:59 2007 -0400
+++ b/configure.ac	Tue Oct 02 09:04:05 2007 -0400
@@ -35,6 +35,22 @@ AC_ARG_WITH([icedtea-home],
               SYSTEM_ICEDTEA_DIR=/usr/lib/jvm/java-icedtea
             ])
 AC_SUBST(SYSTEM_ICEDTEA_DIR)
+
+AC_ARG_WITH([ant-home],
+            [AS_HELP_STRING([--with-ant-home],
+                            [Ant home directory (default is /usr)])],
+            [
+              if test "x${withval}" == x
+              then
+                SYSTEM_ANT_DIR=/usr
+              else
+                SYSTEM_ANT_DIR=${withval}
+              fi
+            ],
+            [
+              SYSTEM_ANT_DIR=/usr
+            ])
+AC_SUBST(SYSTEM_ANT_DIR)
 
 SET_ARCH_DIRS
 JAVA=$SYSTEM_ICEDTEA_DIR/bin/java