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 cafaec216c252f02db63f1277caa7d25ab11ce32..ead4115a31d199db22d7cc5baf3d93f4f4fd3dcc 100644 (file)
--- 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 0772d6e512bd144dfa867c7e0db84c8d9bc100b1..20b9bd0117900987670c654bacadff59c6eb77d7 100644 (file)
--- 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 29885a19eae7bd50a55bcd673d82aa080d78c58f..a40534684d7cae6dea5f0e598888117784179227 100644 (file)
--- 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 31cfc3afc2197760c0ff6719689e09bfaf0d667c..45297edf089f3393d3a375213c3ba1f5df74fea4 100644 (file)
--- 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 d14bd33917c0074d95d4857a053896fa20ea37e3..a302828e26e0637aef34a6036b3cf0492f326878 100644 (file)
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -160,9 +160,6 @@
 /* Define if you have the <krb.h> 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 70833a51ddbadbc2230b876fa3eb130e44a4ac2b..64bfbdea05a5aa9e856a99f93b71e9f78effab72 100644 (file)
--- 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 0379524fb3616f76e98a2f29e3f138a7118cd4d2..d576cf245682a2f150b07b68435fb2f93998a728 100644 (file)
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -164,9 +164,6 @@
 /* Define if you have the <krb.h> 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 b7b93c6f4c392a788f6dcbda3e830ebbe21acddf..cb2e96d5d1ff6d67ee4341ece2737ace38bd636c 100644 (file)
--- a/lib/config-symbian.h
+++ b/lib/config-symbian.h
@@ -315,9 +315,6 @@
 /* Define to 1 if you have the <libssh2.h> 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 778d9833fe130add2779607288b72b712d056ea1..95d98f1149cb9863f1adc5e354019770cb6d1cd4 100644 (file)
--- 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 89af3525beba27dbd893dd9fdf8c88b9e594433d..d352578e33248c3e12616fda79154a6ead217679 100644 (file)
--- 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 5458cbaca7dcba1bd90bf96584b7d55dea25fd13..e0793a7ee4c03498947bdf0ea4c23060ab43412b 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -407,9 +407,6 @@
 /* Define to 1 if you have the <libssh2.h> 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