diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 12:38:19 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 12:38:19 +0000 |
| commit | 1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c (patch) | |
| tree | cdad2f08fdc26c5a15ec7e45609717d829a2ccd5 /net/net.gyp | |
| parent | b69f4ffd2ff73ba0cad80f80555e4b15fc211257 (diff) | |
| download | chromium_src-1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c.zip chromium_src-1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c.tar.gz chromium_src-1b6e1d2f72217d4bd9c9a164db70cbfc1b869d1c.tar.bz2 | |
Revert 97925 - 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
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/7719024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/net.gyp b/net/net.gyp index 8f43b69..fb55d21 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -7,7 +7,6 @@ 'chromium_code': 1, 'use_kerberos%': 1, - 'linux_link_kerberos%': 0, }, 'targets': [ { @@ -711,19 +710,6 @@ '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', |