From 54e90206586bace27edcd2de5515275beaa82808 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl debian org>
Date: Fri, 15 Jan 2010 07:25:46 +0100
Subject: [PATCH] Use a separate directory m4/ for the m4 macros.

While at it, replace the deprecated macro AM_CONFIG_HEADER with
AC_CONFIG_HEADERS.
---
 Makefile.am  |    1 +
 configure.ac |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 97f4b4f..c116e54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,3 +72,4 @@ install-data-hook:
 	rm -Rf $(DESTDIR)$(datadir)/tracker/tracker-introspect.xml
 endif	
 
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 41f7d1d..9b7c949 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,9 +45,10 @@ AC_INIT([tracker], [tracker_version],
 	[tracker])
 
 AC_CONFIG_SRCDIR([src/tracker-store/tracker-main.c])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([no-define tar-ustar])
-AM_CONFIG_HEADER(config.h)
 
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-- 
1.6.6