merge of '4354734edafbccc7b147782a7680265829224fc4'

     and '72adf107ae169741460f878a60c133b36b195376'

diff --git a/config/ChangeLog b/config/ChangeLog
index 9d7546841b18cf383cbd858b07963946fe0cb8f3..e580747a019d63ea7ff949a1232c844069d0b003 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-12  Ulrich Drepper  <drepper@redhat.com>
+
+       * elfutils.spec.in: Add m4 to build requirements.
+
 2008-01-02  Ulrich Drepper  <drepper@redhat.com>
 
        * elfutils.spec.in: Changes for disasm branch merge.

diff --git a/config/elfutils.spec.in b/config/elfutils.spec.in
index f48c3983d8b5761d251966099d13a22b58b8e69f..380e5c5af5f505750a7606baa40077461c4355ac 100644 (file)
--- a/config/elfutils.spec.in
+++ b/config/elfutils.spec.in
@@ -18,6 +18,7 @@ BuildRequires: glibc >= 2.7
 BuildRequires: bison >= 1.875
 BuildRequires: flex >= 2.5.4a
 BuildRequires: bzip2
+BuildRequires: m4
 
 %define _gnu %{nil}
 %define _programprefix eu-