Index: Makefile.am
===================================================================
--- Makefile.am	(revision 1291)
+++ Makefile.am	(working copy)
@@ -1,7 +1,7 @@
 # Copyright 2009 INRIA, Université Bordeaux 1
 # Copyright © 2009 Cisco Systems, Inc.  All rights reserved.
 
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I config -I m4
 
 SUBDIRS = src utils tests include doc
 
Index: autogen.sh
===================================================================
--- autogen.sh	(revision 1291)
+++ autogen.sh	(working copy)
@@ -1,2 +1,2 @@
 :
-autoreconf -ivf -I m4
+autoreconf -ivf