blob: bdc1f206a2d0bdd4eb1a3eb065c699cafec0cf63 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac
--- ibus-1.4.1.orig/configure.ac 2012-02-05 23:04:15.000000000 +0900
+++ ibus-1.4.1/configure.ac 2012-02-06 01:20:18.303186786 +0900
@@ -259,23 +259,8 @@
)
AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
-if test x"$enable_gconf" = x"yes"; then
- # check gconf
- PKG_CHECK_MODULES(GCONF,
- [gconf-2.0 >= 2.12],
- )
-
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
- if test x"$GCONFTOOL" = xno; then
- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
- fi
-
- AM_GCONF_SOURCE_2
- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
-else
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
- enable_gconf="no (disabled, use --enable-gconf to enable)"
-fi
+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+enable_gconf="no (disabled, use --enable-gconf to enable)"
# --enable-memconf option.
AC_ARG_ENABLE(memconf,
|
GitWeb
