diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.netware | 1 | ||||
| -rw-r--r-- | lib/config-amigaos.h | 3 | ||||
| -rw-r--r-- | lib/config-riscos.h | 3 | ||||
| -rwxr-xr-x | lib/config-vms.h | 7 | ||||
| -rw-r--r-- | lib/config.dj | 1 | ||||
| -rw-r--r-- | lib/setup.h | 17 |
6 files changed, 10 insertions, 22 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index b7554cabb..35c7932ce 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -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) >> $@ diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 5d617fe16..387adebf7 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -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" diff --git a/lib/config-riscos.h b/lib/config-riscos.h index e6e44b0e3..85dec3ea4 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -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 diff --git a/lib/config-vms.h b/lib/config-vms.h index 83751073d..c9f931f5a 100755 --- a/lib/config-vms.h +++ b/lib/config-vms.h @@ -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 diff --git a/lib/config.dj b/lib/config.dj index bfcf9f68c..f2d38d3da 100644 --- a/lib/config.dj +++ b/lib/config.dj @@ -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. 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 <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 |