← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-settings-daemon/saucy

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, William Hua, Jeremy Bicha
  • Date: 2013-08-21 11:22:42 UTC
  • Revision ID: package-import@ubuntu.com-20130821112242-v7o0n638ranf2mrv
Tags: 3.6.4-0ubuntu16
[ William Hua ]
* debian/control.in:
  - Depend on IBus 1.5.0.
* debian/patches/revert_new_ibus_use.patch:
  - Drop upstream revert.
* debian/patches/ibus-ubuntu-session.patch:
  - Check for Ubuntu session too
* debian/patches/git_keyboard_Adapt_to_gnome_xkb_info_API_change.patch:
* debian/patches/git_keyboard_Adapt_to_gnome_xkb_info_API_change_2.patch:
  - Take upstream's 8174dcd701de399ff28a19efbe9744744b802ce8 and
    55fee0c57563b95deddc4396eec87ab6bee35d34 and so we can work with
    gnome-desktop 3.8.

[ Jeremy Bicha ]
* debian/gnome-settings-daemon.gsettings-override:
  - Set switch-input-source keyboard shortcut to Super+Space to match ibus,
    GNOME 3.8 and Windows 8 default

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
47
47
GTK_REQUIRED_VERSION=3.3.18
48
48
GCONF_REQUIRED_VERSION=2.6.1
49
49
GIO_REQUIRED_VERSION=2.26.0
50
 
GNOME_DESKTOP_REQUIRED_VERSION=3.5.3
 
50
GNOME_DESKTOP_REQUIRED_VERSION=3.7.90
51
51
LIBNOTIFY_REQUIRED_VERSION=0.7.3
52
52
UPOWER_GLIB_REQUIRED_VERSION=0.9.1
53
53
PA_REQUIRED_VERSION=0.9.16
54
54
LIBWACOM_REQUIRED_VERSION=0.6
55
55
UPOWER_REQUIRED_VERSION=0.9.11
56
56
APPINDICATOR_REQUIRED_VERSION=0.3.0
 
57
IBUS_REQUIRED_VERSION=1.4.99
57
58
 
58
59
EXTRA_COMPILE_WARNINGS(yes)
59
60
 
203
204
dnl - Keyboard plugin stuff
204
205
dnl ---------------------------------------------------------------------------
205
206
 
206
 
LIBGNOMEKBD_REQUIRED=2.91.1
207
 
PKG_CHECK_MODULES(KEYBOARD, [libgnomekbdui >= $LIBGNOMEKBD_REQUIRED libgnomekbd >= $LIBGNOMEKBD_REQUIRED libxklavier >= 5.0 kbproto])
 
207
AC_ARG_ENABLE(ibus,
 
208
        AS_HELP_STRING([--disable-ibus],
 
209
                       [Disable IBus support]),
 
210
        enable_ibus=$enableval,
 
211
        enable_ibus=yes)
 
212
 
 
213
if test "x$enable_ibus" = "xyes" ; then
 
214
        IBUS_MODULE="ibus-1.0 >= $IBUS_REQUIRED_VERSION"
 
215
        AC_DEFINE(HAVE_IBUS, 1, [Defined if IBus support is enabled])
 
216
else
 
217
        IBUS_MODULE=
 
218
fi
 
219
AM_CONDITIONAL(HAVE_IBUS, test "x$enable_ibus" == "xyes")
 
220
 
 
221
PKG_CHECK_MODULES(KEYBOARD, xkbfile $IBUS_MODULE gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
208
222
 
209
223
dnl ---------------------------------------------------------------------------
210
224
dnl - Housekeeping plugin stuff
581
595
 
582
596
        Session tracking:         ${SESSION_TRACKING}
583
597
        LCMS DICT support:        ${have_new_lcms}
 
598
        IBus support:             ${enable_ibus}
584
599
        Libnotify support:        ${have_libnotify}
585
600
        App indicator support:    ${enable_appindicator}
586
601
        PackageKit support:       ${have_packagekit}