From df3ca59116bff161c0fa44b1af7915dc8c1da20e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 11 Dec 2004 18:47:22 +0000 Subject: Dan Fandrich: Here's a stab at a consolidation of the SSL detection heuristics into configure. Source files aren't changed by this patch, except for setup.h and the various config*.h files. Within the configure script, OPENSSL_ENABLED is used to determine if SSL is being used or not, and outside configure, USE_SSLEAY means the same thing; this could be even further unified some day. Now, when SSL is not detected, configure skips the various checks that are dependent on SSL, speeding up the configure process and avoiding complications with cross compiles. I also updated all the architecture- specific config files I could see, but I couldn't test them. --- packages/vms/config-vms.h_with_ssl | 7 +++++-- packages/vms/config-vms.h_without_ssl | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'packages/vms') diff --git a/packages/vms/config-vms.h_with_ssl b/packages/vms/config-vms.h_with_ssl index e47acbe61..e3bc60dac 100755 --- a/packages/vms/config-vms.h_with_ssl +++ b/packages/vms/config-vms.h_with_ssl @@ -123,8 +123,11 @@ /* OpenSSL section starts here */ /* Define if you have a working OpenSSL installation */ -#define OPENSSL_ENABLED 1 -#ifdef OPENSSL_ENABLED +#define USE_SSLEAY 1 +#ifdef USE_SSLEAY + +/* if OpenSSL is in use */ +#define USE_OPENSSL 1 /* Define if you have the crypto library (-lcrypto). */ #define HAVE_LIBCRYPTO 1 diff --git a/packages/vms/config-vms.h_without_ssl b/packages/vms/config-vms.h_without_ssl index 5b87c1dd2..d7649bb83 100755 --- a/packages/vms/config-vms.h_without_ssl +++ b/packages/vms/config-vms.h_without_ssl @@ -123,8 +123,11 @@ /* OpenSSL section starts here */ /* Define if you have a working OpenSSL installation */ -#undef OPENSSL_ENABLED -#ifdef OPENSSL_ENABLED +#undef USE_SSLEAY +#ifdef USE_SSLEAY + +/* if OpenSSL is in use */ +#define USE_OPENSSL 1 /* Define if you have the crypto library (-lcrypto). */ #define HAVE_LIBCRYPTO 1 -- cgit v1.2.3