diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 17:34:01 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-15 17:34:01 +0000 |
| commit | 9c210d96fb1f28dd523275b0db34908d2359b76f (patch) | |
| tree | 616436357c48cf2d7382a57f90234701f416ce49 /net/net.gyp | |
| parent | e6ce5e42370454686624b65c5db6af91da6c42bf (diff) | |
| download | chromium_src-9c210d96fb1f28dd523275b0db34908d2359b76f.zip chromium_src-9c210d96fb1f28dd523275b0db34908d2359b76f.tar.gz chromium_src-9c210d96fb1f28dd523275b0db34908d2359b76f.tar.bz2 | |
Linux: control usage of Kerberos via use_kerberos gyp flag
(on by default)
This allows Linux distro packagers to control usage of Kerberos
explicitly instead of relying on auto-detection.
BUG=92689
Review URL: http://codereview.chromium.org/7633006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 4b2259e..8010016 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -5,6 +5,8 @@ { 'variables': { 'chromium_code': 1, + + 'use_kerberos%': 1, }, 'targets': [ { @@ -700,6 +702,18 @@ 'proxy/proxy_config_service_linux.h', ], }], + ['use_kerberos==1', { + 'defines': [ + 'USE_KERBEROS', + ], + }, { # use_kerberos == 0 + 'sources!': [ + 'http/http_auth_gssapi_posix.cc', + 'http/http_auth_gssapi_posix.h', + 'http/http_auth_handler_negotiate.h', + 'http/http_auth_handler_negotiate.cc', + ], + }], ['use_openssl==1', { 'sources!': [ 'base/cert_database_nss.cc', @@ -1070,6 +1084,18 @@ }], ], }], + [ 'use_kerberos==1', { + 'defines': [ + 'USE_KERBEROS', + ], + }, { # use_kerberos == 0 + 'sources!': [ + 'http/http_auth_gssapi_posix_unittest.cc', + 'http/http_auth_handler_negotiate_unittest.cc', + 'http/mock_gssapi_library_posix.cc', + 'http/mock_gssapi_library_posix.h', + ], + }], [ 'use_openssl==1', { # When building for OpenSSL, we need to exclude NSS specific tests. # TODO(bulach): Add equivalent tests when the underlying |