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 | cc1acabb937d0711b27b118b9bd9784b368784ed (patch) | |
tree | f1021c637b20e435d6efab740b236afd74f76128 /configure.ac | |
parent | 10cdb486f152c8f3e9c54a4b80fe51576cd0369a (diff) |
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
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
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) |