From 90bf52606749a8ab0c24a8d7af34b3ec81fc667a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 28 Jun 2012 00:27:31 +0900
Subject: configure: put m4 macros and autogenerated files into m4/ directory.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
---
 Makefile.am  | 2 ++
 autogen.sh   | 4 +++-
 configure.ac | 7 ++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b35b582..a2045146 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = debian.upstream gst-libs gst pkgconfig tests docs
diff --git a/autogen.sh b/autogen.sh
index 9e15ad9a..7f9a198d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,6 +12,8 @@ test $TEST_TYPE $FILE || {
     exit 1
 }
 
+mkdir -p m4
+
 GTKDOCIZE=`which gtkdocize`
 if test -z $GTKDOCIZE; then
     echo "*** No gtk-doc support ***"
@@ -33,7 +35,7 @@ if test -z $AUTORECONF; then
     echo "*** No autoreconf found ***"
     exit 1
 else
-    ACLOCAL="${ACLOCAL-aclocal} $ACLOCAL_FLAGS" autoreconf -v --install || exit $?
+    autoreconf -v --install || exit $?
 fi
 
 if test -z "$NO_CONFIGURE"; then
diff --git a/configure.ac b/configure.ac
index 2ec062cf..349f2621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,10 +59,15 @@ AC_PREREQ([2.58])
 AC_INIT([gst_vaapi], [gst_vaapi_version],
     [gwenole.beauchesne@intel.com],
     [gstreamer-vaapi])
+
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
 AC_CANONICAL_TARGET
+
 AM_INIT_AUTOMAKE
-AC_CONFIG_HEADERS([config.h])
 
 TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
 AC_SUBST(TODAY)
-- 
cgit v1.2.1