[gnome-control-center] configure: fix build with --disable-ibus
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] configure: fix build with --disable-ibus
- Date: Fri, 27 Jul 2012 07:07:38 +0000 (UTC)
commit fbe6756c6f2104d78854da927b96c3d88cd31a2e
Author: Rico Tzschichholz <ricotz t-online de>
Date: Fri Jul 27 09:06:47 2012 +0200
configure: fix build with --disable-ibus
https://bugzilla.gnome.org/show_bug.cgi?id=680133
configure.ac | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 52d3cec..2868284 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,8 @@ else
fi
# IBus support
+IBUS_REQUIRED_VERSION=1.4.99
+
AC_ARG_ENABLE(ibus,
AS_HELP_STRING([--disable-ibus],
[Disable IBus support]),
@@ -70,7 +72,7 @@ AC_ARG_ENABLE(ibus,
enable_ibus=yes)
if test "x$enable_ibus" = "xyes" ; then
- IBUS_MODULE=ibus-1.0
+ IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
else
IBUS_MODULE=
@@ -94,7 +96,6 @@ SCHEMAS_REQUIRED_VERSION=3.5.3
LIBWACOM_REQUIRED_VERSION=0.5
CLUTTER_REQUIRED_VERSION=1.11.3
GOA_REQUIRED_VERSION=3.5.1
-IBUS_REQUIRED_VERSION=1.4.99
COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION
glib-2.0 >= $GLIB_REQUIRED_VERSION
@@ -132,7 +133,7 @@ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- $IBUS_MODULE >= $IBUS_REQUIRED_VERSION)
+ $IBUS_MODULE)
PKG_CHECK_MODULES(SCREEN_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(SOUND_PANEL, $COMMON_MODULES libxml-2.0
libcanberra-gtk3 >= $CANBERRA_REQUIRED_VERSION
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]