Create m4 directory, and set it up.

Make sure the m4 directory is known to autoconf.

Also ignore the macro files copied over by libtool, gettext and the
other tools.

3 files changed, 32 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 531190f..a0f9298 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ config.sub
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
-m4/
 aclocal.m4
 *.cache
 config.h
diff --git a/configure.ac b/configure.ac
index 4ce40e4..9cb5b11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@
 AC_PREREQ(2.62)
 AC_INIT([pavucontrol],[0.9.7],[mzcnihpbageby (at) 0pointer (dot) de])
 AC_CONFIG_SRCDIR([src/pavucontrol.cc])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign 1.9 -Wall])
 
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..4a99ba4
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,31 @@
+codeset.m4
+gettext.m4
+glibc2.m4
+glibc21.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intltool.m4
+intmax.m4
+inttypes-pri.m4
+inttypes_h.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+lock.m4
+longdouble.m4
+longlong.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4