Example of how to properly ignore methods that aren't available if some feature is...

Original commit message from CVS:
* configure.ac:
* gst/Makefile.am:
* gst/gst-disable-loadsave.ignore:
* gst/gstversion.override.in:
Example of how to properly ignore methods that aren't available if
some feature is disabled in GStreamer core.

diff --git a/ChangeLog b/ChangeLog
index 4e89d56..231d6e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-23  Edward Hervey  <edward@fluendo.com>
+
+       * configure.ac:
+       * gst/Makefile.am:
+       * gst/gst-disable-loadsave.ignore:
+       * gst/gstversion.override.in:
+       Example of how to properly ignore methods that aren't available if
+       some feature is disabled in GStreamer core.
+
 2007-04-23  Stefan Kost  <ensonic@users.sf.net>
 
        * configure.ac:

diff --git a/common b/common
index a19d235..b5971d7 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a19d235c89d99ca7849078d501129f521e30d98d
+Subproject commit b5971d76ccd216c27e095c02c3a369a9d05cb36d

diff --git a/configure.ac b/configure.ac
index 614ae07..5db77c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -201,8 +201,11 @@ GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig
 AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH)
 if test $GST_DISABLE_LOADSAVE = "1"; then
   AC_MSG_WARN("Load/Save XML persistence disabled")
+  IGNORE_GST_LOADSAVE="gst-disable-loadsave.ignore"
+else
+  IGNORE_GST_LOADSAVE=""
 fi
-
+AC_SUBST(IGNORE_GST_LOADSAVE)
 
 dnl check for gstreamer-controller
 PKG_CHECK_MODULES(GST_CONTROLLER, gstreamer-controller-$GST_MAJORMINOR >= $GST_REQ,

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 4fd4675..a77d654 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -31,7 +31,8 @@ versioned_overrides = \
        gst-0.10.10.ignore      \
        gst-0.10.11.ignore      \
        gst-0.10.12.ignore      \
-       gst-pb-0.10.11.ignore
+       gst-pb-0.10.11.ignore   \
+       gst-disable-loadsave.ignore
 
 INCLUDES = $(PYTHON_INCLUDES)
 EXTRA_DIST = $(defs_DATA) $(versioned_overrides) common.h arg-types.py

diff --git a/gst/gst-disable-loadsave.ignore b/gst/gst-disable-loadsave.ignore
new file mode 100644 (file)
index 0000000..f8921f9
--- /dev/null
+++ b/gst/gst-disable-loadsave.ignore
@@ -0,0 +1,5 @@
+%%
+ignore
+  gst_element_save_thyself
+  gst_element_restore_thyself
+%%
\ No newline at end of file

diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in
index 6ad44fa..3462ffb 100644 (file)
--- a/gst/gstversion.override.in
+++ b/gst/gstversion.override.in
@@ -9,4 +9,5 @@ include
 @IGNORE_GST_0_10_11@
 @IGNORE_GST_PB_0_10_11@
 @IGNORE_GST_0_10_12@
+@IGNORE_GST_LOADSAVE@
 %%