build/linux/system.gyp - Issue 6904053: Remove ibus checking script from views.gyp and add use_ibus=1 option

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/linux/system.gyp

Issue 6904053: Remove ibus checking script from views.gyp and add use_ibus=1 option (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Update Created 9 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/linux/system.gyp

diff --git a/build/linux/system.gyp b/build/linux/system.gyp

index a52083b9ad6eef43a1aad7bf1ca9a620f592a219..9dace747f7f2f3acd9078d41f4db68721541bf41 100644

--- a/build/linux/system.gyp

+++ b/build/linux/system.gyp

@@ -350,11 +350,9 @@

'target_name': 'ibus',

'type': 'settings',

'conditions': [

- ['"<!@(<(pkg-config) --atleast-version=1.3.99 ibus-1.0 || echo $?)"==""', {

- 'variables': {

- 'ibus': 1

- },

+ ['use_ibus==1', {

'direct_dependent_settings': {

+ 'defines' : ['HAVE_IBUS=1'],

Paweł Hajdan Jr. 2011/04/27 19:53:37 nit: It seems there should be no space after 'defi

Peng 2011/04/27 20:55:59 Done.

'cflags': [

'<!@(<(pkg-config) --cflags ibus-1.0)',

« no previous file with comments | « build/common.gypi ('k') | views/views.gyp » ('j') | no next file with comments »