fully move m4 scripts to m4/ since that's apparently what was intended

4 files changed, 5 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index bcb9884..f62c423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+m4
 *~
 *.o
 *.a
diff --git a/Makefile.am b/Makefile.am
index 3de6226..df6ac90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,8 @@ SUBDIRS = \
 	modem-modeswitch \
 	udev-acl
 
+ACLOCAL_AMFLAGS = -I m4
+
 clean-local:
 	rm -rf udev-test-install
 
diff --git a/autogen.sh b/autogen.sh
index 4287fdb..f25fe64 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,6 +14,7 @@ PKG_NAME=udev-extras
 }
 
 (cd $srcdir;
+    mkdir -p m4/
     autoreconf --install --symlink
     ./configure $@
 )
diff --git a/configure.ac b/configure.ac
index 2ba046e..aadba46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl prefix is /usr, exec_prefix in /, if overridden exec_prefix follows prefix
 AC_PREFIX_DEFAULT([/usr])