Mercurial > hg > release > icedtea6-1.12

changeset 2009:924b3dc09a33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 31 Mar 2010 01:37:16 +0100
parents f625a9f9cdab (current diff) a86471da922d (diff)
children 27edb6d5b217
files ChangeLog
diffstat 2 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 31 01:36:09 2010 +0100
+++ b/ChangeLog	Wed Mar 31 01:37:16 2010 +0100
@@ -12,6 +12,10 @@
 	* patches/security/20100330/hotspot/original/6626217.patch:
 	Split 6626217 into hs14 and hs16 versions.
 
+2010-03-31  Matthias Klose  <doko@ubuntu.com>
+
+	* acinclude.m4 (ENABLE_ZERO_BUILD): Depend on IT_SET_ARCH_SETTINGS.
+
 2009-03-30  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am: Add new security patches.
--- a/acinclude.m4	Wed Mar 31 01:36:09 2010 +0100
+++ b/acinclude.m4	Wed Mar 31 01:37:16 2010 +0100
@@ -726,6 +726,7 @@
 
 AC_DEFUN([ENABLE_ZERO_BUILD],
 [
+  AC_REQUIRE([IT_SET_ARCH_SETTINGS])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no
   AC_ARG_ENABLE([zero],