[sugar] [PATCH] Fix regeneration of ./configure from configure.ac when using make

[Simon McVittie]

To use an m4 macro library you need three things:

* configure.ac mentions it (OK)
* autogen.sh mentions it (OK)
* Makefile.am mentions it (fixed by this patch)

Omission of the third part means that when you change configure.ac and run
make, ./configure is rebuilt without using the m4 directory, so autoconf
doesn't load python.m4 and the rebuild fails.

Ideally, this patch should be applied to all active branches (I think that's
just trial-2). If not, a workaround is to run "sh autogen.sh --help" (sic)
whenever the build fails with an error involving AM_CHECK_PYMOD.
---
 Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b47df4d..45f7370 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = bin data lib po shell sugar services
 
 bin_SCRIPTS = 			\
-- 
1.5.2.4