From 4b8639f049e98870a48a1e2c250dd7234080568f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 19 Dec 2014 21:18:27 -0800 Subject: [PATCH] Add a check for floorl(). Also, we don't use NEED_STRPTIME_H, we use HAVE_STRPTIME. Change-Id: I330e8ce408c05b74c50f3369691283e35e68505c Reviewed-on: https://code.wireshark.org/review/5910 Reviewed-by: Guy Harris --- ConfigureChecks.cmake | 1 + cmakeconfig.h.in | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0919b98514..a6c9d85775 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -79,6 +79,7 @@ set(CMAKE_REQUIRED_LIBRARIES %{CMAKE_DL_LIBS}) check_function_exists("dladdr" HAVE_DLADDR) cmake_pop_check_state() +check_function_exists("floorl" HAVE_FLOORL) check_function_exists("gethostbyname2" HAVE_GETHOSTBYNAME2) check_function_exists("getopt" HAVE_GETOPT) check_function_exists("getprotobynumber" HAVE_GETPROTOBYNUMBER) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 1303adbc7f..042816633f 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -66,6 +66,9 @@ /* Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later) */ #cmakedefine HAVE_GEOIP_V6 1 +/* Define if you have the 'floorl' function. */ +#cmakedefine HAVE_FLOORL 1 + /* Define to 1 if you have the `gethostbyname2' function. */ #cmakedefine HAVE_GETHOSTBYNAME2 1 @@ -284,6 +287,9 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_STRING_H 1 +/* Define if you have the 'strptime' function. */ +#cmakedefine HAVE_STRPTIME 1 + /* Define if st_flags field exists in struct stat */ #cmakedefine HAVE_ST_FLAGS 1 @@ -338,9 +344,6 @@ /* Define if inet/v6defs.h needs to be included */ #cmakedefine NEED_INET_V6DEFS_H 1 -/* Define if strptime.h needs to be included */ -#cmakedefine NEED_STRPTIME_H 1 - /* Name of package */ #cmakedefine PACKAGE