Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1670)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/linux/system.gyp

Issue 4691001: Make GConf dependency optional. (Closed)
Patch Set: Created 10 years, 1 month 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
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/gtk/browser_titlebar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index ed88a0a7792e344670baec8b5514e9cc3b052cec..271feef900a3bb21612839a96e2d607bf3f0ac62 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -188,11 +188,14 @@
'target_name': 'gconf',
'type': 'settings',
'conditions': [
- ['_toolset=="target"', {
+ ['use_gconf==1 and _toolset=="target"', {
'direct_dependent_settings': {
'cflags': [
'<!@(<(pkg-config) --cflags gconf-2.0)',
],
+ 'defines': [
+ 'USE_GCONF',
+ ],
},
'link_settings': {
'ldflags': [
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/gtk/browser_titlebar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698