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

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

diff --git a/ChangeLog b/ChangeLog
index f38a3f2..ff83685 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/configure.ac b/configure.ac
index 6120cbf..44b25d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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)