Move m4 to tools/m4.

.gitignore

@@ -34,14 +34,14 @@ tools/mkpasswd
 tools/viconf
 /libtool
 Makefile.in
-m4/argz.m4
-m4/libtool.m4
-m4/ltargz.m4
-m4/ltdl.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
+tools/m4/argz.m4
+tools/m4/libtool.m4
+tools/m4/ltargz.m4
+tools/m4/ltdl.m4
+tools/m4/ltoptions.m4
+tools/m4/ltsugar.m4
+tools/m4/ltversion.m4
+tools/m4/lt~obsolete.m4
 *.dSYM/
 install-sh
 ylwrap

Makefile.am

@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I tools/m4
 
 SUBDIRS = include/ircd
 SUBDIRS += ircd

autogen.sh

@@ -79,7 +79,7 @@ run_or_die ()
 parse_options "$@"
 
 echo "*** Generating Charybdis build..."
-run_or_die $ACLOCAL -I m4
+run_or_die $ACLOCAL -I tools/m4
 run_or_die $LIBTOOLIZE --force --copy
 run_or_die $AUTOHEADER
 run_or_die $AUTOCONF

configure.ac

@@ -4,8 +4,8 @@ AUTOMAKE_OPTIONS = 1.11
 AC_INIT([construct], [1.0-dev])
 AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS
-AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT([/])
+AC_CONFIG_MACRO_DIR([tools/m4])
 
 AC_PATH_PROG(AUTOMAKE, automake)
 AC_PATH_PROG(ACLOCAL, aclocal)