Permalink
Browse files

Change the default config to ibus-dconf.

  • Loading branch information...
fujiwarat committed Dec 5, 2012
1 parent 485e145 commit ac7d763d99e1b88f106473755b66267c2e5cde02
Showing with 52 additions and 11 deletions.
  1. +11 −11 configure.ac
  2. +41 −0 m4/gconf-2.m4
View
@@ -180,31 +180,31 @@ AC_DEFINE(HAVE_XKB, 1, [define to 1 if you have xkbfile])
HAVE_IBUS_XKB=true
AC_SUBST(HAVE_IBUS_XKB)
-# --enable-dconf option.
+# --disable-dconf option.
AC_ARG_ENABLE(dconf,
- AS_HELP_STRING([--enable-dconf],
- [Enable configure base on dconf]),
+ AS_HELP_STRING([--disable-dconf],
+ [Disable configure base on dconf]),
[enable_dconf=$enableval],
- [enable_dconf=no]
+ [enable_dconf=yes]
)
+AM_CONDITIONAL([ENABLE_DCONF], [test x"$enable_dconf" = x"yes"])
if test x"$enable_dconf" = x"yes"; then
# check dconf
PKG_CHECK_MODULES(DCONF,
- [dconf >= 0.7.5], ,
- enable_dconf=no
+ [dconf >= 0.7.5],
)
# check glib-compile-schemas
GLIB_GSETTINGS
+ enable_dconf="yes (enabled, use --disable-dconf to disable)"
fi
-AM_CONDITIONAL([ENABLE_DCONF], [test x"$enable_dconf" = x"yes"])
-# --disable-gconf option.
+# --enable-gconf option.
AC_ARG_ENABLE(gconf,
- AS_HELP_STRING([--disable-gconf],
- [Do not use GConf code]),
+ AS_HELP_STRING([--enable-gconf],
+ [Use GConf code]),
[enable_gconf=$enableval],
- [enable_gconf=yes]
+ [enable_gconf=no]
)
AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
View
@@ -0,0 +1,41 @@
+dnl AM_GCONF_SOURCE_2
+dnl Copied from /usr/share/aclocal/gconf-2.m4 so that ibus build does not
+dnl need GConf2-devel
+
+AC_DEFUN([AM_GCONF_SOURCE_2],
+[
+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ else
+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+ fi
+
+ AC_ARG_WITH([gconf-source],
+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
+ [Config database for installing schema files.]),
+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ fi
+
+ AC_ARG_WITH([gconf-schema-file-dir],
+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+ [Directory for installing schema files.]),
+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+ AC_ARG_ENABLE(schemas-install,
+ AC_HELP_STRING([--disable-schemas-install],
+ [Disable the schemas installation]),
+ [case ${enableval} in
+ yes|no) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+ esac])
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])

0 comments on commit ac7d763

Please sign in to comment.