From 8097e8bda831cdfac618be74997a75ffa5477337 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Thu, 6 Jun 2002 10:36:13 +0000
Subject: GConf fix

Original commit message from CVS:
GConf fix
---
 configure.ac | 22 ++++++++++++----------
 1 file 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,
-- 
cgit v1.2.1