diff options
| author | fujiwarat <takao.fujiwara1@gmail.com> | 2014-02-03 11:18:24 +0900 |
|---|---|---|
| committer | fujiwarat <takao.fujiwara1@gmail.com> | 2014-02-03 11:18:24 +0900 |
| commit | a6f886a7279dd85b5b0d4caa709a222e34eaa3f7 (patch) | |
| tree | 21590e617e167f5b9543f94bfca19156376fefb7 | |
| parent | e2cd8f0870d8b15af71e839f9035dce333af3c4e (diff) | |
Disable AC_MSG_ERROR if gsettings-schema-convert is not found.
Reverted 729b0aa1febccbba97286f2aceb9044d907f9ffe
data/dconf/org.freedesktop.ibus.gschema.xml.in is included in tarball
so gsettings-schema-convert is not required.
BUG=http://code.google.com/p/ibus/issues/detail?id=1650
Review URL: https://codereview.appspot.com/58870044
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | data/dconf/Makefile.am | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 43071bc4..77396ce3 100644 --- a/configure.ac +++ b/configure.ac @@ -344,9 +344,6 @@ 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 62c20a35..7f0d0fd8 100644 --- 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 $@ $< |