[epiphany-extensions] configure.ac: remove gconf dependency

[Diego Escalante Urrelo <diegoe src gnome org>]

commit c627c20e3053fd02a8e28528eaebefbf2a8991a9
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Mon Dec 6 17:42:35 2010 +0100

    configure.ac: remove gconf dependency

 configure.ac     |    9 ++++-----
 data/Makefile.am |   12 ++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bea018b..b4b5650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,8 +62,6 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
-AC_PATH_PROG(GCONFTOOL, [gconftool-2])
-AM_GCONF_SOURCE_2
 
 AC_SUBST([AM_CXXFLAGS])
 
@@ -73,6 +71,8 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_CXX_WARNINGS
 GNOME_MAINTAINER_MODE_DEFINES
 
+GLIB_GSETTINGS
+
 MORE_WARN_FLAGS=
 DEPRECATION_FLAGS=
 MOZILLA_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
@@ -80,7 +80,7 @@ MOZILLA_WARN_CXXFLAGS="-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor"
 if test "x$enable_maintainer_mode" = "xyes"; then
 	AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
 	enable_debug=yes
-        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+        DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 	MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $MOZILLA_WARN_CXXFLAGS"
 fi
 
@@ -107,7 +107,7 @@ GNOME_DOC_INIT
 
 EPIPHANY_REQUIRED=2.27.4
 LIBXML_REQUIRED=2.6.0
-LIBGLIB_REQUIRED=2.15.5
+LIBGLIB_REQUIRED=2.26.0
 LIBGTK_REQUIRED=2.90.4
 
 AC_SUBST([EPIPHANY_REQUIRED])
@@ -124,7 +124,6 @@ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
 		  gio-2.0 >= $LIBGLIB_REQUIRED \
 		  gmodule-2.0 \
 		  gtk+-3.0 >= $LIBGTK_REQUIRED \
-		  gconf-2.0 \
 		  epiphany-$EPIPHANY_API_VERSION >= $EPIPHANY_REQUIRED])
 AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
 AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
diff --git a/data/Makefile.am b/data/Makefile.am
index 61a1a63..1f961f3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1,13 @@
 SUBDIRS = icons
+
+gsettings_files = org.gnome.epiphanyextensions.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
+
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+EXTRA_DIST = \
+	     $(gsettings_files)
+
+DISTCLEANFILES = \
+		 $(gsettings_SCHEMAS)