Remove acinclude.m4 and configure macro dir

2009-09-13 17:14:08 +05:30 · 2009-09-13 17:14:08 +05:30 · b952bc6595
commit b952bc6595
parent f1a586648e
4 changed files with 5 additions and 3 deletions
--- 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
--- a/acinclude.m4
+++ b/acinclude.m4
@ -1,2 +0,0 @@
-m4_include([m4macros/argenable.m4])
-m4_include([m4macros/typecheck.m4])
--- a/autogen.sh
+++ b/autogen.sh
@ -7,7 +7,7 @@
 #

 set -x
-aclocal \
+aclocal -I m4macros \
  && autoheader \
  && automake --gnu --add-missing \
  && autoconf
--- 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],