From 9a724607c9fe20bc4219b6188a55f6b8f41b931e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Fri, 5 Dec 2008 09:30:45 +0000
Subject: [PATCH] Makefile.am: Add gst-libs to DIST_SUBDIRS to make sure that
 it's always disted.

Original commit message from CVS:
* Makefile.am:
Add gst-libs to DIST_SUBDIRS to make sure that it's always
disted.
* autogen.sh:
Remove -I m4 from autogen.sh, it's not disted and used anymore and
thus makes autogen.sh fail if run on a tarball. Fixes bug #563305.
---
 ChangeLog   | 10 ++++++++++
 Makefile.am |  1 +
 autogen.sh  |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 96ce395755..0c37d6cf3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-05  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* Makefile.am:
+	Add gst-libs to DIST_SUBDIRS to make sure that it's always
+	disted.
+
+	* autogen.sh:
+	Remove -I m4 from autogen.sh, it's not disted and used anymore and
+	thus makes autogen.sh fail if run on a tarball. Fixes bug #563305.
+
 2008-12-04  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 2e5bcaeec0..cd36b136a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
 SUBDIRS = $(FFMPEG_SUBDIRS) ext docs common tests
+DIST_SUBDIRS = $(SUBDIRS) gst-libs
 
 # include before EXTRA_DIST for win32 assignment
 include $(top_srcdir)/common/win32.mak
diff --git a/autogen.sh b/autogen.sh
index 79cf76e136..1cdab55d1b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -97,7 +97,7 @@ fi
 
 toplevel_check $srcfile
 
-tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
 tool_run "$libtoolize" "--copy --force"
 tool_run "$autoheader"