From c033adbde7ae6840f6cbbf03e38a95a78e0b7861 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Dec 10 2006 02:22:24 +0000
Subject: - Think I got it this time.


---

diff --git a/evolution.spec b/evolution.spec
index 98737bd..df17cc8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -163,6 +163,9 @@ Patch42: evolution-2.9.3-source-path-entry.patch
 # RH bug #218801 / GNOME bug #383953
 Patch43: evolution-2.9.3-unread-messages.patch
 
+# Look for m4 files in local directory.
+Patch44: evolution-2.9.3-aclocal-flags.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -308,6 +311,7 @@ Development files needed for building things which link against evolution.
 %patch41 -p1 -b .adopt-icons
 %patch42 -p1 -b .source-path-entry
 %patch43 -p1 -b .unread-messages
+%patch44 -p1 -b .aclocal-flags
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -394,8 +398,6 @@ CFLAGS="$CFLAGS \
 
 # Rerun the GNU Autotools since we patched some of the input files.
 # Disable portability checking to keep automake 1.10 quiet.
-# See GNOME bug #355521 for why ACLOCAL_FLAGS is needed.
-export ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS"
 autoreconf --warnings=no-portability
 
 %configure \