4 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index cb63853..d3c20f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,9 @@ SUBDIRS = \
 	m4macros \
 	packaging
 
+# tools want this on a single line
+ACLOCAL_AMFLAGS = -I m4macros
+
 EXTRA_DIST = \
 	autogen.sh \
 	TODO
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index ff3d4cc..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,2 +0,0 @@
-m4_include([m4macros/argenable.m4])
-m4_include([m4macros/typecheck.m4])
diff --git a/autogen.sh b/autogen.sh
index a871f25..d19915a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@
 #
 
 set -x
-aclocal \
+aclocal -I m4macros \
   && autoheader \
   && automake --gnu --add-missing \
   && autoconf
diff --git a/configure.ac b/configure.ac
index dcaf93e..4342ea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ dnl AC_CONFIG_MACRO_DIR(config)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([m4macros])
 AM_MAINTAINER_MODE
 
 AH_TEMPLATE([TARGET_SYSTEM],