summaryrefslogtreecommitdiff
path: root/gst/gstconfig.h.in
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2007-04-20 08:39:35 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2007-04-20 08:39:35 +0000
commit92cd1de49e0c47e041ce03305c8b177691568d17 (patch)
tree0c0733bac7f66f997558f77b002431f04cb096f5 /gst/gstconfig.h.in
parentd5669b316aa7de53146b92ea6ce1650a2a2b3068 (diff)
2nd attempt to have a xml-less build as a joined effort of #413123 and #421480.
Original commit message from CVS: * configure.ac: * docs/gst/gstreamer-sections.txt: * gst/Makefile.am: * gst/gstconfig.h.in: * gst/gstobject.c: (gst_object_class_init), (gst_signal_object_class_init): * gst/gstobject.h: 2nd attempt to have a xml-less build as a joined effort of #413123 and #421480.
Diffstat (limited to 'gst/gstconfig.h.in')
-rw-r--r--gst/gstconfig.h.in28
1 files changed, 20 insertions, 8 deletions
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index ae105b6bb..c3c8b13ff 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -53,7 +53,6 @@
/* trick gtk-doc into believing these symbols are defined (yes, it's ugly) */
#if 0
-#define GST_DISABLE_LOADSAVE_REGISTRY 1
#define GST_DISABLE_GST_DEBUG 1
#define GST_DISABLE_LOADSAVE 1
#define GST_DISABLE_PARSE 1
@@ -64,6 +63,8 @@
#define GST_DISABLE_INDEX 1
#define GST_DISABLE_PLUGIN 1
#define GST_DISABLE_URI 1
+#define GST_DISABLE_XML 1
+#define GST_DISABLE_LOADSAVE_REGISTRY 1
#define GST_HAVE_GLIB_2_8 1
#endif
@@ -86,7 +87,7 @@
/**
* GST_DISABLE_LOADSAVE:
*
- * Configures the inclusion of the plugin graph xml-serialisation
+ * Configures the inclusion of the plugin graph xml-serialisation
* (was used in 0.8 by gst-editor)
*/
@GST_DISABLE_LOADSAVE_DEFINE@
@@ -117,12 +118,20 @@
/**
* GST_DISABLE_REGISTRY:
*
- * Configures the use of the plugin registry
- * if one disables this, required plugins need to be loaded and registered
+ * Configures the use of the plugin registry.
+ * If one disables this, required plugins need to be loaded and registered
* manualy
*/
@GST_DISABLE_REGISTRY_DEFINE@
+/**
+ * GST_DISABLE_XML:
+ *
+ * Configures the use libxml2. This setting is derived from the settings of
+ * %GST_DISABLE_LOADSAVE and %GST_DISABLE_REGISTRY (in the xml registry case).
+ */
+@GST_DISABLE_XML_DEFINE@
+
/* FIXME: test and document these! */
/* Configure the use of glib enumtypes (useful for introspection)
* see http://bugzilla.gnome.org/show_bug.cgi?id=342564
@@ -163,15 +172,18 @@
/* whether or not the CPU supports unaligned access */
@GST_HAVE_UNALIGNED_ACCESS_DEFINE@
-/* whether or not we are using glib 2.8 api, e.g. atomic gobject
- refcounting */
+/* FIXME: 0.11 (remove)
+ * whether or not we are using glib 2.8 api, e.g. atomic gobject
+ * refcounting */
@GST_HAVE_GLIB_2_8_DEFINE@
/***** Deal with XML stuff, we have to handle both loadsave and registry *****/
-
-#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )
+/* FIXME: move include to where we need it */
+/*#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) )*/
+#ifndef GST_DISABLE_XML
# include <libxml/parser.h>
#else
+ /* FIXME: 0.11 (replace by GST_DISABLE_XML) */
# define GST_DISABLE_LOADSAVE_REGISTRY
#endif