]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
build: fix cmake build with OpenSSL
authorMartin Matuska <martin@matuska.de>
Fri, 14 Jul 2023 08:04:37 +0000 (10:04 +0200)
committerMartin Matuska <martin@matuska.de>
Fri, 14 Jul 2023 09:01:58 +0000 (11:01 +0200)
CMakeLists.txt
build/cmake/config.h.in

index 2b9faee4abda477561be45392e9a57c3b02c944d..d2315adbbf6028fdd4133bc0d855379283279bd7 100644 (file)
@@ -826,6 +826,10 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     SET(HAVE_LIBCRYPTO 1)
     INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
     LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
+    SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+    SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+    LA_CHECK_INCLUDE_FILE("openssl/evp.h" HAVE_OPENSSL_EVP_H)
+    CHECK_FUNCTION_EXISTS(PKCS5_PBKDF2_HMAC_SHA1 HAVE_PKCS5_PBKDF2_HMAC_SHA1)
   ENDIF(OPENSSL_FOUND)
 ELSE()
   SET(OPENSSL_FOUND FALSE) # Override cached value
index 11b512d9102fc4cdb272dd33dbc99d5f67a1061d..2046609719e6fe179574772c3905804483c86303 100644 (file)
@@ -908,6 +908,9 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `openat' function. */
 #cmakedefine HAVE_OPENAT 1
 
+/* Define to 1 if you have the <openssl/evp.h> header file. */
+#cmakedefine HAVE_OPENSSL_EVP_H 1
+
 /* Define to 1 if you have the <paths.h> header file. */
 #cmakedefine HAVE_PATHS_H 1