[gst-cvs] slomo gst-ffmpeg: gst-ffmpeg/

[<sl...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-ffmpeg
Changes by:     slomo
Date:           Fri Dec 05 2008  09:30:59 UTC

Log message:
* 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.

Modified files:
    .               : ChangeLog Makefile.am autogen.sh

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/ChangeLog.diff?r1=1.530&r2=1.531
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/Makefile.am.diff?r1=1.17&r2=1.18
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-ffmpeg/autogen.sh.diff?r1=1.13&r2=1.14

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-ffmpeg/ChangeLog,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -d -r1.530 -r1.531
--- ChangeLog	4 Dec 2008 20:12:41 -0000	1.530
+++ ChangeLog	5 Dec 2008 09:30:44 -0000	1.531
@@ -1,3 +1,13 @@
+2008-12-05  Sebastian Dröge  <seb...@co...>
+
+	* 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  <seb...@co...>
 
 	* configure.ac:
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-ffmpeg/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	26 May 2008 07:45:35 -0000	1.17
+++ Makefile.am	5 Dec 2008 09:30:45 -0000	1.18
@@ -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
Index: autogen.sh
RCS file: /cvs/gstreamer/gst-ffmpeg/autogen.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- autogen.sh	21 Apr 2008 12:17:33 -0000	1.13
+++ autogen.sh	5 Dec 2008 09:30:45 -0000	1.14
@@ -97,7 +97,7 @@
 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"