build/linux/system.gyp - Issue 6648002: Make DBUS an optional dependency so Chromium can be built without it....

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 6648002: Make DBUS an optional dependency so Chromium can be built without it.... Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: Created 9 years, 9 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

===================================================================

--- build/linux/system.gyp (revision 77292)

+++ build/linux/system.gyp (working copy)

@@ -323,19 +323,26 @@

{

'target_name': 'dbus-glib',

'type': 'settings',

- 'direct_dependent_settings': {

- 'cflags': [

- '<!@(<(pkg-config) --cflags dbus-glib-1)',

- ],

- },

- 'link_settings': {

- 'ldflags': [

- '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',

- ],

- 'libraries': [

- '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',

- ],

- },

+ 'conditions': [

+ ['use_dbus==1 and _toolset=="target"', {

+ 'direct_dependent_settings': {

+ 'cflags': [

+ '<!@(<(pkg-config) --cflags dbus-glib-1)',

+ ],

+ 'defines': [

+ 'USE_DBUS',

+ ],

+ },

+ 'link_settings': {

+ 'ldflags': [

+ '<!@(<(pkg-config) --libs-only-L --libs-only-other dbus-glib-1)',

+ ],

+ 'libraries': [

+ '<!@(<(pkg-config) --libs-only-l dbus-glib-1)',

+ ],

+ },

+ }]

+ ]

{

'target_name': 'libresolv',

« no previous file with comments | « build/common.gypi ('k') | chrome/browser/browser_main.cc » ('j') | content/browser/geolocation/wifi_data_provider_linux.cc » ('J')