From de74af0114b070b7330352d8566b21e4da9c616d Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Wed, 11 Feb 2004 17:45:02 +0000
Subject: [PATCH] docs/gst/Makefile.am: Call gst_init() in built
 gstreamer-scan.

Original commit message from CVS:
* docs/gst/Makefile.am: Call gst_init() in built gstreamer-scan.
* gst/gstatomic_impl.h: Disable sparc implementation.
---
 ChangeLog            | 5 +++++
 common               | 2 +-
 docs/gst/Makefile.am | 2 +-
 gst/gstatomic_impl.h | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49ab3b3..e9879c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-11  David Schleef  <ds@schleef.org>
+
+	* docs/gst/Makefile.am: Call gst_init() in built gstreamer-scan.
+	* gst/gstatomic_impl.h: Disable sparc implementation.
+
 2004-02-11  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst-element-check.m4:
diff --git a/common b/common
index 759c50e..c6f697f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 759c50e2a908cfb369590c2099537c2f4da33bd8
+Subproject commit c6f697f5a14c01e88a7cdf417b8e06b4417921c3
diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 6fed99b..bc2eb3f 100644
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -135,7 +135,7 @@ scan-build.stamp: $(HFILE_GLOB) $(SCANOBJ_DEPS) $(basefiles)
 	    if test x"$(srcdir)" != x. ; then \
 	        cp $(srcdir)/$(DOC_MODULE).types . ; \
 	    fi ; \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" $(GTK_DOC_SCANOBJ) --module=$(DOC_MODULE) ; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" $(GTK_DOC_SCANOBJ) --type-init-func="gst_init(NULL,NULL)" --module=$(DOC_MODULE) ; \
 	else \
 	    cd $(srcdir) ; \
 	    for i in $(SCANOBJ_FILES) ; do \
diff --git a/gst/gstatomic_impl.h b/gst/gstatomic_impl.h
index 0597f81..8edb921 100644
--- a/gst/gstatomic_impl.h
+++ b/gst/gstatomic_impl.h
@@ -211,7 +211,8 @@ gst_atomic_int_dec_and_test (GstAtomicInt *aint)
 }
 
 /***** Sun SPARC *****/
-#elif defined(HAVE_CPU_SPARC) && defined(__GNUC__)
+#elif 0 && defined(HAVE_CPU_SPARC) && defined(__GNUC__)
+/* allegedly broken again */
 
 GST_INLINE_FUNC void 	gst_atomic_int_destroy 	(GstAtomicInt *aint) { } 
 
-- 
2.7.4