From: Viktor Szakats <commit@vsz.me>
Date: Sat, 13 Jul 2024 16:47:54 +0000 (+0200)
Subject: cmake: delete unused `HAVE_LIBSSH2`, `HAVE_LIBSOCKET` macros
X-Git-Tag: curl-8_9_0~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09cdf7e5315711dea4ce7dcf5d99a4d41e7f658b;p=thirdparty%2Fcurl.git

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 018e90af7e..ec83be9236 100644
--- 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 eb1d26ec77..056f55405b 100644
--- 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 5e5ff25d7a..631ee27b33 100644
--- 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 ebd7c2fb23..b50d769597 100755
--- 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,