From: Michihiro NAKAJIMA Date: Tue, 16 Sep 2014 22:24:59 +0000 (+0900) Subject: Fix detecting message digest functions. X-Git-Tag: v3.1.900a~208 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4c6533b2667f042bda995d99249570647fc29a4;p=thirdparty%2Flibarchive.git Fix detecting message digest functions. This bug was caused by renaming archive_crypto. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index e49c1aeb9..aaa7ea634 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -631,7 +631,7 @@ ENDIF(NOT OPENSSL_FOUND) # # How to prove that CRYPTO functions, which have several names on various -# platforms, just see if archive_crypto.c can compile and link against +# platforms, just see if archive_digest.c can compile and link against # required libraries. # MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION) @@ -670,7 +670,7 @@ MACRO(CHECK_CRYPTO ALGORITHMS IMPLEMENTATION) ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h) FILE(READ "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/confdefs.h" CONFDEFS_H) - FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_crypto.c" + FILE(READ "${CMAKE_CURRENT_SOURCE_DIR}/libarchive/archive_digest.c" ARCHIVE_CRYPTO_C) SET(SOURCE "${CONFDEFS_H} diff --git a/configure.ac b/configure.ac index 6682efb00..dd57a6b38 100644 --- a/configure.ac +++ b/configure.ac @@ -699,7 +699,7 @@ AC_DEFUN([CRYPTO_CHECK], [ #define ARCHIVE_CRYPTO_$1_$2 #define PLATFORM_CONFIG_H "check_crypto_md.h" -$(cat "$srcdir/libarchive/archive_crypto.c") +$(cat "$srcdir/libarchive/archive_digest.c") int main(int argc, char **argv)