3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 3972ddb..7cc447a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,8 @@ pkgconfig_DATA = xpresent.pc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
+ACLOCAL_AMFLAGS=-I m4
+
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
diff --git a/autogen.sh b/autogen.sh
index 904cd67..354f254 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
diff --git a/configure.ac b/configure.ac
index 51d3f96..a88ca7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,8 @@ AC_INIT(libXpresent, [1.0.0],
 	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXpresent])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
 
 # Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])