Include m4 files and autogen.sh in tarballs

svn path=/trunk/; revision=575

diff --git a/Makefile.am b/Makefile.am
index 2d207666bf88c8de46e79b4f48e7aed6f26c8746..2d0d907ff443415d925296b61e4533bba1072530 100644 (file)
--- 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 0855913276cbdbcc2b9f9ee0d31a2a6f65cc883d..25f68897298ce8088f4ac703036998713c6e04f7 100644 (file)
--- 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