From: Brad King Date: Tue, 1 Dec 2009 16:08:04 +0000 (-0500) Subject: Remove STDC_HEADERS check from non-autoconf builds X-Git-Tag: v2.8.0~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=128fef46c650947282a8e13adea608065200d927;p=thirdparty%2Flibarchive.git Remove STDC_HEADERS check from non-autoconf builds This autoconf check is used only within its configure tests and is not used in libarchive source code. The CMake configuration test used a try_run(), which prevents cross-compiling without manual specification of the result. Since the result of the test is not used anyway we simply remove it. SVN-Revision: 1692 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 944fca15f..b9bd00836 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,6 @@ INCLUDE(CheckCSourceRuns) INCLUDE(CheckFileOffsetBits) INCLUDE(CheckFuncs) INCLUDE(CheckHeaderDirent) -INCLUDE(CheckHeaderSTDC) INCLUDE(CheckIncludeFile) INCLUDE(CheckIncludeFiles) INCLUDE(CheckLibraryExists) @@ -191,7 +190,6 @@ ENDIF(LZMA_FOUND) # # Check headers # -CHECK_HEADER_STDC() CHECK_HEADER_DIRENT() SET(INCLUDES "") diff --git a/build/cmake/CheckHeaderSTDC.c b/build/cmake/CheckHeaderSTDC.c deleted file mode 100644 index cba081041..000000000 --- a/build/cmake/CheckHeaderSTDC.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include -#include -#include - -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) - -int -main() -{ - int i; - - for (i = 0; i < 256; i++) { - if (XOR(islower(i), ISLOWER(i)) || toupper(i) != TOUPPER(i)) - return 2; - } - return 0; -} diff --git a/build/cmake/CheckHeaderSTDC.cmake b/build/cmake/CheckHeaderSTDC.cmake deleted file mode 100644 index a69fc67d2..000000000 --- a/build/cmake/CheckHeaderSTDC.cmake +++ /dev/null @@ -1,65 +0,0 @@ -# -# - Check if the system has the ANSI C files -# CHECK_HEADER_STDC -# -# The following variables may be set before calling this macro to -# modify the way the check is run: -# -# CMAKE_REQUIRED_FLAGS = string of compile command line flags -# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) -# CMAKE_REQUIRED_INCLUDES = list of include directories -# Copyright (c) 2009, Michihiro NAKAJIMA -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -MACRO (CHECK_HEADER_STDC) - IF(NOT DEFINED STDC_HEADERS) - IF(CMAKE_REQUIRED_INCLUDES) - SET(CHECK_HEADER_STDC_C_INCLUDE_DIRS "-DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}") - ELSE(CMAKE_REQUIRED_INCLUDES) - SET(CHECK_HEADER_STDC_C_INCLUDE_DIRS) - ENDIF(CMAKE_REQUIRED_INCLUDES) - SET(MACRO_CHECK_HEADER_STDC_FLAGS ${CMAKE_REQUIRED_FLAGS}) - - MESSAGE(STATUS "Cheking for ANSI C header files") - TRY_RUN(CHECK_HEADER_STDC_result - CHECK_HEADER_STDC_compile_result - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/build/cmake/CheckHeaderSTDC.c - COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} - CMAKE_FLAGS - -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_HEADER_STDC_FLAGS} - "${CHECK_HEADER_STDC_C_INCLUDE_DIRS}" - OUTPUT_VARIABLE OUTPUT) - - IF(CHECK_HEADER_STDC_compile_result AND CHECK_HEADER_STDC_result EQUAL 0) - FIND_PATH(CHECK_HEADER_STDC_path "string.h") - IF (CHECK_HEADER_STDC_path) - FILE(STRINGS "${CHECK_HEADER_STDC_path}/string.h" CHECK_HEADER_STDC_result REGEX "[^a-zA-Z_]memchr[^a-zA-Z_]") - IF (CHECK_HEADER_STDC_result) - FILE(STRINGS "${CHECK_HEADER_STDC_path}/stdlib.h" CHECK_HEADER_STDC_result REGEX "[^a-zA-Z_]free[^a-zA-Z_]") - ENDIF (CHECK_HEADER_STDC_result) - ENDIF (CHECK_HEADER_STDC_path) - ENDIF(CHECK_HEADER_STDC_compile_result AND CHECK_HEADER_STDC_result EQUAL 0) - - IF(CHECK_HEADER_STDC_result) - MESSAGE(STATUS "Cheking for ANSI C header files - found") - SET(STDC_HEADERS 1 CACHE INTERNAL "Have ANSI C headers") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining if the include file ${INCLUDE} " - "exists passed with the following output:\n" - "${OUTPUT}\n\n") - ELSE(CHECK_HEADER_STDC_result) - MESSAGE(STATUS "Cheking for ANSI C header files - not found") - SET(STDC_HEADERS "" CACHE INTERNAL "Have ANSI C headers") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if the include file ${INCLUDE} " - "exists failed with the following output:\n" - "${OUTPUT}\n\n") - ENDIF(CHECK_HEADER_STDC_result) - - ENDIF(NOT DEFINED STDC_HEADERS) -ENDMACRO (CHECK_HEADER_STDC) - diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in index a285c73d4..98140ffad 100644 --- a/build/cmake/config.h.in +++ b/build/cmake/config.h.in @@ -629,9 +629,6 @@ /* The size of `wchar_t', as computed by sizeof. */ #cmakedefine SIZEOF_WCHAR_T ${SIZEOF_WCHAR_T} -/* Define to 1 if you have the ANSI C header files. */ -#cmakedefine STDC_HEADERS 1 - /* Define to 1 if strerror_r returns char *. */ #cmakedefine STRERROR_R_CHAR_P 1 diff --git a/libarchive/config_freebsd.h b/libarchive/config_freebsd.h index f8a5b7428..236524514 100644 --- a/libarchive/config_freebsd.h +++ b/libarchive/config_freebsd.h @@ -141,7 +141,6 @@ #define HAVE_WMEMCMP 1 #define HAVE_WMEMCPY 1 #define HAVE_ZLIB_H 1 -#define STDC_HEADERS 1 #define TIME_WITH_SYS_TIME 1 /* FreeBSD 4 and earlier lack intmax_t/uintmax_t */ diff --git a/libarchive/config_windows.h b/libarchive/config_windows.h index 1995d75f6..7b80a6de9 100644 --- a/libarchive/config_windows.h +++ b/libarchive/config_windows.h @@ -465,9 +465,6 @@ /* Define to 1 if your C compiler doesn't accept -c and -o together. */ /* #undef NO_MINUS_C_MINUS_O */ -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - /* Define to 1 if strerror_r returns char *. */ /* #undef STRERROR_R_CHAR_P */ diff --git a/tar/config_freebsd.h b/tar/config_freebsd.h index 02145efc0..37aa9dcae 100644 --- a/tar/config_freebsd.h +++ b/tar/config_freebsd.h @@ -82,4 +82,3 @@ #define HAVE_WCTYPE_H 1 #define HAVE_ZLIB_H 1 #undef MAJOR_IN_MKDEV -#define STDC_HEADERS 1