Use GST_PLUGIN_DOCS macro in configure.ac, add

Original commit message from CVS:
* autogen.sh:
* configure.ac:
* docs/Makefile.am:
Use GST_PLUGIN_DOCS macro in configure.ac, add
--enable-plugin-docs default to autogen.sh and use
ENABLE_PLUGIN_DOCS conditional in Makefile.am (#344039).

diff --git a/ChangeLog b/ChangeLog
index cd1d96a..932a8f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * autogen.sh:
+       * configure.ac:
+       * docs/Makefile.am:
+         Use GST_PLUGIN_DOCS macro in configure.ac, add
+         --enable-plugin-docs default to autogen.sh and use
+         ENABLE_PLUGIN_DOCS conditional in Makefile.am (#344039).
+
 2006-06-15  Wim Taymans  <wim@fluendo.com>
 
        * ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain_peer),

diff --git a/autogen.sh b/autogen.sh
index 2b174e2..0fd0382 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,7 +25,7 @@ then
 fi
 . common/gst-autogen.sh
 
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
+CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc --enable-plugin-docs'
 
 autogen_options $@
 

diff --git a/common b/common
index dd85f55..bbfa014 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit dd85f550441bd5722b98f4dd304e40826383240f
+Subproject commit bbfa0146961f4ca61ddbca7b42360b5741a6354b

diff --git a/configure.ac b/configure.ac
index 3f3944a..7019f60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,7 @@ AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")
 dnl check for documentation tools
 GTK_DOC_CHECK([1.3])
 AS_PATH_PYTHON([2.1])
+GST_PLUGIN_DOCS([1.3],[2.1])
 
 dnl *** checks for libraries ***
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
index b1feeb8..043152f 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,10 +1,16 @@
 if ENABLE_GTK_DOC
-GTK_DOC_DIRS = libs plugins
+GTK_DOC_DIRS = libs
 else
 GTK_DOC_DIRS =
 endif
 
-SUBDIRS = $(GTK_DOC_DIRS)
+if ENABLE_PLUGIN_DOCS
+PLUGIN_DOCS_DIRS = plugins
+else
+PLUGIN_DOCS_DIRS =
+endif
+
+SUBDIRS = $(GTK_DOC_DIRS) $(PLUGIN_DOCS_DIRS)
 DIST_SUBDIRS = libs plugins
 
 EXTRA_DIST = \