Remove including md5global.h, because mtree of pkgsrc

isn't including it. it seems md5global.h is unnecessary.

SVN-Revision: 532

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7e07bf7e9b9d0e34402ca1c6900dc6103b7da60..c966b04a1ea4925b5ae9a5b45967e150efa52b22 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,10 +197,6 @@ SET(_files "")
 IF(HAVE_SYS_TYPES_H)
   SET(_files "sys/types.h")
 ENDIF(HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE(md5global.h   HAVE_MD5GLOBAL_H)
-IF(HAVE_MD5GLOBAL_H)
-  SET(_files ${_files} "md5global.h")
-ENDIF(HAVE_MD5GLOBAL_H)
 SET(_files ${_files} "md5.h")
 CHECK_INCLUDE_FILES("${_files}" HAVE_MD5_H)
 CHECK_HEADERS(ripemd.h rmd160.h)

diff --git a/cmake/config.h.in b/cmake/config.h.in
index 2a66fd5d371874930530d2546a872fa649df364c..82b770d3b61483a4b74ba8bbad433636e6a9877d 100644 (file)
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -257,9 +257,6 @@
 /* Define to 1 if you have the `MD5' functions. */
 #cmakedefine HAVE_MD5 1
 
-/* Define to 1 if you have the <md5global.h> header file. */
-#cmakedefine HAVE_MD5GLOBAL_H 1
-
 /* Define to 1 if you have the <md5.h> header file. */
 #cmakedefine HAVE_MD5_H 1
 

diff --git a/configure.ac b/configure.ac
index 6e4bc050f3a1bb319f94bda8fff52bc24227c9fc..d49c0056aa199489b4bbdf934f247ee4a22bf348 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,7 @@ if test "x$with_lzma" != "xno"; then
 fi
 
 AC_CHECK_HEADERS([openssl/md5.h openssl/ripemd.h openssl/sha.h])
-AC_CHECK_HEADERS([md5.h md5global.h])
+AC_CHECK_HEADERS([md5.h])
 AC_CHECK_HEADERS([ripemd.h rmd160.h])
 AC_CHECK_HEADERS([sha.h sha1.h sha2.h sha256.h])
 AC_SEARCH_LIBS(SHA1_Init, crypto ssl md)

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index d9086a82062f22ee2f4089eb2386665aeaa05341..95b049bee8f0e380171cd6d4829016b7d5d10e62 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -36,9 +36,6 @@ __FBSDID("$FreeBSD$");
 #ifdef HAVE_OPENSSL_MD5_H
 #include <openssl/md5.h>
 #else /* HAVE_OPENSSL_MD5_H */
-#ifdef HAVE_MD5GLOBAL_H
-#include <md5global.h>
-#endif
 #ifdef HAVE_MD5_H
 #include <md5.h>
 #endif