From a16f5306aab7f9d5a8e0fe32fb75deddba175341 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@novell.com>
Date: Fri, 17 Dec 2010 11:44:58 -0500
Subject: [PATCH] Add a gsettings key to specify the location of
 libatk-bridge.so

---
 Makefile.am                           |  8 ++++++--
 configure.ac                          | 11 +++++++----
 schemas/Makefile.am                   |  7 +++++++
 schemas/org.a11y.atspi.gschema.xml.in | 10 ++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 schemas/Makefile.am
 create mode 100644 schemas/org.a11y.atspi.gschema.xml.in

diff --git a/Makefile.am b/Makefile.am
index 12ab97b..7c1dd6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,11 @@
-SUBDIRS=dbind droute common atk-adaptor po
+SUBDIRS=dbind droute common atk-adaptor po schemas
 
+if RELOCATE
 schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_files = at-spi2.schemas.in
 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
@@ -20,7 +22,9 @@ install-data-local:
 endif
 
 EXTRA_DIST = \
-	$(schemas_in_files)
+	$(schemas_in_files) \
+	$(gtk_modules_DATA)
+
 
 CLEANFILES = \
 	$(schemas_DATA)
diff --git a/configure.ac b/configure.ac
index a13f776..7e821ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,6 @@ PKG_CHECK_MODULES(ATK, [atk >= 1.29.3])
 AC_SUBST(ATK_LIBS)
 AC_SUBST(ATK_CFLAGS)
 
-dnl GConf checks
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
-
 AC_PATH_XTRA
 
 if test x$no_x = xyes ; then
@@ -75,9 +71,14 @@ 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)
 
@@ -130,6 +131,8 @@ AC_CONFIG_FILES([Makefile
 		 atk-adaptor/gtk-2.0/Makefile
 		 atk-adaptor/gtk-3.0/Makefile
 		 po/Makefile.in
+                 schemas/Makefile
+schemas/org.a11y.atspi.gschema.xml
 		])
 
 AC_OUTPUT
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
new file mode 100644
index 0000000..17a46d1
--- /dev/null
+++ b/schemas/Makefile.am
@@ -0,0 +1,7 @@
+gsettings_SCHEMAS = org.a11y.atspi.gschema.xml
+
+@GSETTINGS_RULES@
+
+EXTRA_DIST = \
+	$(gsettings_SCHEMAS) \
+	$(patsubst %,%.in,$(GSETTINGS_SCHEMAS))
diff --git a/schemas/org.a11y.atspi.gschema.xml.in b/schemas/org.a11y.atspi.gschema.xml.in
new file mode 100644
index 0000000..3e86f30
--- /dev/null
+++ b/schemas/org.a11y.atspi.gschema.xml.in
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.a11y.atspi" path="/a11y/atspi/">
+    <key name="atk-bridge-location" type="s">
+      <default>'@prefix@/lib/gtk-3.0/modules/libatk-bridge.so'</default>
+      <summary>Atk-bridge location</summary>
+      <description>The path to the atk-bridge module; useful for non-GTK applications/toolkits that want to load it.</description>
+    </key>
+  </schema>
+</schemalist>
-- 
2.7.4