fixaroos for gconf

Original commit message from CVS:
fixaroos for gconf

diff --git a/Makefile.am b/Makefile.am
index 2c87df6b0f0434355c211b583c260dd04a4ee7cd..7e63c1bbf3cfc43c78701cbe01fec26106f03401 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-if USE_GCONF
+if USE_GCONFTOOL
 GCONF_DIR=gconf
 else
 GCONF_DIR=

diff --git a/configure.ac b/configure.ac
index 91d52b7d2356c0d6ab6c48a4f785a941a26981c3..0cd8e11b23eb2ad575f80bf41fa07183672aa87d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,19 +110,28 @@ else
   HAVE_NASM="yes"
 fi
 
-dnl check for gconf
-translit(dnm, m, l) AM_CONDITIONAL(USE_GCONF, true)
-GST_CHECK_FEATURE(GCONF, [GConf stuff], , [
+dnl check for gconftool-2
+translit(dnm, m, l) AM_CONDITIONAL(USE_GCONFTOOL, true)
+GST_CHECK_FEATURE(GCONFTOOL, [GConf schemas], , [
   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
   if test x$GCONFTOOL = xno; then
     AC_MSG_WARN(Not installing GConf schemas)
-    HAVE_GCONF="no"
+    HAVE_GCONFTOOL="no"
   else
     AM_GCONF_SOURCE_2
-    HAVE_GCONF="yes"
+    HAVE_GCONFTOOL="yes"
   fi
-  AC_SUBST(HAVE_GCONF)
+  AC_SUBST(HAVE_GCONFTOOL)
+])
+
+dnl check for GConf libraries
+translit(dnm, m, l) AM_CONDITIONAL(USE_GCONF, true)
+GST_CHECK_FEATURE(GCONF, [GConf libraries], , [
+  PKG_CHECK_MODULES(GCONF, gconf-2.0, HAVE_GCONF="yes", HAVE_GCONF="no")
+  AC_SUBST(GCONF_CFLAGS)
+  AC_SUBST(GCONF_LIBS)
 ])
+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,
@@ -916,10 +925,11 @@ ext/xmms/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/audio/Makefile
+gst-libs/gst/floatcast/Makefile
+gst-libs/gst/gconf/Makefile
 gst-libs/gst/idct/Makefile
 gst-libs/gst/resample/Makefile
 gst-libs/gst/riff/Makefile
-gst-libs/gst/floatcast/Makefile
 examples/dynparams/Makefile
 examples/capsfilter/Makefile
 examples/seeking/Makefile