From: Marc-André Lureau <marcandre.lureau@gmail.com>
Date: Sun, 10 May 2009 21:49:19 +0000 (+0300)
Subject: build: Use m4 dir for autoconf macros
X-Git-Tag: 0.7.3~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26bd0a954342d5aad48dc89869595b664df5a027;p=thirdparty%2Fvala.git

build: Use m4 dir for autoconf macros
---

diff --git a/.gitignore b/.gitignore
index 933dbc99f..42c1298fc 100644
--- 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 fd434c944..3d3527324 100644
--- 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 5d6ac731d..7708a0ce1 100755
--- 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 b8e21398c..31fc3f451 100644
--- 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