diff options
author | Gergely Nagy <ngg@tresorit.com> | 2021-06-18 10:04:38 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2021-06-18 13:52:10 +0200 |
commit | 343e6beda38f2142a3237c5391327408136bcd2b (patch) | |
tree | 347fec5013d1a3f6d4b7ae43a56fceca5f02fe21 | |
parent | 9bf0e7b2efbdf18902ea6f1deae1aefc0ac4cc79 (diff) | |
download | curl-343e6beda38f2142a3237c5391327408136bcd2b.tar.gz |
configure/cmake: remove unused define HAVE_FREEIFADDRS
Closes #7276
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | lib/config-vxworks.h | 3 | ||||
-rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
-rw-r--r-- | m4/curl-functions.m4 | 84 |
5 files changed, 0 insertions, 92 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 45211b270..449ea0f04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1048,7 +1048,6 @@ check_symbol_exists(siginterrupt "${CURL_INCLUDES}" HAVE_SIGINTERRUPT) check_symbol_exists(perror "${CURL_INCLUDES}" HAVE_PERROR) check_symbol_exists(getaddrinfo "${CURL_INCLUDES}" HAVE_GETADDRINFO) check_symbol_exists(freeaddrinfo "${CURL_INCLUDES}" HAVE_FREEADDRINFO) -check_symbol_exists(freeifaddrs "${CURL_INCLUDES}" HAVE_FREEIFADDRS) check_symbol_exists(pipe "${CURL_INCLUDES}" HAVE_PIPE) check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE) check_symbol_exists(getprotobyname "${CURL_INCLUDES}" HAVE_GETPROTOBYNAME) diff --git a/configure.ac b/configure.ac index aea7b3cfb..f82c0b2b0 100644 --- a/configure.ac +++ b/configure.ac @@ -3219,7 +3219,6 @@ CURL_CHECK_FUNC_CLOSESOCKET_CAMEL CURL_CHECK_FUNC_CONNECT CURL_CHECK_FUNC_FCNTL CURL_CHECK_FUNC_FREEADDRINFO -CURL_CHECK_FUNC_FREEIFADDRS CURL_CHECK_FUNC_FSETXATTR CURL_CHECK_FUNC_FTRUNCATE CURL_CHECK_FUNC_GETADDRINFO diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index a3e6126f5..4436dcb88 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -131,9 +131,6 @@ /* Define to 1 if you have the freeaddrinfo function. */ #define HAVE_FREEADDRINFO 1 -/* Define to 1 if you have the freeifaddrs function. */ -#define HAVE_FREEIFADDRS 1 - /* Define to 1 if you have the ftruncate function. */ #define HAVE_FTRUNCATE 1 diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index 6a638824d..a1e271c55 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -163,9 +163,6 @@ /* Define to 1 if you have the freeaddrinfo function. */ #cmakedefine HAVE_FREEADDRINFO 1 -/* Define to 1 if you have the freeifaddrs function. */ -#cmakedefine HAVE_FREEIFADDRS 1 - /* Define to 1 if you have the ftruncate function. */ #cmakedefine HAVE_FTRUNCATE 1 diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4 index a5266ce9b..fce5724cb 100644 --- a/m4/curl-functions.m4 +++ b/m4/curl-functions.m4 @@ -1543,90 +1543,6 @@ AC_DEFUN([CURL_CHECK_FUNC_FREEADDRINFO], [ ]) -dnl CURL_CHECK_FUNC_FREEIFADDRS -dnl ------------------------------------------------- -dnl Verify if freeifaddrs is available, prototyped, and -dnl can be compiled. If all of these are true, and -dnl usage has not been previously disallowed with -dnl shell variable curl_disallow_freeifaddrs, then -dnl HAVE_FREEIFADDRS will be defined. - -AC_DEFUN([CURL_CHECK_FUNC_FREEIFADDRS], [ - AC_REQUIRE([CURL_INCLUDES_IFADDRS])dnl - # - tst_links_freeifaddrs="unknown" - tst_proto_freeifaddrs="unknown" - tst_compi_freeifaddrs="unknown" - tst_allow_freeifaddrs="unknown" - # - AC_MSG_CHECKING([if freeifaddrs can be linked]) - AC_LINK_IFELSE([ - AC_LANG_FUNC_LINK_TRY([freeifaddrs]) - ],[ - AC_MSG_RESULT([yes]) - tst_links_freeifaddrs="yes" - ],[ - AC_MSG_RESULT([no]) - tst_links_freeifaddrs="no" - ]) - # - if test "$tst_links_freeifaddrs" = "yes"; then - AC_MSG_CHECKING([if freeifaddrs is prototyped]) - AC_EGREP_CPP([freeifaddrs],[ - $curl_includes_ifaddrs - ],[ - AC_MSG_RESULT([yes]) - tst_proto_freeifaddrs="yes" - ],[ - AC_MSG_RESULT([no]) - tst_proto_freeifaddrs="no" - ]) - fi - # - if test "$tst_proto_freeifaddrs" = "yes"; then - AC_MSG_CHECKING([if freeifaddrs is compilable]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ - $curl_includes_ifaddrs - ]],[[ - freeifaddrs(0); - ]]) - ],[ - AC_MSG_RESULT([yes]) - tst_compi_freeifaddrs="yes" - ],[ - AC_MSG_RESULT([no]) - tst_compi_freeifaddrs="no" - ]) - fi - # - if test "$tst_compi_freeifaddrs" = "yes"; then - AC_MSG_CHECKING([if freeifaddrs usage allowed]) - if test "x$curl_disallow_freeifaddrs" != "xyes"; then - AC_MSG_RESULT([yes]) - tst_allow_freeifaddrs="yes" - else - AC_MSG_RESULT([no]) - tst_allow_freeifaddrs="no" - fi - fi - # - AC_MSG_CHECKING([if freeifaddrs might be used]) - if test "$tst_links_freeifaddrs" = "yes" && - test "$tst_proto_freeifaddrs" = "yes" && - test "$tst_compi_freeifaddrs" = "yes" && - test "$tst_allow_freeifaddrs" = "yes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED(HAVE_FREEIFADDRS, 1, - [Define to 1 if you have the freeifaddrs function.]) - curl_cv_func_freeifaddrs="yes" - else - AC_MSG_RESULT([no]) - curl_cv_func_freeifaddrs="no" - fi -]) - - dnl CURL_CHECK_FUNC_FREMOVEXATTR dnl ------------------------------------------------- dnl Verify if fremovexattr is available, prototyped, and |