Check for gsettings-schema-convert for dconf support

BUG=http://code.google.com/p/ibus/issues/detail?id=1650

Review URL: https://codereview.appspot.com/13423043
Patch from David King <dking@redhat.com>.

diff --git a/configure.ac b/configure.ac
index 36515e2..c3cf98a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -344,6 +344,9 @@ if test x"$enable_dconf" = x"yes"; then
         [])
     # check glib-compile-schemas
     GLIB_GSETTINGS
+    AC_PATH_PROG([GSETTINGS_SCHEMA_CONVERT], [gsettings-schema-convert])
+    AS_IF([test x"$ac_cv_path_GSETTINGS_SCHEMA_CONVERT" = x""],
+          [AC_MSG_ERROR([gsettings-schema-convert from GConf2 is required for dconf support])])
     enable_dconf="yes (enabled, use --disable-dconf to disable)"
 fi
 

diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
index d27e87c..c841a34 100644 (file)
--- a/data/dconf/Makefile.am
+++ b/data/dconf/Makefile.am
@@ -51,7 +51,7 @@ dconfdbdir = $(sysconfdir)/dconf/db/ibus.d
 dconfdb_DATA = 00-upstream-settings
 
 org.freedesktop.ibus.gschema.xml.in: $(top_srcdir)/data/ibus.schemas.in
-       $(AM_V_GEN) gsettings-schema-convert --force --gconf --xml \
+       $(AM_V_GEN) $(GSETTINGS_SCHEMA_CONVERT) --force --gconf --xml \
                --schema-id "org.freedesktop.ibus" \
                --output $@ $<