[farsight2/master] Don't try to do gst-xmlinspect if pygst inst there (will fail with non-tarball..)

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:25:30 PST 2008


---
 common/gtk-doc-plugins.mak   |    7 +++++++
 common/m4/gst-plugin-docs.m4 |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/common/gtk-doc-plugins.mak b/common/gtk-doc-plugins.mak
index 4843801..710e78d 100644
--- a/common/gtk-doc-plugins.mak
+++ b/common/gtk-doc-plugins.mak
@@ -140,6 +140,8 @@ inspect-update: inspect
 	-rm -f $(INSPECT_REGISTRY) inspect-build.stamp
 	$(MAKE) inspect-build.stamp
 
+if ENABLE_PLUGIN_DOCS
+
 # FIXME: inspect.stamp should be written to by gst-xmlinspect.py
 # IF the output changed; see gtkdoc-mktmpl
 inspect-build.stamp:
@@ -156,6 +158,11 @@ inspect-build.stamp:
 	    touch inspect-build.stamp; \
         fi
 
+else
+inspect-build.stamp:
+	@true:
+endif
+
 ### scan headers; done on every build ###
 scan-build.stamp: $(HFILE_GLOB) $(EXTRA_HFILES) $(basefiles) scanobj-build.stamp inspect-build.stamp scanobj-trans-build.stamp
 	if test "x$(top_srcdir)" != "x$(top_builddir)" &&		\
diff --git a/common/m4/gst-plugin-docs.m4 b/common/m4/gst-plugin-docs.m4
index 8a22ad0..0ccc64b 100644
--- a/common/m4/gst-plugin-docs.m4
+++ b/common/m4/gst-plugin-docs.m4
@@ -17,7 +17,7 @@ AC_DEFUN([AG_GST_PLUGIN_DOCS],
     build_plugin_docs=yes
     AC_MSG_RESULT([yes])
   else
-    AC_MSG_RESULT([no (gtk-doc disabled or not available)])
+    AC_MSG_RESULT([no (gtk-doc/pygst disabled or not available)])
   fi
 
   AM_CONDITIONAL(ENABLE_PLUGIN_DOCS, test x$build_plugin_docs = xyes)
-- 
1.5.6.5




More information about the farsight-commits mailing list