From a2718d0d229cbe81e1322a2c7db6d682e6c29f0d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 15 Jul 2021 14:54:40 -0700 Subject: [PATCH] CMake: Remove no-longer-used checks. The following commits removed code that required the following defines, so remove them: c0711693ab HAVE_GETOPT_H (Partial; still required by CMake) 2925fb0850 HAVE_MKSTEMPS 0c889d6f5c HAVE_SYS_IOCTL_H 0c889d6f5c HAVE_SYS_SOCKIO_H 0c889d6f5c HAVE_STRUCT_SOCKADDR_SA_LEN 9c5049a80b HAVE_STRUCT_STAT_ST_FLAGS --- ConfigureChecks.cmake | 9 ++------- cmakeconfig.h.in | 18 ------------------ 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1181a7f375..a118c77859 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -13,7 +13,6 @@ include(CMakePushCheckState) include(CheckIncludeFile) include(CheckIncludeFiles) check_include_file("arpa/inet.h" HAVE_ARPA_INET_H) -check_include_file("getopt.h" HAVE_GETOPT_H) check_include_file("grp.h" HAVE_GRP_H) # # This may require to be included @@ -22,10 +21,8 @@ check_include_files("sys/types.h;ifaddrs.h" HAVE_IFADDRS_H) check_include_file("netinet/in.h" HAVE_NETINET_IN_H) check_include_file("netdb.h" HAVE_NETDB_H) check_include_file("pwd.h" HAVE_PWD_H) -check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H) check_include_file("sys/select.h" HAVE_SYS_SELECT_H) check_include_file("sys/socket.h" HAVE_SYS_SOCKET_H) -check_include_file("sys/sockio.h" HAVE_SYS_SOCKIO_H) check_include_file("sys/time.h" HAVE_SYS_TIME_H) check_include_file("sys/utsname.h" HAVE_SYS_UTSNAME_H) check_include_file("sys/wait.h" HAVE_SYS_WAIT_H) @@ -98,6 +95,7 @@ endif (NOT WIN32) check_function_exists("getopt_long" HAVE_GETOPT_LONG) if(HAVE_GETOPT_LONG) + check_include_file("getopt.h" HAVE_GETOPT_H) # # The OS has getopt_long(), so it might have optreset. # Do we have it? @@ -105,7 +103,7 @@ if(HAVE_GETOPT_LONG) if(HAVE_GETOPT_H) check_symbol_exists("optreset" "getopt.h" HAVE_OPTRESET) else() - check_symbol_exists("optreset" HAVE_OPTRESET) + check_symbol_exists("optreset" HAVE_OPTRESET) endif() else() # @@ -120,7 +118,6 @@ else() endif() check_function_exists("getifaddrs" HAVE_GETIFADDRS) check_function_exists("issetugid" HAVE_ISSETUGID) -check_function_exists("mkstemps" HAVE_MKSTEMPS) check_function_exists("setresgid" HAVE_SETRESGID) check_function_exists("setresuid" HAVE_SETRESUID) check_function_exists("strptime" HAVE_STRPTIME) @@ -133,8 +130,6 @@ endif() #Struct members include(CheckStructHasMember) -check_struct_has_member("struct sockaddr" sa_len sys/socket.h HAVE_STRUCT_SOCKADDR_SA_LEN) -check_struct_has_member("struct stat" st_flags sys/stat.h HAVE_STRUCT_STAT_ST_FLAGS) check_struct_has_member("struct stat" st_blksize sys/stat.h HAVE_STRUCT_STAT_ST_BLKSIZE) check_struct_has_member("struct stat" st_birthtime sys/stat.h HAVE_STRUCT_STAT_ST_BIRTHTIME) check_struct_has_member("struct stat" __st_birthtime sys/stat.h HAVE_STRUCT_STAT___ST_BIRTHTIME) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index fe4bdd7392..69bc0a4efc 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -70,9 +70,6 @@ /* Define to 1 if you have the getopt_long function. */ #cmakedefine HAVE_GETOPT_LONG 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_GETOPT_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_GRP_H 1 @@ -166,9 +163,6 @@ /* Define to use MIT kerberos */ #cmakedefine HAVE_MIT_KERBEROS 1 -/* Define to 1 if you have the `mkstemps' function. */ -#cmakedefine HAVE_MKSTEMPS 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_NETDB_H 1 @@ -226,9 +220,6 @@ /* Define to 1 if you have the optreset variable */ #cmakedefine HAVE_OPTRESET 1 -/* Define if sa_len field exists in struct sockaddr */ -#cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1 - /* Define to 1 if you want to playing SBC by standalone BlueZ SBC library */ #cmakedefine HAVE_SBC 1 @@ -265,24 +256,15 @@ /* Define to 1 if `st_birthtime' is a member of `struct stat'. */ #cmakedefine HAVE_STRUCT_STAT_ST_BIRTHTIME 1 -/* Define if st_flags field exists in struct stat */ -#cmakedefine HAVE_STRUCT_STAT_ST_FLAGS 1 - /* Define if st_blksize field exists in struct stat */ #cmakedefine HAVE_STRUCT_STAT_ST_BLKSIZE 1 /* Define to 1 if `__st_birthtime' is a member of `struct stat'. */ #cmakedefine HAVE_STRUCT_STAT___ST_BIRTHTIME 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_IOCTL_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_SOCKET_H 1 -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_SOCKIO_H 1 - /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_TIME_H 1