[at-spi2-atk] BGO#641869: Remove --enable-relocate and associated autostart file and schema

[Mike Gorse <mgorse src gnome org>]

commit f6a0fdcf50c5bcbab547996313161ee4200266e4
Author: Mike Gorse <mgorse novell com>
Date:   Thu Feb 10 11:40:35 2011 -0600

    BGO#641869: Remove --enable-relocate and associated autostart file and schema

 Makefile.am                       |   22 ----------------------
 at-spi2.schemas.in                |   28 ----------------------------
 atk-adaptor/Makefile.am           |   15 +--------------
 atk-adaptor/atk-bridge.desktop.in |    8 --------
 atk-adaptor/gtk-2.0/Makefile.am   |    4 ----
 atk-adaptor/gtk-3.0/Makefile.am   |    4 ----
 configure.ac                      |   11 +----------
 7 files changed, 2 insertions(+), 90 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index da05db4..8142b2d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,30 +1,8 @@
 SUBDIRS=dbind droute common atk-adaptor po schemas
 
-schemas_in_files = at-spi2.schemas.in
-if RELOCATE
-schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
-endif
-
 gtk_modulesdir = $(libdir)/gnome-settings-daemon-3.0/gtk-modules/
 gtk_modules_DATA = at-spi2-atk.desktop
 
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-		if test -z "$(DESTDIR)" ; then \
-			for p in $(schemas_DATA) ; do \
-				GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \
-			done \
-		fi
-else
-install-data-local:
-endif
-
 EXTRA_DIST = \
-	$(schemas_in_files) \
 	$(gtk_modules_DATA)
 
-
-CLEANFILES = \
-	$(schemas_DATA)
diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 490461d..1e16a40 100644
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,16 +1,3 @@
 SUBDIRS=adaptors gtk-2.0 gtk-3.0
 
-if RELOCATE
-    gtkpathdir = $(libdir)/gtk-2.0/modules/at-spi-dbus
-gnomeautostartdir = $(datadir)/gnome/autostart
-gnomeautostart_DATA = atk-bridge.desktop
-endif
-
-EXTRA_DIST = atk-bridge.desktop.in \
-	Makefile.include
-
-CLEANFILES = atk-bridge.desktop
-
-%.desktop: %.desktop.in Makefile.am
-	sed -e "s,\ gtkpathdir\@,$(gtkpathdir)," \
-	< $< > $@
+EXTRA_DIST = Makefile.include
diff --git a/atk-adaptor/gtk-2.0/Makefile.am b/atk-adaptor/gtk-2.0/Makefile.am
index 16f9f0f..7903fc6 100644
--- a/atk-adaptor/gtk-2.0/Makefile.am
+++ b/atk-adaptor/gtk-2.0/Makefile.am
@@ -1,7 +1,3 @@
-if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
-else
     gtkmoduledir = $(libdir)/gtk-2.0/modules
-endif
 
 include $(top_srcdir)/atk-adaptor/Makefile.include
diff --git a/atk-adaptor/gtk-3.0/Makefile.am b/atk-adaptor/gtk-3.0/Makefile.am
index cd3c5c9..a1a8480 100644
--- a/atk-adaptor/gtk-3.0/Makefile.am
+++ b/atk-adaptor/gtk-3.0/Makefile.am
@@ -1,7 +1,3 @@
-if RELOCATE
-    gtkmoduledir = $(libdir)/gtk-3.0/modules/at-spi-dbus/modules
-else
     gtkmoduledir = $(libdir)/gtk-3.0/modules
-endif
 
 include $(top_srcdir)/atk-adaptor/Makefile.include
diff --git a/configure.ac b/configure.ac
index e46ebd7..6561dec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,16 +71,7 @@ else
 fi
 AC_SUBST(X_LIBS)
 
-AM_GCONF_SOURCE_2
-AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
-if test x$enable_relocate = xyes ; then
-	AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
-	dnl GConf checks
-	AC_PATH_PROG(GCONFTOOL, gconftool-2)
-else
-	GLIB_GSETTINGS
-fi
-AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+GLIB_GSETTINGS
 
 AC_ARG_ENABLE(p2p, [  --enable-p2p  Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes)