From 9669bd68a34c23afbe70fc2f1123f54ed4d49fed Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 26 Jul 2021 20:09:32 -0400 Subject: [PATCH] configure: remove unused checks for headers These headers are checked for at configure time, but the code never cares about the results of these checks, so skip them. --- CMakeLists.txt | 6 ------ config.h.cmake.in | 20 -------------------- configure.ac | 1 - macos/src/config-mac.h | 12 ------------ os400/os400config.h.in | 17 ----------------- vms/config.vms | 12 ------------ 6 files changed, 68 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1d2cd32..7e9483f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,7 +161,6 @@ else() endif() check_function_exists(class HAVE_CLASS) check_include_files(ctype.h HAVE_CTYPE_H) - check_include_files(dirent.h HAVE_DIRENT_H) check_include_files(dlfcn.h HAVE_DLFCN_H) check_library_exists(dl dlopen "" HAVE_DLOPEN) check_include_files(dl.h HAVE_DL_H) @@ -187,13 +186,10 @@ else() check_library_exists(z gzread "" HAVE_LIBZ) check_include_files(limits.h HAVE_LIMITS_H) check_function_exists(localtime HAVE_LOCALTIME) - check_include_files(lzma.h HAVE_LZMA_H) check_include_files(malloc.h HAVE_MALLOC_H) check_include_files(math.h HAVE_MATH_H) - check_include_files(memory.h HAVE_MEMORY_H) check_function_exists(mmap HAVE_MMAP) check_function_exists(munmap HAVE_MUNMAP) - check_symbol_exists(DIR ndir.h HAVE_NDIR_H) check_include_files(netdb.h HAVE_NETDB_H) check_include_files(netinet/in.h HAVE_NETINET_IN_H) check_include_files(poll.h HAVE_POLL_H) @@ -217,9 +213,7 @@ else() check_function_exists(strftime HAVE_STRFTIME) check_include_files(strings.h HAVE_STRINGS_H) check_include_files(string.h HAVE_STRING_H) - check_symbol_exists(DIR sys/dir.h HAVE_SYS_DIR_H) check_include_files(sys/mman.h HAVE_SYS_MMAN_H) - check_symbol_exists(DIR sys/ndir.h HAVE_SYS_NDIR_H) check_include_files(sys/select.h HAVE_SYS_SELECT_H) check_include_files(sys/socket.h HAVE_SYS_SOCKET_H) check_include_files(sys/stat.h HAVE_SYS_STAT_H) diff --git a/config.h.cmake.in b/config.h.cmake.in index fa72c46d..a4e0a3d9 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -19,9 +19,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_CTYPE_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_DIRENT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_DLFCN_H 1 @@ -79,18 +76,12 @@ /* Define to 1 if you have the `localtime' function. */ #cmakedefine HAVE_LOCALTIME 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_LZMA_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MALLOC_H 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_MATH_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ #cmakedefine HAVE_MMAP 1 @@ -102,9 +93,6 @@ # undef /**/ HAVE_MMAP #endif -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#cmakedefine HAVE_NDIR_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_NETDB_H 1 @@ -174,17 +162,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STRING_H 1 -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#cmakedefine HAVE_SYS_DIR_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H 1 -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#cmakedefine HAVE_SYS_NDIR_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SELECT_H 1 diff --git a/configure.ac b/configure.ac index 5b161a54..a4fb0768 100644 --- a/configure.ac +++ b/configure.ac @@ -475,7 +475,6 @@ AC_HEADER_STDC AC_CHECK_HEADERS([fcntl.h]) AC_CHECK_HEADERS([unistd.h]) AC_CHECK_HEADERS([ctype.h]) -AC_CHECK_HEADERS([dirent.h]) AC_CHECK_HEADERS([errno.h]) AC_CHECK_HEADERS([malloc.h]) AC_CHECK_HEADERS([stdarg.h]) diff --git a/macos/src/config-mac.h b/macos/src/config-mac.h index ca6f9939..d9b19b46 100644 --- a/macos/src/config-mac.h +++ b/macos/src/config-mac.h @@ -63,9 +63,6 @@ /* Define if you have the header file. */ #define HAVE_CTYPE_H -/* Define if you have the header file. */ -#define HAVE_DIRENT_H - /* Define if you have the header file. */ #define HAVE_DLFCN_H @@ -84,9 +81,6 @@ /* Define if you have the header file. */ #define HAVE_MATH_H -/* Define if you have the header file. */ -#define HAVE_NDIR_H - /* Define if you have the header file. */ #define HAVE_NETDB_H @@ -105,15 +99,9 @@ /* Define if you have the header file. */ #define HAVE_STRING_H -/* Define if you have the header file. */ -#define HAVE_SYS_DIR_H - /* Define if you have the header file. */ #undef HAVE_SYS_MMAN_H -/* Define if you have the header file. */ -#undef HAVE_SYS_NDIR_H - /* Define if you have the header file. */ #define HAVE_SYS_SELECT_H diff --git a/os400/os400config.h.in b/os400/os400config.h.in index 1840c17c..8e429878 100644 --- a/os400/os400config.h.in +++ b/os400/os400config.h.in @@ -18,9 +18,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_CTYPE_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_DIRENT_H 1 - /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 /* Locally emulated. */ @@ -87,9 +84,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_MATH_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP @@ -101,9 +95,6 @@ # undef /**/ HAVE_MMAP #endif -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - /* Define to 1 if you have the header file. */ #define HAVE_NETDB_H 1 @@ -182,17 +173,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - /* Define to 1 if you have the header file. */ #define HAVE_SYS_MMAN_H 1 -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H diff --git a/vms/config.vms b/vms/config.vms index 375406b0..e9604302 100755 --- a/vms/config.vms +++ b/vms/config.vms @@ -36,9 +36,6 @@ /* Define if you have the header file. */ #define HAVE_CTYPE_H 1 -/* Define if you have the header file. */ -#define HAVE_DIRENT_H 1 - /* Define if you have the header file. */ #define HAVE_ERRNO_H 1 @@ -54,9 +51,6 @@ /* Define if you have the header file. */ #define HAVE_MATH_H 1 -/* Define if you have the header file. */ -#undef HAVE_NDIR_H - /* Define if you have the header file. */ #define HAVE_NETDB_H 1 @@ -78,15 +72,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 -/* Define if you have the header file. */ -#undef HAVE_SYS_DIR_H - /* Define if you have the header file. */ #undef HAVE_SYS_MMAN_H -/* Define if you have the header file. */ -#undef HAVE_SYS_NDIR_H - /* Define if you have the header file. */ #undef HAVE_SYS_SELECT_H