generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dan Fandrich:

Browse Source 
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.
This commit is contained in:
Daniel Stenberg
2004-12-11 18:47:22 +00:00
parent 3ca4509ae9
commit df3ca59116
11 changed files with 93 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Makefile.netware
View File

@@ -353,6 +353,7 @@ ifdef ZLIB_PATH
endif
ifdef SSL
@echo $(DL)#define USE_SSLEAY 1$(DL) >> $@
@echo $(DL)#define USE_OPENSSL 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_X509_H 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_SSL_H 1$(DL) >> $@
@echo $(DL)#define HAVE_OPENSSL_RSA_H 1$(DL) >> $@

3
lib/config-amigaos.h
View File

@@ -55,6 +55,9 @@
#define HAVE_WRITABLE_ARGV 1
#define HAVE_ZLIB_H 1
#define USE_OPENSSL 1
#define USE_SSLEAY 1
#define OS "AmigaOS"
#define PACKAGE "curl"

3
lib/config-riscos.h
View File

@@ -53,9 +53,6 @@
/* Define this to your Entropy Gathering Daemon socket pathname */
#undef EGD_SOCKET
/* Define if you have a working OpenSSL installation */
#undef OPENSSL_ENABLED
/* Set to explicitly specify we don't want to use thread-safe functions */
#define DISABLED_THREADSAFE

7
lib/config-vms.h
View File

@@ -343,8 +343,11 @@
/* Define if you have the getpass function. */
#undef HAVE_GETPASS
/* Define if you have a working OpenSSL installation */
#define OPENSSL_ENABLED 1
/* if OpenSSL is in use */
#define USE_OPENSSL 1
/* if SSL is enabled */
#define USE_SSLEAY 1
/* Define if you have the `dlopen' function. */
#undef HAVE_DLOPEN

1
lib/config.dj
View File

@@ -90,6 +90,7 @@
#define HAVE_LIBSSL 1
#define HAVE_LIBCRYPTO 1
#define OPENSSL_NO_KRB5 1
#define USE_OPENSSL 1
#endif
/* Because djgpp <= 2.03 doesn't have snprintf() etc.

17
lib/setup.h
View File

@@ -113,23 +113,6 @@ typedef unsigned char bool;
#include <floss.h>
#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 <curl/stdcheaders.h>
#endif