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. --- lib/setup.h | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'lib/setup.h') diff --git a/lib/setup.h b/lib/setup.h index 1c088575c..8530f0224 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -113,23 +113,6 @@ typedef unsigned char bool; #include #endif -#if defined(HAVE_X509_H) && defined(HAVE_SSL_H) && defined(HAVE_RSA_H) && \ -defined(HAVE_PEM_H) && defined(HAVE_ERR_H) && defined(HAVE_CRYPTO_H) && \ -defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) - /* the six important includes files all exist and so do both libs, - defined SSLeay usage */ -#define USE_SSLEAY 1 -#endif -#if defined(HAVE_OPENSSL_X509_H) && defined(HAVE_OPENSSL_SSL_H) && \ -defined(HAVE_OPENSSL_RSA_H) && defined(HAVE_OPENSSL_PEM_H) && \ -defined(HAVE_OPENSSL_ERR_H) && defined(HAVE_OPENSSL_CRYPTO_H) && \ -defined(HAVE_LIBSSL) && defined(HAVE_LIBCRYPTO) - /* the six important includes files all exist and so do both libs, - defined SSLeay usage */ -#define USE_SSLEAY 1 -#define USE_OPENSSL 1 -#endif - #ifndef STDC_HEADERS /* no standard C headers! */ #include #endif -- cgit v1.2.3