[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 123/163: configure: remove CURL_CHECK_NI_WITHSCOPEI
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 123/163: configure: remove CURL_CHECK_NI_WITHSCOPEID too |
Date: |
Sun, 05 Aug 2018 12:37:29 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit a10c974e1a5c853354ad54c574ad22e1ed46ea9f
Author: Daniel Stenberg <address@hidden>
AuthorDate: Wed Jun 27 13:52:57 2018 +0200
configure: remove CURL_CHECK_NI_WITHSCOPEID too
Since it isn't used either and requires the getnameinfo check
Follow-up to 0aeca41702d2
---
acinclude.m4 | 101 -----------------------------------------------------------
configure.ac | 1 -
2 files changed, 102 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index b72839e3a..f32e86cda 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -997,107 +997,6 @@ AC_DEFUN([TYPE_SOCKADDR_STORAGE],
])
])
-
-dnl CURL_CHECK_NI_WITHSCOPEID
-dnl -------------------------------------------------
-dnl Check for working NI_WITHSCOPEID in getnameinfo()
-
-AC_DEFUN([CURL_CHECK_NI_WITHSCOPEID], [
- AC_REQUIRE([CURL_CHECK_FUNC_GETNAMEINFO])dnl
- AC_REQUIRE([TYPE_SOCKADDR_STORAGE])dnl
- AC_CHECK_HEADERS(stdio.h sys/types.h sys/socket.h \
- netdb.h netinet/in.h arpa/inet.h)
- #
- AC_CACHE_CHECK([for working NI_WITHSCOPEID],
- [curl_cv_working_ni_withscopeid], [
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([[
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
- ]],[[
-#if defined(NI_WITHSCOPEID) && defined(HAVE_GETNAMEINFO)
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
- struct sockaddr_storage sa;
-#else
- unsigned char sa[256];
-#endif
- char hostbuf[NI_MAXHOST];
- int rc;
- GETNAMEINFO_TYPE_ARG2 salen = (GETNAMEINFO_TYPE_ARG2)sizeof(sa);
- GETNAMEINFO_TYPE_ARG46 hostlen =
(GETNAMEINFO_TYPE_ARG46)sizeof(hostbuf);
- GETNAMEINFO_TYPE_ARG7 flags = NI_NUMERICHOST | NI_NUMERICSERV |
NI_WITHSCOPEID;
- int fd = socket(AF_INET6, SOCK_STREAM, 0);
- if(fd < 0) {
- perror("socket()");
- return 1; /* Error creating socket */
- }
- rc = getsockname(fd, (GETNAMEINFO_TYPE_ARG1)&sa, &salen);
- if(rc) {
- perror("getsockname()");
- return 2; /* Error retrieving socket name */
- }
- rc = getnameinfo((GETNAMEINFO_TYPE_ARG1)&sa, salen, hostbuf, hostlen,
NULL, 0, flags);
- if(rc) {
- printf("rc = %s\n", gai_strerror(rc));
- return 3; /* Error translating socket address */
- }
- return 0; /* Ok, NI_WITHSCOPEID works */
-#else
- return 4; /* Error, NI_WITHSCOPEID not defined or no getnameinfo() */
-#endif
- ]]) # AC-LANG-PROGRAM
- ],[
- # Exit code == 0. Program worked.
- curl_cv_working_ni_withscopeid="yes"
- ],[
- # Exit code != 0. Program failed.
- curl_cv_working_ni_withscopeid="no"
- ],[
- # Program is not run when cross-compiling. So we assume
- # NI_WITHSCOPEID will work if we are able to compile it.
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([[
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
- ]],[[
- unsigned int dummy= NI_NUMERICHOST | NI_NUMERICSERV | NI_WITHSCOPEID;
- ]])
- ],[
- curl_cv_working_ni_withscopeid="yes"
- ],[
- curl_cv_working_ni_withscopeid="no"
- ]) # AC-COMPILE-IFELSE
- ]) # AC-RUN-IFELSE
- ]) # AC-CACHE-CHECK
- case "$curl_cv_working_ni_withscopeid" in
- yes)
- AC_DEFINE(HAVE_NI_WITHSCOPEID, 1,
- [Define to 1 if NI_WITHSCOPEID exists and works.])
- ;;
- esac
-])
-
-
dnl CURL_CHECK_FUNC_RECV
dnl -------------------------------------------------
dnl Test if the socket recv() function is available,
diff --git a/configure.ac b/configure.ac
index fb1a70e60..22280a5e9 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3659,7 +3659,6 @@ if test "$ipv6" = "yes"; then
IPV6_ENABLED=1
AC_SUBST(IPV6_ENABLED)
fi
- CURL_CHECK_NI_WITHSCOPEID
fi
CURL_CHECK_NONBLOCKING_SOCKET
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 89/163: progress: remove a set of unused defines, (continued)
- [GNUnet-SVN] [gnurl] 89/163: progress: remove a set of unused defines, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 70/163: axtls: follow-up spell fix of comment, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 91/163: KNOWN_BUGS: slow connect to localhost on Windows, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 80/163: openssl: assume engine support in 1.0.1 or later, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 136/163: DEPRECATE: include year when specifying date, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 95/163: configure: enhance ability to detect/build with static openssl, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 108/163: cmake: allow multiple SSL backends, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 86/163: runtests: support variables in <strippart>, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 107/163: url: fix dangling conn->data pointer, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 109/163: system.h: fix for gcc on 32 bit OpenServer, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 123/163: configure: remove CURL_CHECK_NI_WITHSCOPEID too,
gnunet <=
- [GNUnet-SVN] [gnurl] 112/163: CURLOPT_SSL_VERIFYPEER.3: Add performance note, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 88/163: TODO: "Option to refuse usernames in URLs" done, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 126/163: openssl: allow TLS 1.3 by default, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 61/163: KNOWN_BUGS: CURL_GLOBAL_SSL, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 57/163: option: disallow username in URL, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 102/163: runtests.pl: remove debug leftover from bb9a340c73f3, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 87/163: Curl_init_do: handle NULL connection pointer passed in, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 146/163: scripts: include _curl as part of CLEANFILES, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 105/163: travis: run more tests for coverage check, gnunet, 2018/08/05
- [GNUnet-SVN] [gnurl] 99/163: RELEASE-PROCEDURE: gpg sign the tags, gnunet, 2018/08/05