aboutsummaryrefslogtreecommitdiffstats
path: root/ConfigureChecks.cmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-03-12 12:22:20 -0700
committerGerald Combs <gerald@wireshark.org>2018-03-12 22:11:32 +0000
commit2519115695634258b1b492cc07c8feb8dc925b2f (patch)
tree3d2e0cab5af83af2a46c5814c5265eaaa244bb1d /ConfigureChecks.cmake
parent1a52e085c1bc2afe770693b0f8c6a2530aa196d5 (diff)
Remove some unused or hard-coded header checks.
Remove some unused checks and code found using grep -o 'HAVE_[A-Z0-9_]*' ConfigureChecks.cmake | sort -u \ | while read have_h ; do echo = $have_h ; git --no-pager grep -cl $have_h ; done Change-Id: I86bfcfdc4f60d9d7de87017a7bb00f833a79bd2c Reviewed-on: https://code.wireshark.org/review/26451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ConfigureChecks.cmake')
-rw-r--r--ConfigureChecks.cmake13
1 files changed, 1 insertions, 12 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 7f553b98f0..1e7a75ae55 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -12,23 +12,14 @@ include(CMakePushCheckState)
#check system for includes
include(CheckIncludeFile)
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
-check_include_file("arpa/nameser.h" HAVE_ARPA_NAMESER_H)
-check_include_file("dlfcn.h" HAVE_DLFCN_H)
check_include_file("fcntl.h" HAVE_FCNTL_H)
check_include_file("getopt.h" HAVE_GETOPT_H)
check_include_file("grp.h" HAVE_GRP_H)
check_include_file("ifaddrs.h" HAVE_IFADDRS_H)
check_include_file("netinet/in.h" HAVE_NETINET_IN_H)
check_include_file("netdb.h" HAVE_NETDB_H)
-# We need to set the path to Wpdpack in order to find Ntddndis.h
-#cmake_push_check_state()
-#set(CMAKE_REQUIRED_INCLUDES ${PCAP_INCLUDE_DIRS})
-#check_include_file("Ntddndis.h" HAVE_NTDDNDIS_H)
-#cmake_pop_check_state()
-check_include_file("portaudio.h" HAVE_PORTAUDIO_H)
check_include_file("pwd.h" HAVE_PWD_H)
check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H)
-check_include_file("sys/param.h" HAVE_SYS_PARAM_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)
@@ -71,7 +62,6 @@ endif()
#Functions
include(CheckFunctionExists)
include(CheckSymbolExists)
-check_function_exists("chown" HAVE_CHOWN)
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS})
@@ -86,7 +76,7 @@ cmake_push_check_state()
set(CMAKE_REQUIRED_INCLUDES ${M_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${M_LIBRARIES})
check_symbol_exists("floorl" "math.h" HAVE_FLOORL)
-check_symbol_exists("lrint" "math.h" HAVE_LRINT)
+check_symbol_exists("lrint" "math.h" HAVE_LRINT) # GTK+ only
cmake_pop_check_state()
check_function_exists("getopt_long" HAVE_GETOPT_LONG)
@@ -99,7 +89,6 @@ if(HAVE_GETOPT_LONG)
endif()
check_function_exists("getifaddrs" HAVE_GETIFADDRS)
check_function_exists("issetugid" HAVE_ISSETUGID)
-check_function_exists("mkdtemp" HAVE_MKDTEMP)
check_function_exists("mkstemps" HAVE_MKSTEMPS)
check_function_exists("popcount" HAVE_POPCOUNT)
check_function_exists("setresgid" HAVE_SETRESGID)