BGO#641869: Remove --enable-relocate

diff --git a/configure.ac b/configure.ac
index 5a5e516..8f4ccac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -171,17 +171,6 @@ GOBJECT_INTROSPECTION_CHECK([0.9.6])
 
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
-AC_ARG_ENABLE([relocate],
-       [AS_HELP_STRING([--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])
-fi
-AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
-AC_SUBST(enable_relocate)
-
 dnl find sizes & alignments
 orig_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index 720cd52..403f420 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -35,11 +35,7 @@
 #include "registry.h"
 #include "deviceeventcontroller.h"
 
-#ifdef RELOCATE
-#define DBUS_GCONF_KEY  "/desktop/gnome/interface/at-spi-dbus"
-#else
 #define CORBA_GCONF_KEY  "/desktop/gnome/interface/at-spi-corba"
-#endif
 
 static gboolean need_to_quit ();
 
@@ -379,11 +375,7 @@ need_to_quit ()
  * at-spi-dbus gconf key has been set.
    */
   gconf_client = gconf_client_get_default ();
-#ifdef RELOCATE
-  ret = !gconf_client_get_bool (gconf_client, DBUS_GCONF_KEY, NULL);
-#else
   ret = gconf_client_get_bool (gconf_client, CORBA_GCONF_KEY, NULL);
-#endif
   g_object_unref (gconf_client);
 
   return ret;