diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 21:19:20 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 21:19:20 +0000 |
| commit | 6acbd8dd984f3d4427f46d138464a21760676c7b (patch) | |
| tree | 9a26fa11571920f496debc96be670469946dac24 /net/net.gyp | |
| parent | 9b5f56b43a17fbee9f595a42f4733b4ccb1b7095 (diff) | |
| download | chromium_src-6acbd8dd984f3d4427f46d138464a21760676c7b.zip chromium_src-6acbd8dd984f3d4427f46d138464a21760676c7b.tar.gz chromium_src-6acbd8dd984f3d4427f46d138464a21760676c7b.tar.bz2 | |
Linux: allow linking directly with Kerberos instead of using dlopen.
dlopen is still the default for Google Chrome. This option
is intended for Linux distro packagers.
BUG=92689
Review URL: http://codereview.chromium.org/7655046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index fb55d21..182d81b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -6,7 +6,16 @@ 'variables': { 'chromium_code': 1, - 'use_kerberos%': 1, + 'linux_link_kerberos%': 0, + 'conditions': [ + ['chromeos==1', { + # Disable Kerberos on ChromeOS, at least for now. + # It needs configuration (krb5.conf and so on). + 'use_kerberos%': 0, + }, { # chromeos == 0 + 'use_kerberos%': 1, + }], + ], }, 'targets': [ { @@ -710,6 +719,19 @@ 'defines': [ 'USE_KERBEROS', ], + 'conditions': [ + ['linux_link_kerberos==1', { + 'link_settings': { + 'ldflags': [ + '<!@(krb5-config --libs gssapi)', + ], + }, + }, { # linux_link_kerberos==0 + 'defines': [ + 'DLOPEN_KERBEROS', + ], + }], + ], }, { # use_kerberos == 0 'sources!': [ 'http/http_auth_gssapi_posix.cc', |