mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 04:05:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix libxml-less compilation (--disable-loadsave).

Browse source 
Original commit message from CVS:
* configure.ac:
* gst/gstconfig.h.in:
* gst/indexers/gstindexers.c: (plugin_init):
* gst/registries/gstxmlregistry.h:
Fix libxml-less compilation (--disable-loadsave).
This commit is contained in:
Ronald S. Bultje 2005-03-09 08:45:03 +00:00
parent b27e849a5f
commit 74f409b76f
6 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-03-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
* gst/gstconfig.h.in:
* gst/indexers/gstindexers.c: (plugin_init):
* gst/registries/gstxmlregistry.h:
Fix libxml-less compilation (--disable-loadsave).
2005-03-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-03-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/registries/Makefile.am: * gst/registries/Makefile.am:

4
configure.ac
View file

@ -275,9 +275,9 @@ AC_SUBST(GLIB_ONLY_CFLAGS)
AC_SUBST(GLIB_ONLY_LIBS) AC_SUBST(GLIB_ONLY_LIBS)
dnl === libxml 2 === dnl === libxml 2 ===
if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" if test "x$GST_DISABLE_LOADSAVE" = "xyes"
then then
AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2]) AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2])
else else
dnl check for libxml2 with minimum req version dnl check for libxml2 with minimum req version
GST_LIBXML2_CHECK(2.4.9) GST_LIBXML2_CHECK(2.4.9)

3
gst/gstconfig.h.in
View file

@ -61,9 +61,10 @@
/***** Deal with XML stuff, we have to handle both loadsave and registry *****/ /***** Deal with XML stuff, we have to handle both loadsave and registry *****/
#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) #if (! defined(GST_DISABLE_LOADSAVE) )
# include <libxml/parser.h> # include <libxml/parser.h>
#else #else
/* misnomer but we cannot rename symbols */
# define GST_DISABLE_LOADSAVE_REGISTRY # define GST_DISABLE_LOADSAVE_REGISTRY
#endif #endif

2
gst/indexers/gstindexers.c
View file

@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
gboolean res = TRUE; gboolean res = TRUE;
res &= gst_mem_index_plugin_init (plugin); res &= gst_mem_index_plugin_init (plugin);
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
res &= gst_file_index_plugin_init (plugin); res &= gst_file_index_plugin_init (plugin);
#endif
return res; return res;
} }

1
gst/registries/gstxmlregistry.h
View file

@ -25,6 +25,7 @@
#define __GST_XML_REGISTRY_H__ #define __GST_XML_REGISTRY_H__
#include <gst/gstregistry.h> #include <gst/gstregistry.h>
#include <stdio.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
plugins/indexers/gstindexers.c
View file

@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
gboolean res = TRUE; gboolean res = TRUE;
res &= gst_mem_index_plugin_init (plugin); res &= gst_mem_index_plugin_init (plugin);
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
res &= gst_file_index_plugin_init (plugin); res &= gst_file_index_plugin_init (plugin);
#endif
return res; return res;
} }