From a3313eef284ce8415306466b2883290e5f8e7b61 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Dec 10 2006 01:28:30 +0000
Subject: - Fix a problem with the autoreconf line.


---

diff --git a/evolution.spec b/evolution.spec
index 670b597..7272ca5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -393,9 +393,8 @@ CFLAGS="$CFLAGS \
 %endif
 
 # Rerun the GNU Autotools since we patched some of the input files.
-# Note: Automake 1.10 enables portability checking by default, which
-#       breaks compilation.  So we have to explicitly disable it.
-autoreconf --warnings=no-portability
+# Disable portability checking to keep automake 1.10 quiet.
+ACLOCAL="aclocal -I ." autoreconf --warnings=no-portability
 
 %configure \
   --disable-scrollkeeper \
@@ -726,8 +725,8 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Dec 09 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-1.fc7
 - Update to 2.9.3
 - Configure with scrollkeeper disabled.
+- Disable automake portability checking.
 - Ship our own icons from gnome-icon-theme.
-- Explicitly turn off automake portability checking.
 - Add patch for RH bug #215478 (Maildir and MH accounts).
 - Add patch for RH bug #215695 (crashes w/o mail accounts).
 - Add patch for RH bug #216537 (viewing attachments).