From ad97442409d91760d1ada6c73ac4e70b15c80db7 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Fri, 18 Jan 2008 00:52:28 +0000
Subject: [PATCH] Include m4 files and autogen.sh in tarballs

svn path=/trunk/; revision=575
---
 Makefile.am  | 3 +++
 configure.ac | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 2d207666..2d0d907f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,8 @@ if HAVE_TESTS
 SUBDIRS += tests
 endif
 
+ACLOCAL_AMFLAGS = -I m4
+
 DISTCHECK_CONFIGURE_FLAGS =	\
 	--disable-scrollkeeper  \
 	--enable-gtk-doc
@@ -30,6 +32,7 @@ EXTRA_DIST = 			\
         ChangeLog.old           \
         README                  \
 	CONTRIBUTORS		\
+	autogen.sh		\
 	$(INTLTOOL)
 
 DISTCLEANFILES = 		\
diff --git a/configure.ac b/configure.ac
index 08559132..25f68897 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,12 @@ MISSION_CONTROL_REQUIRED=4.53
 # AC_DEFINE(LIBTELEPATHY_DISABLE_DEPRECATED, 1, [Disable deprecated libtelepathy symbols])
 
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_AUX_DIR(.)
-AM_CONFIG_HEADER(config.h)
+
+GNOME_COMMON_INIT
+
 AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define)
 AM_MAINTAINER_MODE
 AC_ISC_POSIX
-- 
2.39.2