Added --enable-plugin-docs configure option, to enable build of the plugin documentat...

Original commit message from CVS:
Added --enable-plugin-docs configure option, to enable build of the plugin
documentation (currently broken).  This defaults to off.
Changed --enable-docs-build to default to on, since all other documentation
should build correctly.

Also, correct typo in manual, and fix up a couple of things in example.c

diff --git a/configure.in b/configure.in
index 4bd1f4cb78af7001ffb77b2421f9eaf35a1f38bd..31ece16824c811e70c2207581eeb86dcb3619f58 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -527,13 +527,24 @@ esac],
 [:]) dnl Default value
 
 AC_ARG_ENABLE(docs-build,
-[  --enable-docs-build          enable the building of the documentation],
+[  --disable-docs-build         disable all building of documentation],
 [case "${enableval}" in
   yes) BUILD_DOCS=yes ;;
   no)  BUILD_DOCS=no ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs-build) ;;
 esac], 
-[BUILD_DOCS=no]) dnl Default value
+[BUILD_DOCS=yes]) dnl Default value
+
+AC_ARG_ENABLE(plugin-docs,
+[  --enable-plugin-docs         enable the building of plugin documentation
+                               (this is currently broken, so off by default)],
+[case "${enableval}" in
+  yes) BUILD_PLUGIN_DOCS=yes ;;
+  no)  BUILD_PLUGIN_DOCS=no ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-plugin-docs) ;;
+esac], 
+[BUILD_PLUGIN_DOCS=no]) dnl Default value
+
 
 
 
@@ -615,6 +626,7 @@ AM_CONDITIONAL(HAVE_GNOME,          test "x$HAVE_GNOME" = "xyes")
 AM_CONDITIONAL(HAVE_LIBXV,          test "x$HAVE_LIBXV" = "xyes")
 AM_CONDITIONAL(HAVE_GTK_DOC,        $HAVE_GTK_DOC)
 AM_CONDITIONAL(BUILD_DOCS,          test "x$BUILD_DOCS" = "xyes")
+AM_CONDITIONAL(BUILD_PLUGIN_DOCS,   test "x$BUILD_PLUGIN_DOCS" = "xyes")
 AM_CONDITIONAL(HAVE_DB2HTML,        $HAVE_DB2HTML)
 AM_CONDITIONAL(HAVE_DB2PS,          $HAVE_DB2PS)
 AM_CONDITIONAL(HAVE_PS2PDF,         $HAVE_PS2PDF)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index cd66e8309761b7cc2b5f2b51bec1aa1f48a18a0e..3b1e294008b699208e71e911ddc550ae4b41199d 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,4 +1,11 @@
-SUBDIRS = manual fwg gst libs plugins
+
+if BUILD_PLUGIN_DOCS
+SUBDIRS_PLUGINS = plugins
+else
+SUBDIRS_PLUGINS =
+endif
+
+SUBDIRS = manual fwg gst libs $(SUBDIRS_PLUGINS)
 
 EXTRA_DIST = random slides manuals.mak
 

diff --git a/docs/manual/typedetection.sgml b/docs/manual/typedetection.sgml
index 297c56221aa7cf27790078cfdfabc919f6478f45..e9bb972e10fa3aeca20ddd289cc2441200f907ad 100644 (file)
--- a/docs/manual/typedetection.sgml
+++ b/docs/manual/typedetection.sgml
@@ -3,7 +3,7 @@
   <para> 
     Sometimes the capabilities of a pad are not specificied. The disksrc, for
     example, does not know what type of file it is reading. Before you can attach
-    and element to the pad of the disksrc, you need to determine the media type in
+    an element to the pad of the disksrc, you need to determine the media type in
     order to be able to choose a compatible element.
   </para>
   <para> 

diff --git a/examples/plugins/example.c b/examples/plugins/example.c
index 00cf8c19d7d8befed4177aa24cdc320f77e74c96..dbe5b287949bbfe1bbe99915bbc8a7b5318f8d7d 100644 (file)
--- a/examples/plugins/example.c
+++ b/examples/plugins/example.c
@@ -27,11 +27,11 @@
  */
 static GstElementDetails example_details = {
   "An example plugin",
-  "Example",
+  "Example/FirstExample",
   "Shows the basic structure of a plugin",
   VERSION,
   "your name <your.name@your.isp>",
-  "(C) 2000",
+  "(C) 2001",
 };
 
 /* These are the signals that this element can fire.  They are zero-

diff --git a/tests/old/examples/plugins/example.c b/tests/old/examples/plugins/example.c
index 00cf8c19d7d8befed4177aa24cdc320f77e74c96..dbe5b287949bbfe1bbe99915bbc8a7b5318f8d7d 100644 (file)
--- a/tests/old/examples/plugins/example.c
+++ b/tests/old/examples/plugins/example.c
@@ -27,11 +27,11 @@
  */
 static GstElementDetails example_details = {
   "An example plugin",
-  "Example",
+  "Example/FirstExample",
   "Shows the basic structure of a plugin",
   VERSION,
   "your name <your.name@your.isp>",
-  "(C) 2000",
+  "(C) 2001",
 };
 
 /* These are the signals that this element can fire.  They are zero-