From 70372d49ac0fc1bbfd7e04aa820b646a6c525743 Mon Sep 17 00:00:00 2001 From: "joth@chromium.org" Date: Fri, 22 Oct 2010 13:12:34 +0000 Subject: Make USE_OPENSSL and USE_NSS mutually exclusive - that is, defining use_openssl=1 will now remove all dependency on NSS. This does not impact any of the standard, non-openssl builds. Adds stub implementations of several files that need to be fully implemented in follow up patchs. Firefox import code will need some more substatial refactoring, as it makes little sense to be attempting a firefox import without NSS libraries to hand, however the UI etc has numerous assumption about the presence of this importer. BUG=None TEST=None Review URL: http://codereview.chromium.org/3855004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63506 0039d316-1c4b-4281-b951-d872f2087c98 --- build/build_config.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'build/build_config.h') 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) || \ -- cgit v1.1