mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Drop libxml2 dependency when building with

Browse source 
Original commit message from CVS:
* configure.ac:
* gst/Makefile.am:
* gst/gstconfig.h.in:
Drop libxml2 dependency when building with
--enable-binary-registry --disable-loadsave
This commit is contained in:
Stefan Kost 2007-04-17 10:46:46 +00:00
parent f0bd1f886d
commit 901dc53de9
4 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-04-17 Stefan Kost <ensonic@users.sf.net>
* configure.ac:
* gst/Makefile.am:
* gst/gstconfig.h.in:
Drop libxml2 dependency when building with
--enable-binary-registry --disable-loadsave
2007-04-16 Tim-Philipp Müller <tim at centricular dot net>
* gst/gstregistrybinary.c: (gst_registry_binary_write_cache),

14
configure.ac
View file

@ -136,7 +136,7 @@ AC_ARG_WITH(cachedir,
no) AC_MSG_ERROR(bad value ${withval} for --with-cachedir) ;;
*) GST_CACHE_DIR="${withval}" ;;
esac
],
],
[:]) dnl Default value
AS_AC_EXPAND(GST_CACHE_DIR, $GST_CACHE_DIR)
@ -152,7 +152,7 @@ AC_ARG_ENABLE(tests,
no) BUILD_TESTS=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-tests) ;;
esac
],
],
[BUILD_TESTS=yes]) dnl Default value
AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
@ -166,7 +166,7 @@ AC_ARG_ENABLE(failing-tests,
no) BUILD_FAILING_TESTS=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-failing-tests) ;;
esac
],
],
[BUILD_FAILING_TESTS=no]) dnl Default value
AM_CONDITIONAL(BUILD_FAILING_TESTS, test "x$BUILD_FAILING_TESTS" = "xyes")
if test x$BUILD_FAILING_TESTS = xyes; then
@ -185,7 +185,7 @@ AC_ARG_ENABLE(poisoning,
no) USE_POISONING=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-poisoning) ;;
esac
],
],
[USE_POISONING=no]) dnl Default value
if test "x$USE_POISONING" = xyes; then
AC_DEFINE(USE_POISONING, 1,
@ -202,12 +202,13 @@ AC_ARG_ENABLE(binary-registry,
no) USE_BINARY_REGISTRY=no ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-binary-registry) ;;
esac
],
],
[USE_BINARY_REGISTRY=no]) dnl Default value
if test "x$USE_BINARY_REGISTRY" = xyes; then
AC_DEFINE(USE_BINARY_REGISTRY, 1,
[Define if we should use binary registry instead xml registry])
fi
AM_CONDITIONAL(USE_BINARY_REGISTRY, test "x$USE_BINARY_REGISTRY" = "xyes")
dnl *** checks for platform ***
@ -404,7 +405,8 @@ AC_SUBST(GLIB_PREFIX)
dnl libxml 2, which is/should be optional (FIXME)
dnl (FIXME) if we use binary registry, the DISABLE_REGISTRY check need to go
if test "x$GST_DISABLE_LOADSAVE" = "xyes" && \
test "x$GST_DISABLE_REGISTRY" = "xyes"
( test "x$GST_DISABLE_REGISTRY" = "xyes" || \
test "x$USE_BINARY_REGISTRY" = "xyes" )
then
AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2])
else

6
gst/Makefile.am
View file

@ -9,7 +9,11 @@ endif
if GST_DISABLE_REGISTRY
GST_REGISTRY_SRC =
else
GST_REGISTRY_SRC = gstregistryxml.c gstregistrybinary.c
if USE_BINARY_REGISTRY
GST_REGISTRY_SRC = gstregistrybinary.c
else
GST_REGISTRY_SRC = gstregistryxml.c
endif
endif
if GST_DISABLE_PARSE

7
gst/gstconfig.h.in
View file

@ -50,6 +50,8 @@
#ifndef __GST_CONFIG_H__
#define __GST_CONFIG_H__
#include "config.h"
/* trick gtk-doc into believing these symbols are defined (yes, it's ugly) */
#if 0
@ -169,7 +171,10 @@
/***** 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) && defined(GST_DISABLE_REGISTRY)) ) */
/* this works better, but requires the above config.h include, its a bit strange
* that we include stuff here anyway */
#ifdef HAVE_LIBXML2
# include <libxml/parser.h>
#else
# define GST_DISABLE_LOADSAVE_REGISTRY