mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 22:21:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Fix AM_CONDITIONAL(GST_DISABLE_GST_DEBUG,...) and update comment.

Browse source 
Original commit message from CVS:
Patch by: Peter Kjellerstedt <Peter.Kjellerstedt@axis.com>
* configure.ac:
Fix AM_CONDITIONAL(GST_DISABLE_GST_DEBUG,...) and update comment.
This commit is contained in:
Peter Kjellerstedt 2007-04-24 06:14:35 +00:00 committed by Stefan Kost
parent 05287354e3
commit ce9abb4d52
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-04-24 Stefan Kost <ensonic@users.sf.net>
Patch by: Peter Kjellerstedt <Peter.Kjellerstedt@axis.com>
* configure.ac:
Fix AM_CONDITIONAL(GST_DISABLE_GST_DEBUG,...) and update comment.
2007-04-23 Stefan Kost <ensonic@users.sf.net> 2007-04-23 Stefan Kost <ensonic@users.sf.net>
* gst/gstbin.c: (gst_bin_element_set_state), * gst/gstbin.c: (gst_bin_element_set_state),

2
common

@ -1 +1 @@
Subproject commit 765d03a88492fb4ac81d70457f671f3a109e93de Subproject commit a19d235c89d99ca7849078d501129f521e30d98d

5
configure.ac
View file

@ -71,7 +71,7 @@ dnl *** check for arguments to configure ***
dnl subsystems - can influence other decisions so needs to be high up 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 dnl we need to AM_CONDITIONAL them here for automake 1.6.x compatibility
AG_GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem]) 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]) AG_GST_CHECK_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
AM_CONDITIONAL(GST_DISABLE_LOADSAVE, test "x$GST_DISABLE_LOADSAVE" = "xyes") AM_CONDITIONAL(GST_DISABLE_LOADSAVE, test "x$GST_DISABLE_LOADSAVE" = "xyes")
dnl define a substitution to use in docs/gst/gstreamer.types 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`" GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
AC_SUBST(GLIB_PREFIX) AC_SUBST(GLIB_PREFIX)
dnl libxml 2, which is/should be optional (FIXME) dnl libxml 2 is optional in some cases
dnl (FIXME) if we use binary registry, the DISABLE_REGISTRY check need to go
if test "x$GST_DISABLE_LOADSAVE" = "xyes" && \ 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" ) test "x$USE_BINARY_REGISTRY" = "xyes" )