diff options
| author | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 22:30:23 +0000 |
|---|---|---|
| committer | penghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-27 22:30:23 +0000 |
| commit | cfa2e11076daae5c5f955c67620164b400c77801 (patch) | |
| tree | fc2bf480c9a941217b3a4a532ebadb8a0c445303 /views/views.gyp | |
| parent | 16864221105a01dde61848870965a139609da7ae (diff) | |
| download | chromium_src-cfa2e11076daae5c5f955c67620164b400c77801.zip chromium_src-cfa2e11076daae5c5f955c67620164b400c77801.tar.gz chromium_src-cfa2e11076daae5c5f955c67620164b400c77801.tar.bz2 | |
Remove ibus checking script from views.gyp and add use_ibus=1 option
BUG=chromium:80700
TEST=Test it on Linux desktop
Review URL: http://codereview.chromium.org/6904053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/views.gyp')
| -rw-r--r-- | views/views.gyp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/views/views.gyp b/views/views.gyp index 939ab40..0eb07f1 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -422,9 +422,6 @@ ], }], ['touchui==1', { - 'dependencies': [ - '../build/linux/system.gyp:ibus', - ], 'defines': ['TOUCH_UI=1'], 'sources/': [ ['exclude', 'focus/accelerator_handler_gtk.cc'], @@ -438,15 +435,15 @@ ['exclude', 'touchui/touch_factory.h'], ], }], - # TODO(suzhe): We should not check ibus version here. Instead, we - # should use a variable to control whether or not to use ibus. - ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', { - 'defines': ['HAVE_IBUS=1'], + ['use_ibus==1', { + 'dependencies': [ + '../build/linux/system.gyp:ibus', + ], 'sources/': [ ['exclude', 'ime/input_method_gtk.cc'], ['exclude', 'ime/input_method_gtk.h'], ], - }, { # else: no ibus + }, { # else: use_ibus != 1 'sources/': [ ['exclude', 'ime/input_method_ibus.cc'], ['exclude', 'ime/input_method_ibus.h'], |