diff options
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 20 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 6 |
2 files changed, 20 insertions, 6 deletions
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 0d54c644b0..4a59f05511 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -100,16 +100,24 @@ ENDIF(PCAP_LIBRARIES) INCLUDE(CheckFunctionExists) SET(CMAKE_REQUIRED_INCLUDES ${PCAP_INCLUDE_DIRS}) SET(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARIES}) +CHECK_FUNCTION_EXISTS("pcap_open_dead" HAVE_PCAP_OPEN_DEAD) +CHECK_FUNCTION_EXISTS("pcap_freecode" HAVE_PCAP_FREECODE) +# +# Note: for pcap_breakloop() and pcap_findalldevs(), the autoconf script +# checks for more than just whether the function exists, it also checks +# for whether pcap.h declares it; Mac OS X software/security updates can +# update libpcap without updating the headers. +# CHECK_FUNCTION_EXISTS("pcap_breakloop" HAVE_PCAP_BREAKLOOP) -CHECK_FUNCTION_EXISTS("pcap_datalink_name_to_val" HAVE_PCAP_DATALINK_NAME_TO_VAL) -CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_name" HAVE_PCAP_DATALINK_VAL_TO_NAME) CHECK_FUNCTION_EXISTS("pcap_findalldevs" HAVE_PCAP_FINDALLDEVS) -CHECK_FUNCTION_EXISTS("pcap_freecode" HAVE_PCAP_FREECODE) -CHECK_FUNCTION_EXISTS("pcap_get_selectable_fd" HAVE_PCAP_GET_SELECTABLE_FD) -CHECK_FUNCTION_EXISTS("pcap_lib_version" HAVE_PCAP_LIB_VERSION) +CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_name" HAVE_PCAP_DATALINK_VAL_TO_NAME) +CHECK_FUNCTION_EXISTS("pcap_datalink_name_to_val" HAVE_PCAP_DATALINK_NAME_TO_VAL) +CHECK_FUNCTION_EXISTS("pcap_datalink_val_to_description" HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION) CHECK_FUNCTION_EXISTS("pcap_list_datalinks" HAVE_PCAP_LIST_DATALINKS) -CHECK_FUNCTION_EXISTS("pcap_open_dead" HAVE_PCAP_OPEN_DEAD) CHECK_FUNCTION_EXISTS("pcap_set_datalink" HAVE_PCAP_SET_DATALINK) +CHECK_FUNCTION_EXISTS("pcap_lib_version" HAVE_PCAP_LIB_VERSION) +CHECK_FUNCTION_EXISTS("pcap_get_selectable_fd" HAVE_PCAP_GET_SELECTABLE_FD) +CHECK_FUNCTION_EXISTS("pcap_free_datalinks" HAVE_PCAP_FREE_DATALINKS) INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCAP DEFAULT_MSG PCAP_INCLUDE_DIRS PCAP_LIBRARIES) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 14a364aaa5..fcfcd9963a 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -178,6 +178,9 @@ /* Define to 1 if you have the `pcap_datalink_name_to_val' function. */ #cmakedefine HAVE_PCAP_DATALINK_NAME_TO_VAL 1 +/* Define to 1 if you have the `pcap_datalink_val_to_description' function. */ +#cmakedefine HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1 + /* Define to 1 if you have the `pcap_datalink_val_to_name' function. */ #cmakedefine HAVE_PCAP_DATALINK_VAL_TO_NAME 1 @@ -188,6 +191,9 @@ /* Define to 1 if you have the `pcap_freecode' function. */ #cmakedefine HAVE_PCAP_FREECODE 1 +/* Define to 1 if you have the `pcap_free_datalinks' function. */ +#cmakedefine HAVE_PCAP_FREE_DATALINKS 1 + /* Define to 1 if you have the `pcap_get_selectable_fd' function. */ #cmakedefine HAVE_PCAP_GET_SELECTABLE_FD 1 |