Mercurial > hg > release > icedtea6-1.13
changeset 269:ecb4f38aa21d cacao
2007-10-02 Lillian Angel <langel@redhat.com>
* AUTHORS: Added Matthias Klose.
2007-10-02 Matthias Klose <doko@ubuntu.com>
* configure.ac: Add --with-ant-home support.
* Makefile.am: Use SYSTEM_ANT_DIR.
* configure, Makefile.in: Regenerate.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Tue, 02 Oct 2007 09:04:05 -0400 |
| parents | d6c8a3c304a3 |
| children | bb75577dc4f5 |
| files | AUTHORS ChangeLog Makefile.am Makefile.in configure configure.ac |
| diffstat | 6 files changed, 51 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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@redhat.com> Kyle Galloway <kgallowa@redhat.com> Andrew Haley <aph@redhat.com> +Matthias Klose <doko@ubuntu.com> Francis Kung <fkung@redhat.com> Casey Marshall <csm@gnu.org> Raif Naffah <admin@naffah-raif.name>
--- 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-02 Lillian Angel <langel@redhat.com> + + * AUTHORS: Added Matthias Klose. + +2007-10-02 Matthias Klose <doko@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@redhat.com> * patches/icedtea-java-home.patch: Removed
--- 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 = \ $(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" \
--- 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@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEM_ANT_DIR = @SYSTEM_ANT_DIR@ SYSTEM_ICEDTEA_DIR = @SYSTEM_ICEDTEA_DIR@ UNZIP = @UNZIP@ VERSION = @VERSION@
--- 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 GAWK SYSTEM_ICEDTEA_DIR +SYSTEM_ANT_DIR BUILD_ARCH_DIR INSTALL_ARCH_DIR JAVA @@ -1352,6 +1353,7 @@ --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 @@ -4806,6 +4808,25 @@ +# 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 + + + + case "${host}" in x86_64-*-*) BUILD_ARCH_DIR=amd64 @@ -8485,6 +8506,7 @@ 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
--- a/configure.ac Mon Oct 01 10:15:59 2007 -0400 +++ b/configure.ac Tue Oct 02 09:04:05 2007 -0400 @@ -36,6 +36,22 @@ ]) 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 AC_SUBST(JAVA)