changeset 1891:8571317a9879

Merge
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 31 Mar 2010 01:49:46 +0100
parents 786e03271cb9 (current diff) c5a5f60295cf (diff)
children 156b7d4d4ad3
files ChangeLog
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 31 01:49:06 2010 +0100
+++ b/ChangeLog	Wed Mar 31 01:49:46 2010 +0100
@@ -1,4 +1,8 @@
-2009-03-30  Andrew John Hughes  <ahughes@redhat.com>
+2010-03-31  Matthias Klose  <doko@ubuntu.com>
+
+	* acinclude.m4 (ENABLE_ZERO_BUILD): Depend on SET_ARCH_DIRS.
+
+2010-03-30  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am: Add new security patches.
 	* NEWS: List new security patches.
--- a/acinclude.m4	Wed Mar 31 01:49:06 2010 +0100
+++ b/acinclude.m4	Wed Mar 31 01:49:46 2010 +0100
@@ -698,6 +698,7 @@
 
 AC_DEFUN([ENABLE_ZERO_BUILD],
 [
+  AC_REQUIRE([SET_ARCH_DIRS])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no
   AC_ARG_ENABLE([zero],