Chromium Code Reviews| Index: views/views.gyp |
| diff --git a/views/views.gyp b/views/views.gyp |
| index 939ab40d1e74af40bd4d5a7eb844fa6cca9dbe77..8b27181a5a56def776ed94435d64ef6d585055be 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,16 @@ |
| ['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', { |
| + 'defines' : ['HAVE_IBUS=1'], |
|
Paweł Hajdan Jr.
2011/04/27 19:06:05
I think it's generally more maintainable to have '
Peng
2011/04/27 19:41:16
Done.
|
| + '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'], |