summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-06-06 10:36:13 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-06-06 10:36:13 +0000
commit8097e8bda831cdfac618be74997a75ffa5477337 (patch)
tree46b6195870051ab3aad2d6aa2f62ff906cdeffb7
parent2ed5895fb01f3724424be51bd90a1c866c8630e2 (diff)
downloadgstreamer-plugins-bad-8097e8bda831cdfac618be74997a75ffa5477337.tar.gz
GConf fix
Original commit message from CVS: GConf fix
-rw-r--r--configure.ac22
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index 9f999ac5b..09cd666cc 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,