diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2002-06-06 10:36:13 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2002-06-06 10:36:13 +0000 |
| commit | 50d9577c44417ee70f1e1d5739f61e831bedf634 (patch) | |
| tree | 6d44546545d8a7ca1450c946e01d08c76df8942f /configure.ac | |
| parent | a63a70f9c56e37d5c9fcbc69e7b6dfe06f738a07 (diff) | |
GConf fix
Original commit message from CVS:
GConf fix
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 9f999ac5..09cd666c 100644 --- a/configure.ac +++ b/configure.ac @@ -100,16 +100,18 @@ else fi dnl check for gconf -translit(dnm, m, l) AM_CONDITIONAL(HAVE_GCONF, true) -AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -if test x$GCONFTOOL = xno; then - AC_MSG_WARN(Not installing GConf schemas) - HAVE_GCONF="no" -else - AM_GCONF_SOURCE_2 - HAVE_GCONF="yes" -fi -AC_SUBST(HAVE_GCONF) +translit(dnm, m, l) AM_CONDITIONAL(USE_GCONF, true) +GST_CHECK_FEATURE(GCONF, [GConf stuff], , [ + AC_PATH_PROG(GCONFTOOL, gconftool-2, no) + if test x$GCONFTOOL = xno; then + AC_MSG_WARN(Not installing GConf schemas) + HAVE_GCONF="no" + else + AM_GCONF_SOURCE_2 + HAVE_GCONF="yes" + fi + AC_SUBST(HAVE_GCONF) +]) dnl check for gstreamer; uninstalled is selected preferentially -- see pkg-config(1) PKG_CHECK_MODULES(GST, gstreamer >= $GST_PLUGINS_MAJOR.$GST_PLUGINS_MINOR.$GST_PLUGINS_MICRO, |