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

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: 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
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 40bade80202d9fdda68179121c95bab5230741a0..0dd0e895510ef18a22e890afda5907f6b1be8e89 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -7,6 +7,7 @@
'chromium_code': 1,
'use_kerberos%': 1,
+ 'linux_link_kerberos%': 0,
cbentzel 2011/08/18 21:21:17 Should linux be removed from the name?
Paweł Hajdan Jr. 2011/08/18 23:30:32 This follows the convention used for gnome-keyring
cbentzel 2011/08/19 12:22:35 This is fine for consistency.
},
'targets': [
{
@@ -710,6 +711,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',
« net/http/mock_gssapi_library_posix.cc ('K') | « net/http/mock_gssapi_library_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698