[gnumeric] Conf: drop gconf entirely.

[Morten Welinder <mortenw src gnome org>]

commit 5a1bfb891ebf969b25c40953b75af4b5ffbaaeff
Author: Morten Welinder <terra gnome org>
Date:   Fri Oct 28 11:21:05 2011 -0400

    Conf: drop gconf entirely.

 configure.in                        |   25 --
 schemas/Makefile.am                 |   23 +-
 schemas/gnumeric-dialogs.schemas.in |  746 -----------------------------------
 schemas/gnumeric-general.schemas.in |  496 -----------------------
 schemas/gnumeric-plugins.schemas.in |   37 --
 5 files changed, 2 insertions(+), 1325 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7393853..ea86014 100644
--- a/configure.in
+++ b/configure.in
@@ -241,31 +241,6 @@ if test $gnumeric_devel = yes; then
     fi
 fi
 
-dnl The following conditional is set in AM_GCONF_SOURCE_2.
-dnl Because we may skip its execution, we have to set a default here.
-m4_pattern_allow([^AM_GCONF_SOURCE_2$])
-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-
-dnl *******************
-dnl Do we need gconf ?
-dnl *******************
-gnumeric_with_gconf=false
-if test ! -z "`echo $GNUMERIC_CFLAGS|grep gconf`"; then
-	dnl ==============================================
-	dnl Special GConf section  (stolen from libgnome)
-	dnl ==============================================
-
-	dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired.
-	GCONFTOOL=""
-	AC_CHECK_PROG(GCONFTOOL, gconftool-2, gconftool-2)
-	if test x"$GCONFTOOL" = x; then
-		AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-	fi
-	AM_GCONF_SOURCE_2
-	gnumeric_with_gconf=true
-fi
-AM_CONDITIONAL(WITH_GCONF, $gnumeric_with_gconf)
-
 with_corba=false
 AM_CONDITIONAL(WITH_CORBA, $with_corba)
 
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 3db8db7..50f9870 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -6,15 +6,8 @@ gschema_inin_files = \
 	org.gnome.gnumeric.plugin.gschema.xml.in.in
 gschema_in_files = $(gschema_inin_files:.xml.in.in=.xml.in)
 
-schema_in_files = gnumeric-dialogs.schemas.in gnumeric-general.schemas.in gnumeric-plugins.schemas.in
-
-if WITH_GCONF
-schemadir   	= @GCONF_SCHEMA_FILE_DIR@
-schema_DATA 	= $(schema_in_files:.schemas.in=.schemas)
-endif
-
 EXTRA_DIST =
-CLEANFILES = $(schema_DATA)
+CLEANFILES =
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -28,19 +21,7 @@ CLEANFILES += $(gsettings_SCHEMAS)
 
 endif
 
-EXTRA_DIST += $(schema_in_files) $(gschema_inin_files)
-
-if GCONF_SCHEMAS_INSTALL
-# don't do this if we are building in eg. rpm
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
-		done \
-	fi
-else
-install-data-local:
-endif
+EXTRA_DIST += $(gschema_inin_files)
 
 if WITH_NATIVE_WIN32
 regdir = $(prefix)/etc/win32/reg