diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 06:15:25 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 06:15:25 +0000 |
| commit | 8c785eba63d0a6a4265d762e0be5daf1b769ff4c (patch) | |
| tree | 61434abbf2a2565119be3dd4652f71377efa4775 /chrome/chrome.gyp | |
| parent | 49a8a18f43c18b59f975df31d0bbb680cd303972 (diff) | |
| download | chromium_src-8c785eba63d0a6a4265d762e0be5daf1b769ff4c.zip chromium_src-8c785eba63d0a6a4265d762e0be5daf1b769ff4c.tar.gz chromium_src-8c785eba63d0a6a4265d762e0be5daf1b769ff4c.tar.bz2 | |
Linux: make cups (common unix printing system) dependency optional.
This is upstreaming a Gentoo Linux patch.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2858014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50432 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 93b2734..6868b88 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1099,6 +1099,15 @@ 'include_dirs': [ '..', ], + 'variables': { + 'conditions': [ + ['OS=="linux" and chromeos==0 and target_arch!="arm"', { + 'use_cups%': 1, + }, { + 'use_cups%': 0, + }], + ], + }, 'conditions': [ ['OS=="win"', { 'defines': [ @@ -1115,7 +1124,7 @@ '../build/linux/system.gyp:gtk', ], }], - ['OS=="linux" and chromeos==0 and target_arch!="arm"', { + ['use_cups==1', { 'link_settings': { 'libraries': [ '-lcups', |