fixing the build process

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 614b1d3..327dc95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-14  svu
+
+	* autogen.sh, Makefile.am: fixing the build process (thanks to
+	Marc-André Lureau)
+
 2009-04-23  Federico Mena Quintero  <federico@novell.com>
 
 	https://bugs.freedesktop.org/show_bug.cgi?id=21365 - Make sure
diff --git a/Makefile.am b/Makefile.am
index 92b43da..fec4d5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libxklavier doc tests
 
 EXTRA_DIST = libxklavier.spec libxklavier.spec.in \
diff --git a/autogen.sh b/autogen.sh
index 7de784e..4f5b517 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -89,7 +89,7 @@ do
     echo skipping $dr -- flagged as no auto-gen
   else
     echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
+    macrodirs=`sed -n -e 's,AC_CONFIG_MACRO_DIR(\(.*\)),\1,gp' < $coin`
     ( cd $dr
       aclocalinclude="$ACLOCAL_FLAGS"
       for k in $macrodirs; do