Index: gst-plugins-base/gst/subparse/gstsubparse.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst/subparse/gstsubparse.c,v
retrieving revision 1.46
diff -p -u -r1.46 gstsubparse.c
--- gst-plugins-base/gst/subparse/gstsubparse.c	10 Mar 2007 11:17:52 -0000	1.46
+++ gst-plugins-base/gst/subparse/gstsubparse.c	22 Mar 2007 13:21:59 -0000
@@ -59,7 +59,7 @@ GST_ELEMENT_DETAILS ("Subtitle parser",
     "Gustavo J. A. M. Carneiro <gjc@inescporto.pt>\n"
     "Ronald S. Bultje <rbultje@ronald.bitfreak.net>");
 
-#ifndef GST_DISABLE_LOADSAVE_REGISTRY
+#ifdef GST_USING_XML
 static GstStaticPadTemplate sink_templ = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
Index: gst-plugins-base/gst/subparse/samiparse.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst/subparse/samiparse.c,v
retrieving revision 1.7
diff -p -u -r1.7 samiparse.c
--- gst-plugins-base/gst/subparse/samiparse.c	23 Sep 2006 14:30:53 -0000	1.7
+++ gst-plugins-base/gst/subparse/samiparse.c	22 Mar 2007 13:21:59 -0000
@@ -20,7 +20,7 @@
 #include "samiparse.h"
 
 /* FIXME: use Makefile stuff */
-#ifndef GST_DISABLE_LOADSAVE_REGISTRY
+#ifdef GST_USING_XML
 #include <libxml/HTMLparser.h>
 #include <string.h>
 
@@ -421,7 +421,7 @@ parse_sami (ParserState * state, const g
   return NULL;
 }
 
-#else /* GST_DISABLE_LOADSAVE_REGISTRY */
+#else /* GST_USING_XML */
 
 gchar *
 parse_sami (ParserState * state, const gchar * line)
@@ -448,4 +448,4 @@ sami_context_reset (ParserState * state)
   return;
 }
 
-#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
+#endif /* GST_USING_XML */
Index: gst-plugins-base/tests/check/elements/playbin.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/elements/playbin.c,v
retrieving revision 1.5
diff -p -u -r1.5 playbin.c
--- gst-plugins-base/tests/check/elements/playbin.c	23 Jan 2007 17:49:29 -0000	1.5
+++ gst-plugins-base/tests/check/elements/playbin.c	22 Mar 2007 13:21:59 -0000
@@ -26,7 +26,7 @@
 #include <gst/base/gstpushsrc.h>
 #include <unistd.h>
 
-#ifndef GST_DISABLE_LOADSAVE_REGISTRY
+#ifndef GST_DISABLE_REGISTRY
 
 #define DEFINE_TEST(func) \
     static void func (void);                            \
@@ -582,8 +582,7 @@ GST_PLUGIN_DEFINE_STATIC
     "static elements for the playbin unit test",
     plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);
 
-#endif /* GST_DISABLE_LOADSAVE_REGISTRY */
-
+#endif /* !GST_DISABLE_REGISTRY */
 
 static Suite *
 playbin_suite (void)
@@ -593,7 +592,7 @@ playbin_suite (void)
 
   suite_add_tcase (s, tc_chain);
 
-#ifndef GST_DISABLE_LOADSAVE_REGISTRY
+#ifndef GST_DISABLE_REGISTRY
   /* with the old decodebin */
   tcase_add_test (tc_chain, test_sink_usage_video_only_stream_decodebin1);
   tcase_add_test (tc_chain, test_suburi_error_wrongproto_decodebin1);
