diff options
Diffstat (limited to 'build/build_config.h')
| -rw-r--r-- | build/build_config.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build/build_config.h b/build/build_config.h index 21f9b3c..63dac1f 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -47,14 +47,21 @@ #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 +<<<<<<< HEAD #if defined(ANDROID) #define USE_OPENSSL 1 #undef USE_NSS #define USE_SYSTEM_ZLIB 1 +======= +#if defined(USE_OPENSSL) && defined(USE_NSS) +#error Cannot use both OpenSSL and NSS +>>>>>>> chromium.org at r65505 #endif // For access to standard POSIXish features, use OS_POSIX instead of a |