configure.ac: 0.10.4.2 pre-release.

Original commit message from CVS:
* configure.ac:
0.10.4.2 pre-release.
* docs/Makefile.am:
Disable recursion into the plugins docs directory - there's no
docs in there anyway, and it breaks distcheck.

diff --git a/ChangeLog b/ChangeLog
index 5786bcc..1ce61b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-12  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * configure.ac:
+       0.10.4.2 pre-release.
+
+       * docs/Makefile.am:
+       Disable recursion into the plugins docs directory - there's no
+       docs in there anyway, and it breaks distcheck.
+
 2008-08-01  Mark Nauwelaerts  <mark.nauwelaerts@collabora.co.uk>
 
        * ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_cfg_fill_context):

diff --git a/configure.ac b/configure.ac
index 80660d0..870727d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer FFMpeg, 0.10.4.1,
+AC_INIT(GStreamer FFMpeg, 0.10.4.2,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-ffmpeg)
 
@@ -319,7 +319,6 @@ gst-libs/Makefile
 gst-libs/ext/Makefile
 docs/Makefile
 docs/version.entities
-docs/plugins/Makefile
 common/Makefile
 common/m4/Makefile
 tests/Makefile

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6245c98..2dacd31 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,11 +1,11 @@
 if ENABLE_GTK_DOC
-GTK_DOC_DIRS = plugins
+GTK_DOC_DIRS = # plugins
 else
 GTK_DOC_DIRS =
 endif
 
 SUBDIRS = $(GTK_DOC_DIRS)
-DIST_SUBDIRS = plugins
+DIST_SUBDIRS = # plugins
 
 EXTRA_DIST = \
        version.entities.in