cmake: delete unused `HAVE_LIBSSH2`, `HAVE_LIBSOCKET` macros

- `HAVE_LIBSSH2`: unused in source. Not defined in CMake.

- `HAVE_LIBSOCKET`: unused in source. Used internally in CMake.

autotools sets them implicitly, so add them to the flag comparison
ignore-list.

Closes #14178

diff --git a/lib/config-os400.h b/lib/config-os400.h
index 018e90af7e26f54ba141f9dd08e57e96f1729255..ec83be9236583f2494410374984af7ddc8b49473 100644 (file)
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -107,9 +107,6 @@
 /* Define if you have the <io.h> header file. */
 #undef HAVE_IO_H
 
-/* Define if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
 /* Define if you have GSS API. */
 #define HAVE_GSSAPI
 

diff --git a/lib/config-riscos.h b/lib/config-riscos.h
index eb1d26ec7796d6f96522a6b749ee7aa442abf238..056f55405b0c17bbc10385c1e42996b3a3557b4f 100644 (file)
--- a/lib/config-riscos.h
+++ b/lib/config-riscos.h
@@ -108,9 +108,6 @@
 /* Define if you have the <io.h> header file. */
 #undef HAVE_IO_H
 
-/* Define if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
 /* Define if you need the malloc.h header file even with stdlib.h  */
 /* #define NEED_MALLOC_H 1 */
 

diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 5e5ff25d7ae3c51a8fb31a5b2e2cf3824ce37391..631ee27b33bc6ac98dc1c571546003bab59d8221 100644 (file)
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -368,12 +368,6 @@
 /* Define to 1 if you have the idn2.h header file. */
 #cmakedefine HAVE_IDN2_H 1
 
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#cmakedefine HAVE_LIBSOCKET 1
-
-/* Define to 1 if you have the `ssh2' library (-lssh2). */
-#cmakedefine HAVE_LIBSSH2 1
-
 /* if zlib is available */
 #cmakedefine HAVE_LIBZ 1
 

diff --git a/scripts/cmp-config.pl b/scripts/cmp-config.pl
index ebd7c2fb2350171e7ae7e73c4e33b730a14720b2..b50d769597e1e7b2210a6c10e55cf1861b42df13 100755 (executable)
--- a/scripts/cmp-config.pl
+++ b/scripts/cmp-config.pl
@@ -47,6 +47,8 @@ my %remove = (
     '#define HAVE_IOCTL 1' => 1,
     '#define HAVE_LDAP_SSL 1' => 1,
     '#define HAVE_LIBBROTLIDEC 1' => 1,
+    '#define HAVE_LIBSOCKET 1' => 1,
+    '#define HAVE_LIBSSH2 1' => 1,
     '#define HAVE_LIBSSL 1' => 1,
     '#define HAVE_LIBZSTD 1' => 1,
     '#define HAVE_OPENSSL3 1' => 1,