diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 6 | ||||
| -rw-r--r-- | build/build_config.h | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp index 26ded8e..7174137c3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -20,7 +20,6 @@ '../jingle/jingle.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', - '../net/third_party/nss/ssl.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -134,6 +133,11 @@ '../remoting/remoting.gyp:*', ], }], + ['use_openssl!=1', { + 'dependencies': [ + '../net/third_party/nss/ssl.gyp:*', + ], + }], ], }, ], diff --git a/build/build_config.h b/build/build_config.h index a3ddc2b..e2d26cb 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -47,10 +47,16 @@ #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ defined(OS_SOLARIS) -#define USE_NSS 1 // Use NSS for crypto. +#if !defined(USE_OPENSSL) +#define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. +#endif #define USE_X11 1 // Use X for graphics. #endif +#if defined(USE_OPENSSL) && defined(USE_NSS) +#error Cannot use both OpenSSL and NSS +#endif + // For access to standard POSIXish features, use OS_POSIX instead of a // more specific macro. #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ |