[gir-repository] Conditionally add gstbufferlist.h, gsttaskpool.h

[Owen Taylor <otaylor src gnome org>]

commit 4e7ddca82ead3ea011637bf8ebd38d985a006972
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Tue Jul 28 12:11:48 2009 -0400

    Conditionally add gstbufferlist.h, gsttaskpool.h
    
    gstreamer-0.10.24 adds new header files with definitions needed by
    other header files; check for them in configure.ac and conditionally
    add them to the list of GStreamer header files that we scan.
    
    http://bugzilla.gnome.org/show_bug.cgi?id=590031

 configure.ac    |   18 ++++++++++++++++++
 gir/Makefile.am |   38 +++++++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 32b0825..af09164 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,24 @@ PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.0,
                   have_gstreamer=true, have_gstreamer=false)
 AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer)
 
+dnl gstbufferlist.h, gsttaskpool.h were added in 0.10.24 (and in
+dnl prereleases of that)
+have_gstbufferlist_h=false
+if $have_gstreamer ; then
+   save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
+   AC_CHECK_HEADER(gst/gstbufferlist.h, [have_gstbufferlist_h=true])
+   CPPFLAGS="$save_CPPFLAGS"
+fi
+AM_CONDITIONAL(HAVE_GSTBUFFERLIST_H, $have_gstbufferlist_h)
+
+have_gsttaskpool_h=false
+if $have_gstreamer ; then
+   save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
+   AC_CHECK_HEADER(gst/gsttaskpool.h, [have_gsttaskpool_h=true])
+   CPPFLAGS="$save_CPPFLAGS"
+fi
+AM_CONDITIONAL(HAVE_GSTTASKPOOL_H, $have_gsttaskpool_h)
+
 dnl gstreamer
 PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, gstreamer-plugins-base-0.10 >= 0.10.0, 
                   have_gstreamer_plugins_base=true, 
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 64fa086..28389e2 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -513,19 +513,8 @@ endif BUILD_GOOCANVAS
 # GStreamer
 if BUILD_GSTREAMER
 GST_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-0.10`
-Gst-0.10.gir: $(INTROSPECTION_SCANNER) Gst-custom.c
-	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace Gst --nsversion=0.10 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-             --include=GObject-2.0 \
-             --include=GModule-2.0 \
-             --include=libxml2-2.0 \
-	     --library=gstbase-0.10 \
-	     --libtool="$(LIBTOOL)" \
-             --pkg gobject-2.0 \
-             --pkg gstreamer-0.10 \
-             --pkg gstreamer-base-0.10 \
-             --output $@ \
-	     Gst-custom.c \
+
+GST_HEADER_FILES = \
 	     $(GST_INCLUDEDIR)/gst/gstbin.h \
 	     $(GST_INCLUDEDIR)/gst/gstbuffer.h \
 	     $(GST_INCLUDEDIR)/gst/gstbus.h \
@@ -579,6 +568,29 @@ Gst-0.10.gir: $(INTROSPECTION_SCANNER) Gst-custom.c
 	     $(GST_INCLUDEDIR)/gst/gstversion.h \
 	     $(GST_INCLUDEDIR)/gst/gstxml.h \
 	     $(GST_INCLUDEDIR)/gst/base/*.h
+
+if HAVE_GSTBUFFERLIST_H
+GST_HEADER_FILES += $(GST_INCLUDEDIR)/gst/gstbufferlist.h
+endif
+
+if HAVE_GSTTASKPOOL_H
+GST_HEADER_FILES += $(GST_INCLUDEDIR)/gst/gsttaskpool.h
+endif
+
+Gst-0.10.gir: $(INTROSPECTION_SCANNER) Gst-custom.c
+	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace Gst --nsversion=0.10 \
+	    --add-include-path=$(srcdir) --add-include-path=. \
+             --include=GObject-2.0 \
+             --include=GModule-2.0 \
+             --include=libxml2-2.0 \
+	     --library=gstbase-0.10 \
+	     --libtool="$(LIBTOOL)" \
+             --pkg gobject-2.0 \
+             --pkg gstreamer-0.10 \
+             --pkg gstreamer-base-0.10 \
+             --output $@ \
+	     Gst-custom.c \
+	     $(GST_HEADER_FILES)
 BUILT_GIRSOURCES += Gst-0.10.gir
 
 GSTBASE_INCLUDEDIR=`pkg-config --variable=includedir gstreamer-base-0.10`