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

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

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>
* tools/gst-visualise-m.m: Switch to elements that currently

View file

@ -157,6 +157,10 @@ dnl check architecture
GST_ARCH()
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)
GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
@ -164,7 +168,6 @@ GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
AC_MSG_WARN(Not installing GConf schemas)
HAVE_GCONFTOOL="no"
else
AM_GCONF_SOURCE_2
HAVE_GCONFTOOL="yes"
fi
AC_SUBST(HAVE_GCONFTOOL)