build: Use m4 dir for autoconf macros

diff --git a/.gitignore b/.gitignore
index 933dbc99ff3523e9598dadcc35357cbefd49a08c..42c1298fc372c2f3bb92e7b3ec96a8035a009068 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ configure
 depcomp
 libtool
 install-sh
+m4
 missing
 ltmain.sh
 ylwrap

diff --git a/Makefile.am b/Makefile.am
index fd434c9443c152b3d0aa906d800a8deaa6365cc3..3d35273248c4edcc836c13d94f38c8f6acd2bd7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 NULL =
 
 if ENABLE_VAPIGEN

diff --git a/autogen.sh b/autogen.sh
index 5d6ac731d2f815b30398e9eef4e5bae3144d991b..7708a0ce11f855abcd6634f65e666ac5738bb933 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,6 +8,7 @@ cd $srcdir
 
 # Automake requires that ChangeLog exist.
 touch ChangeLog
+mkdir -p m4
 
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?

diff --git a/configure.ac b/configure.ac
index b8e21398cfd08c03efd259f6dc7dd0e208a302fa..31fc3f451ff384e7b28e5d01423da2c58b8e074a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_INIT([vala], [0.7.3], [j@bitron.ch], [vala])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE