From ce9abb4d5288fc0d3f68c49aa3dade38a170919b Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 24 Apr 2007 06:14:35 +0000 Subject: [PATCH] configure.ac: Fix AM_CONDITIONAL(GST_DISABLE_GST_DEBUG,...) and update comment. Original commit message from CVS: Patch by: Peter Kjellerstedt * configure.ac: Fix AM_CONDITIONAL(GST_DISABLE_GST_DEBUG,...) and update comment. --- ChangeLog | 7 +++++++ common | 2 +- configure.ac | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9360cdd079..65844c1103 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-04-24 Stefan Kost + + Patch by: Peter Kjellerstedt + + * configure.ac: + Fix AM_CONDITIONAL(GST_DISABLE_GST_DEBUG,...) and update comment. + 2007-04-23 Stefan Kost * gst/gstbin.c: (gst_bin_element_set_state), diff --git a/common b/common index 765d03a884..a19d235c89 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 765d03a88492fb4ac81d70457f671f3a109e93de +Subproject commit a19d235c89d99ca7849078d501129f521e30d98d diff --git a/configure.ac b/configure.ac index e45e3d872b..b85df6f44a 100644 --- a/configure.ac +++ b/configure.ac @@ -71,7 +71,7 @@ dnl *** check for arguments to configure *** dnl subsystems - can influence other decisions so needs to be high up dnl we need to AM_CONDITIONAL them here for automake 1.6.x compatibility AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem]) -AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_GST_DISABLE_DEBUG" = "xyes") +AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_DISABLE_GST_DEBUG" = "xyes") AG_GST_CHECK_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save]) AM_CONDITIONAL(GST_DISABLE_LOADSAVE, test "x$GST_DISABLE_LOADSAVE" = "xyes") dnl define a substitution to use in docs/gst/gstreamer.types @@ -402,8 +402,7 @@ dnl Checks for documentation xrefs GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" 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 +dnl libxml 2 is optional in some cases if test "x$GST_DISABLE_LOADSAVE" = "xyes" && \ ( test "x$GST_DISABLE_REGISTRY" = "xyes" || \ test "x$USE_BINARY_REGISTRY" = "xyes" )