From: Steve Lhomme Date: Thu, 25 May 2023 09:47:13 +0000 (+0200) Subject: Fix bcrypt detection on UNIX cross-compilation X-Git-Tag: v3.7.0~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=480ba376a6b0b883215b2f413666bc14a29b770f;p=thirdparty%2Flibarchive.git Fix bcrypt detection on UNIX cross-compilation The Windows SDK uses an uppercase on the B, but mingw-w64 doesn't. The autoconf detection already uses a lowercase bcrypt. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index f0bbfd02c..4f4abc3ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -738,9 +738,9 @@ LA_CHECK_INCLUDE_FILE("wchar.h" HAVE_WCHAR_H) LA_CHECK_INCLUDE_FILE("wctype.h" HAVE_WCTYPE_H) LA_CHECK_INCLUDE_FILE("windows.h" HAVE_WINDOWS_H) IF(ENABLE_CNG) - LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H) + LA_CHECK_INCLUDE_FILE("bcrypt.h" HAVE_BCRYPT_H) IF(HAVE_BCRYPT_H) - LIST(APPEND ADDITIONAL_LIBS "Bcrypt") + LIST(APPEND ADDITIONAL_LIBS "bcrypt") ENDIF(HAVE_BCRYPT_H) ELSE(ENABLE_CNG) UNSET(HAVE_BCRYPT_H CACHE) diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in index ff74f33fc..e4ff69691 100644 --- a/build/cmake/config.h.in +++ b/build/cmake/config.h.in @@ -366,7 +366,7 @@ typedef uint64_t uintmax_t; /* Define to 1 if you have the header file. */ #cmakedefine HAVE_ATTR_XATTR_H 1 -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. */ #cmakedefine HAVE_BCRYPT_H 1 /* Define to 1 if you have the header file. */ diff --git a/contrib/android/config/windows_host.h b/contrib/android/config/windows_host.h index 712b7491b..6550e5e82 100644 --- a/contrib/android/config/windows_host.h +++ b/contrib/android/config/windows_host.h @@ -160,7 +160,7 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ATTR_XATTR_H */ -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. */ #define HAVE_BCRYPT_H /* Define to 1 if you have the header file. */