From: Paul B. Omta Date: Fri, 4 Oct 2019 07:55:54 +0000 (+0200) Subject: build: Remove unused HAVE_LIBSSL and HAVE_LIBCRYPTO defines X-Git-Tag: curl-7_67_0~67 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df85b86a92ac2488667acfd81d16321c73fceecf;p=thirdparty%2Fcurl.git build: Remove unused HAVE_LIBSSL and HAVE_LIBCRYPTO defines Closes https://github.com/curl/curl/pull/4460 --- diff --git a/CMake/Platforms/WindowsCache.cmake b/CMake/Platforms/WindowsCache.cmake index cafaec216c..ead4115a31 100644 --- a/CMake/Platforms/WindowsCache.cmake +++ b/CMake/Platforms/WindowsCache.cmake @@ -7,7 +7,6 @@ if(NOT UNIX) set(HAVE_LIBNSL 0) set(HAVE_GETHOSTNAME 1) set(HAVE_LIBZ 0) - set(HAVE_LIBCRYPTO 0) set(HAVE_DLOPEN 0) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0772d6e512..20b9bd0117 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -347,8 +347,6 @@ if(CMAKE_USE_OPENSSL) find_package(OpenSSL REQUIRED) set(SSL_ENABLED ON) set(USE_OPENSSL ON) - set(HAVE_LIBCRYPTO ON) - set(HAVE_LIBSSL ON) # Depend on OpenSSL via imported targets if supported by the running # version of CMake. This allows our dependents to get our dependencies diff --git a/lib/Makefile.netware b/lib/Makefile.netware index 29885a19ea..a40534684d 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -640,8 +640,6 @@ ifdef WITH_SSL @echo $(DL)#define HAVE_OPENSSL_ERR_H 1$(DL) >> $@ @echo $(DL)#define HAVE_OPENSSL_CRYPTO_H 1$(DL) >> $@ @echo $(DL)#define HAVE_OPENSSL_ENGINE_H 1$(DL) >> $@ - @echo $(DL)#define HAVE_LIBSSL 1$(DL) >> $@ - @echo $(DL)#define HAVE_LIBCRYPTO 1$(DL) >> $@ @echo $(DL)#define OPENSSL_NO_KRB5 1$(DL) >> $@ ifdef WITH_SRP @echo $(DL)#define USE_TLS_SRP 1$(DL) >> $@ diff --git a/lib/config-amigaos.h b/lib/config-amigaos.h index 31cfc3afc2..45297edf08 100644 --- a/lib/config-amigaos.h +++ b/lib/config-amigaos.h @@ -36,8 +36,6 @@ #define HAVE_INTTYPES_H 1 #define HAVE_IOCTLSOCKET_CAMEL 1 #define HAVE_IOCTLSOCKET_CAMEL_FIONBIO 1 -#define HAVE_LIBCRYPTO 1 -#define HAVE_LIBSSL 1 #define HAVE_LIBZ 1 #define HAVE_LONGLONG 1 #define HAVE_MALLOC_H 1 diff --git a/lib/config-os400.h b/lib/config-os400.h index d14bd33917..a302828e26 100644 --- a/lib/config-os400.h +++ b/lib/config-os400.h @@ -160,9 +160,6 @@ /* Define if you have the header file. */ #undef HAVE_KRB_H -/* Define if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - /* Define if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL @@ -175,9 +172,6 @@ /* Define if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET -/* Define if you have the `ssl' library (-lssl). */ -#undef HAVE_LIBSSL - /* Define if you have GSS API. */ #define HAVE_GSSAPI diff --git a/lib/config-plan9.h b/lib/config-plan9.h index 70833a51dd..64bfbdea05 100644 --- a/lib/config-plan9.h +++ b/lib/config-plan9.h @@ -126,7 +126,6 @@ #define HAVE_INTTYPES_H 1 #define HAVE_IOCTL 1 #define HAVE_LIBGEN_H 1 -#define HAVE_LIBSSL 1 #define HAVE_LIBZ 1 #define HAVE_LL 1 #define HAVE_LOCALE_H 1 diff --git a/lib/config-riscos.h b/lib/config-riscos.h index 0379524fb3..d576cf2456 100644 --- a/lib/config-riscos.h +++ b/lib/config-riscos.h @@ -164,9 +164,6 @@ /* Define if you have the header file. */ #undef HAVE_KRB_H -/* Define if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - /* Define if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL @@ -179,9 +176,6 @@ /* Define if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET -/* Define if you have the `ssl' library (-lssl). */ -#undef HAVE_LIBSSL - /* Define if you have the `ucb' library (-lucb). */ #undef HAVE_LIBUCB diff --git a/lib/config-symbian.h b/lib/config-symbian.h index b7b93c6f4c..cb2e96d5d1 100644 --- a/lib/config-symbian.h +++ b/lib/config-symbian.h @@ -315,9 +315,6 @@ /* Define to 1 if you have the header file. */ /*#define HAVE_LIBSSH2_H 1*/ -/* Define to 1 if you have the `ssl' library (-lssl). */ -/*#define HAVE_LIBSSL 1*/ - /* if your compiler supports LL */ #define HAVE_LL 1 diff --git a/lib/config-tpf.h b/lib/config-tpf.h index 778d9833fe..95d98f1149 100644 --- a/lib/config-tpf.h +++ b/lib/config-tpf.h @@ -277,10 +277,6 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ -/* Define to 1 if you have the `ssl' library (-lssl). */ -/* #undef HAVE_LIBSSL */ -#define HAVE_LIBSSL 1 - /* if zlib is available */ /* #undef HAVE_LIBZ */ diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index 89af3525be..d352578e33 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -375,9 +375,6 @@ /* Define to 1 if you have the `libssh2_version' function. */ /* #undef HAVE_LIBSSH2_VERSION */ -/* Define to 1 if you have the `ssl' library (-lssl). */ -#define HAVE_LIBSSL 1 - /* if zlib is available */ #define HAVE_LIBZ 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 5458cbaca7..e0793a7ee4 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -407,9 +407,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LIBSSH2_H 1 -/* Define to 1 if you have the `ssl' library (-lssl). */ -#cmakedefine HAVE_LIBSSL 1 - /* if zlib is available */ #cmakedefine HAVE_LIBZ 1