From 8af6765f3db9b7eba69c42aa7a3fd1161309f059 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 21 Apr 2003 21:27:17 +0000 Subject: [PATCH] parameterize REPORT_OPENSSL_ERRORS --- dtool/Config.pp | 4 ++++ dtool/LocalSetup.pp | 1 + panda/src/downloader/config_downloader.h | 5 ----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dtool/Config.pp b/dtool/Config.pp index 31b4773da9..b9a4eb4238 100644 --- a/dtool/Config.pp +++ b/dtool/Config.pp @@ -203,6 +203,10 @@ // Define this nonempty if your version of OpenSSL is 0.9.7 or better. #define SSL_097 +// Define this true to include the OpenSSL code to report verbose +// error messages when they occur. +#defer REPORT_OPENSSL_ERRORS $[< $[OPTIMIZE], 4] + // Is Crypto++ installed, and where? #define CRYPTO_IPATH /usr/include/crypto++ #define CRYPTO_LPATH /usr/lib diff --git a/dtool/LocalSetup.pp b/dtool/LocalSetup.pp index 89fa4266cc..26b7241250 100644 --- a/dtool/LocalSetup.pp +++ b/dtool/LocalSetup.pp @@ -37,6 +37,7 @@ $[cdefine HAVE_NSPR] /* Define if we have OpenSSL installed. */ $[cdefine HAVE_SSL] $[cdefine SSL_097] +$[cdefine REPORT_OPENSSL_ERRORS] /* Define if we have crypto++ installed. */ $[cdefine HAVE_CRYPTO] diff --git a/panda/src/downloader/config_downloader.h b/panda/src/downloader/config_downloader.h index 177fd5cb98..5a6e3a79c1 100644 --- a/panda/src/downloader/config_downloader.h +++ b/panda/src/downloader/config_downloader.h @@ -48,9 +48,4 @@ extern const double connect_timeout; extern const double http_timeout; extern const int http_max_connect_count; -// Later, we can make this conditional on NDEBUG or something along -// those lines; for now, we define it always to be true so we get -// error messages from OpenSSL wherever possible. -#define REPORT_OPENSSL_ERRORS 1 - #endif