diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 07:33:19 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 07:33:19 +0000 |
| commit | 6de53d401aa8dc6c7e0a9874c71a95ce88ade50d (patch) | |
| tree | dd3143fedf4a8affa5988fe71a11379b2b10af9d /build | |
| parent | 6c20697e6da610f40947526bbd65dbda0579445c (diff) | |
| download | chromium_src-6de53d401aa8dc6c7e0a9874c71a95ce88ade50d.zip chromium_src-6de53d401aa8dc6c7e0a9874c71a95ce88ade50d.tar.gz chromium_src-6de53d401aa8dc6c7e0a9874c71a95ce88ade50d.tar.bz2 | |
Make GConf dependency optional.
This is upstreaming a Gentoo Linux patch.
BUG=13322
TEST=none
Review URL: http://codereview.chromium.org/4691001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/linux/system.gyp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 97863a9..c9f219e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -314,6 +314,9 @@ # whether to compile in the sources for the GPU plugin / process. 'enable_gpu%': 1, + # Use GConf, the GNOME configuration system. + 'use_gconf%': 1, + # Use OpenSSL instead of NSS. Currently in development. 'use_openssl%': 0, diff --git a/build/linux/system.gyp b/build/linux/system.gyp index ed88a0a..271feef 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': [ |