diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-12-09 11:54:10 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-12-09 11:54:10 +0000 |
| commit | 3643eca12ad563c47e855503f4cbd564e6950373 (patch) | |
| tree | 1f1848f9d082031656cafd6c4f67efbadc299a37 | |
| parent | ac3ccaae5a7ba7736e2117a14f9ee536edde2ba8 (diff) | |
| download | gst-plugins-bad-3643eca12ad563c47e855503f4cbd564e6950373.tar.gz gst-plugins-bad-3643eca12ad563c47e855503f4cbd564e6950373.tar.bz2 gst-plugins-bad-3643eca12ad563c47e855503f4cbd564e6950373.zip | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -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 6120cbf6..44b25d8d 100644 --- 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) |