Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1318)

Unified Diff: net/net.gyp

Issue 7655046: Linux: allow linking directly with Kerberos instead of using dlopen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Hopefully fix ChromeOS Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/mock_gssapi_library_posix.cc ('k') | net/third_party/gssapi/LICENSE » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index fb55d21a90265a66082c40b784df50cc1c00ab53..182d81bf02186cdad1240cfac08c23cebefa2e6f 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',
« no previous file with comments | « net/http/mock_gssapi_library_posix.cc ('k') | net/third_party/gssapi/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698