mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-05 09:00:54 +00:00
Fix libxml-less compilation (--disable-loadsave).
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:
parent
b27e849a5f
commit
74f409b76f
6 changed files with 18 additions and 4 deletions
|
@ -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>
|
||||
|
||||
* gst/registries/Makefile.am:
|
||||
|
|
|
@ -275,9 +275,9 @@ AC_SUBST(GLIB_ONLY_CFLAGS)
|
|||
AC_SUBST(GLIB_ONLY_LIBS)
|
||||
|
||||
dnl === libxml 2 ===
|
||||
if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes"
|
||||
if test "x$GST_DISABLE_LOADSAVE" = "xyes"
|
||||
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
|
||||
dnl check for libxml2 with minimum req version
|
||||
GST_LIBXML2_CHECK(2.4.9)
|
||||
|
|
|
@ -61,10 +61,11 @@
|
|||
|
||||
/***** 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>
|
||||
#else
|
||||
# define GST_DISABLE_LOADSAVE_REGISTRY
|
||||
/* misnomer but we cannot rename symbols */
|
||||
# define GST_DISABLE_LOADSAVE_REGISTRY
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
|
|
|
@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
|
|||
gboolean res = TRUE;
|
||||
|
||||
res &= gst_mem_index_plugin_init (plugin);
|
||||
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
|
||||
res &= gst_file_index_plugin_init (plugin);
|
||||
#endif
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#define __GST_XML_REGISTRY_H__
|
||||
|
||||
#include <gst/gstregistry.h>
|
||||
#include <stdio.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
|
|||
gboolean res = TRUE;
|
||||
|
||||
res &= gst_mem_index_plugin_init (plugin);
|
||||
#ifndef GST_DISABLE_LOADSAVE_REGISTRY
|
||||
res &= gst_file_index_plugin_init (plugin);
|
||||
#endif
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue