From 4f3828d5a2482a3eed76219bbe8d5f896e990e2a Mon Sep 17 00:00:00 2001 From: Andrea Pappacoda Date: Sun, 4 Jul 2021 20:13:50 +0200 Subject: [PATCH] cmake: remove libssh2 feature checks libssh2 features are detected based on version since commit 9dbbba997608f7c3c5de1c627c77c8cd2aa85b73 Closes #7343 --- CMakeLists.txt | 9 --------- lib/curl_config.h.cmake | 15 --------------- 2 files changed, 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffdc01c3b..c85295e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -716,15 +716,6 @@ if(CMAKE_USE_LIBSSH2) set(HAVE_LIBSSH2_H ON) set(CURL_INCLUDES ${CURL_INCLUDES} "${LIBSSH2_INCLUDE_DIR}/libssh2.h") set(CURL_TEST_DEFINES "${CURL_TEST_DEFINES} -DHAVE_LIBSSH2_H") - - # now check for specific libssh2 symbols as they were added in different versions - set(CMAKE_EXTRA_INCLUDE_FILES "libssh2.h") - check_function_exists(libssh2_version HAVE_LIBSSH2_VERSION) - check_function_exists(libssh2_init HAVE_LIBSSH2_INIT) - check_function_exists(libssh2_exit HAVE_LIBSSH2_EXIT) - check_function_exists(libssh2_scp_send64 HAVE_LIBSSH2_SCP_SEND64) - check_function_exists(libssh2_session_handshake HAVE_LIBSSH2_SESSION_HANDSHAKE) - set(CMAKE_EXTRA_INCLUDE_FILES "") unset(CMAKE_REQUIRED_LIBRARIES) endif() endif() diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index c90659f82..fa4f19c74 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -356,21 +356,6 @@ /* Define to 1 if you have the `ssh2' library (-lssh2). */ #cmakedefine HAVE_LIBSSH2 1 -/* Define to 1 if libssh2 provides `libssh2_version'. */ -#cmakedefine HAVE_LIBSSH2_VERSION 1 - -/* Define to 1 if libssh2 provides `libssh2_init'. */ -#cmakedefine HAVE_LIBSSH2_INIT 1 - -/* Define to 1 if libssh2 provides `libssh2_exit'. */ -#cmakedefine HAVE_LIBSSH2_EXIT 1 - -/* Define to 1 if libssh2 provides `libssh2_scp_send64'. */ -#cmakedefine HAVE_LIBSSH2_SCP_SEND64 1 - -/* Define to 1 if libssh2 provides `libssh2_session_handshake'. */ -#cmakedefine HAVE_LIBSSH2_SESSION_HANDSHAKE 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_LIBSSH2_H 1