[smuxi: 15/26] Build: move m4 files to m4/ directory

[Mirco M. M. Bauer <mmmbauer src gnome org>]

commit aca63fe4dc0fdf3bdd7f9baa500fe063aa97efd9
Author: Mirco Bauer <meebey meebey net>
Date:   Sun Sep 27 15:10:21 2015 +0200

    Build: move m4 files to m4/ directory

 .gitignore                        |    6 ------
 Makefile.am                       |    5 +----
 autogen.sh                        |    2 +-
 configure.ac                      |    2 +-
 m4/.gitignore                     |    6 ++++++
 expansions.m4 => m4/expansions.m4 |    0
 mono.m4 => m4/mono.m4             |    0
 programs.m4 => m4/programs.m4     |    0
 8 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b1a41db..0e44d8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,13 +12,7 @@ install-sh
 intltool-extract.in
 intltool-merge.in 
 intltool-update.in
-intltool.m4
 libtool
-libtool.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
 ltmain.sh
 missing
 *.user*
diff --git a/Makefile.am b/Makefile.am
index 0f345cd..439e78d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,12 +36,9 @@ if ENABLE_FRONTEND_GNOME_XMPP
 PO_FRONTEND_GNOME_XMPP = po-Frontend-GNOME-XMPP
 endif
 
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST =   install-sh \
-               expansions.m4 \
-               mono.m4 \
-               programs.m4 \
                HACKING \
                LICENSE \
                README.md
diff --git a/autogen.sh b/autogen.sh
index b24c549..5919777 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,7 +18,7 @@ test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd $srcdir
 TEST_TYPE=-f
-aclocalinclude="-I . $ACLOCAL_FLAGS"
+aclocalinclude="-I m4 $ACLOCAL_FLAGS"
 
 DIE=0
 
diff --git a/configure.ac b/configure.ac
index 7f9b1cc..5a6ab22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.54])
 AC_INIT([smuxi], [1.0], [https://smuxi.im/issues/new])
 # using the --foreign option makes automake less strict about GNU policy 
-AC_CONFIG_MACRO_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign tar-ustar])
 AM_MAINTAINER_MODE
 
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..87c6903
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,6 @@
+intltool.m4
+libtool.m4
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
diff --git a/expansions.m4 b/m4/expansions.m4
similarity index 100%
rename from expansions.m4
rename to m4/expansions.m4
diff --git a/mono.m4 b/m4/mono.m4
similarity index 100%
rename from mono.m4
rename to m4/mono.m4
diff --git a/programs.m4 b/m4/programs.m4
similarity index 100%
rename from programs.m4
rename to m4/programs.m4