mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: move GCONF macro outside conditional for the am conditional. Fixes #160439

Browse source 
Original commit message from CVS:
2004-12-09  Thomas Vander Stichele  <thomas at apestaart dot org>

* configure.ac: move GCONF macro outside conditional for the am
conditional. Fixes #160439
This commit is contained in:
Thomas Vander Stichele 2004-12-09 11:54:10 +00:00
parent ac3ccaae5a
commit 3643eca12a
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-12-09 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: move GCONF macro outside conditional for the am
conditional. Fixes #160439
2004-12-08 David Schleef <ds@schleef.org> 2004-12-08 David Schleef <ds@schleef.org>
* tools/gst-visualise-m.m: Switch to elements that currently * tools/gst-visualise-m.m: Switch to elements that currently

5
configure.ac
View file

@ -157,6 +157,10 @@ dnl check architecture
GST_ARCH() GST_ARCH()
dnl check for gconftool-2 dnl check for gconftool-2
dnl this macro defines an am conditional, so it needs to be run always
AM_GCONF_SOURCE_2
translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true) translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true)
GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [ GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
AC_PATH_PROG(GCONFTOOL, gconftool-2, no) AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
@ -164,7 +168,6 @@ GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
AC_MSG_WARN(Not installing GConf schemas) AC_MSG_WARN(Not installing GConf schemas)
HAVE_GCONFTOOL="no" HAVE_GCONFTOOL="no"
else else
AM_GCONF_SOURCE_2
HAVE_GCONFTOOL="yes" HAVE_GCONFTOOL="yes"
fi fi
AC_SUBST(HAVE_GCONFTOOL) AC_SUBST(HAVE_GCONFTOOL)