From 31977749646a3bc7d8945462403ddb03c95be468 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Sun, 9 Aug 2009 09:42:14 -0400
Subject: [PATCH] Use an m4/ directory for aclocal files

---
 .gitignore          | 1 +
 Makefile.am         | 1 +
 configure.in        | 3 ++-
 python/Makefile.am  | 1 +
 python/configure.in | 2 ++
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1bb227d..8fc4b16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ libsoup/soup-marshal.c
 libsoup/soup-marshal.h
 libtool
 ltmain.sh
+m4
 missing
 python/COPYING
 stamp-h1
diff --git a/Makefile.am b/Makefile.am
index 6c7dc3c..686e2e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = libsoup tests docs
 
diff --git a/configure.in b/configure.in
index b27b1c3..265f064 100644
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,9 @@ dnl *******************************************
 AC_PREREQ(2.53)
 AC_INIT(libsoup, 2.27.5)
 AC_CONFIG_SRCDIR(libsoup-2.4.pc.in)
-AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_MACRO_DIR([m4])
 
+AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
 
 AM_CONFIG_HEADER(config.h)
diff --git a/python/Makefile.am b/python/Makefile.am
index 22bc3f9..a58a06c 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS=1.5
+ACLOCAL_AMFLAGS=-I m4
 
 INCLUDES =			\
 	$(PYTHON_INCLUDES)	\
diff --git a/python/configure.in b/python/configure.in
index 14fd092..356e6d8 100644
--- a/python/configure.in
+++ b/python/configure.in
@@ -1,6 +1,8 @@
 AC_PREREQ(2.53)
 AC_INIT(libsoup-python, 0.0)
 AC_CONFIG_SRCDIR(libsoup.defs)
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AM_MAINTAINER_MODE
-- 
2.7.4