? m4/.gst-plugin-docs.m4.swp
Index: gtk-doc-plugins.mak
===================================================================
RCS file: /cvs/gstreamer/common/gtk-doc-plugins.mak,v
retrieving revision 1.42
diff -u -r1.42 gtk-doc-plugins.mak
--- gtk-doc-plugins.mak	21 May 2008 15:40:04 -0000	1.42
+++ gtk-doc-plugins.mak	27 May 2008 12:26:54 -0000
@@ -93,7 +93,7 @@
 	inspect-registry.xml
 
 
-if ENABLE_GTK_DOC
+if BUILD_PLUGIN_DOCS
 all-local: html-build.stamp
 
 #### scan gobjects; done by documentation maintainer ####
@@ -365,7 +365,7 @@
 #
 # Require gtk-doc when making dist
 #
-if ENABLE_GTK_DOC
+if BUILD_PLUGIN_DOCS
 dist-check-gtkdoc:
 else
 dist-check-gtkdoc:
Index: gtk-doc.mak
===================================================================
RCS file: /cvs/gstreamer/common/gtk-doc.mak,v
retrieving revision 1.22
diff -u -r1.22 gtk-doc.mak
--- gtk-doc.mak	21 May 2008 15:40:05 -0000	1.22
+++ gtk-doc.mak	27 May 2008 12:26:56 -0000
@@ -47,7 +47,7 @@
 
 CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
 
-if ENABLE_GTK_DOC
+if BUILD_GTK_DOC
 all-local: html-build.stamp
 
 #### scan ####
@@ -248,7 +248,7 @@
 #
 # Require gtk-doc when making dist
 #
-if ENABLE_GTK_DOC
+if BUILD_GTK_DOC
 dist-check-gtkdoc:
 else
 dist-check-gtkdoc:
Index: m4/gst-plugin-docs.m4
===================================================================
RCS file: /cvs/gstreamer/common/m4/gst-plugin-docs.m4,v
retrieving revision 1.4
diff -u -r1.4 gst-plugin-docs.m4
--- m4/gst-plugin-docs.m4	21 Mar 2008 12:31:52 -0000	1.4
+++ m4/gst-plugin-docs.m4	27 May 2008 12:26:57 -0000
@@ -17,5 +17,5 @@
     AC_MSG_RESULT([no (gtk-doc disabled or not available)])
   fi
 
-  AM_CONDITIONAL(ENABLE_PLUGIN_DOCS, test x$build_plugin_docs = xyes)
+  AM_CONDITIONAL(BUILD_PLUGIN_DOCS, test x$build_plugin_docs = xyes)
 ])
Index: m4/gtk-doc.m4
===================================================================
RCS file: /cvs/gstreamer/common/m4/gtk-doc.m4,v
retrieving revision 1.3
diff -u -r1.3 gtk-doc.m4
--- m4/gtk-doc.m4	8 Mar 2008 00:37:04 -0000	1.3
+++ m4/gtk-doc.m4	27 May 2008 12:26:57 -0000
@@ -15,14 +15,20 @@
   HTML_DIR="$with_html_dir"
   AC_SUBST(HTML_DIR)
 
-  dnl enable/disable documentation building
+  dnl enable/disable documentation
   AC_ARG_ENABLE(gtk-doc,
     AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
+                   [Enable gtk-doc documentation [default=no]]),,
     enable_gtk_doc=no)
 
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE(gtk-doc-build,
+    AC_HELP_STRING([--enable-gtk-doc-build],
+                   [use gtk-doc to build documentation [default=no]]),,
+    enable_gtk_doc_build=no)
+
   have_gtk_doc=no
-  if test x$enable_gtk_doc = xyes; then
+  if test x$enable_gtk_doc_build = xyes; then
     if test -z "$PKG_CONFIG"; then
       AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
     fi
@@ -47,10 +53,13 @@
     fi
 ])
     if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
+      enable_gtk_doc_build=no
+    else
+      enable_gtk_doc=yes
     fi
   fi
 
   AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+  AM_CONDITIONAL(BUILD_GTK_DOC, test x$enable_gtk_doc_build = xyes)
   AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
 ])
