From f06dee779438d85da6fc1eeca310fd8a19d3b5b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Mon, 16 Jul 2012 01:11:18 +0300
Subject: [PATCH] configure: Move the getaddrinfo function check into the
network block
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This makes the two checks (general vs winsock) fit in better.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index de2f4185a5d..6b46ee4e029 100755
--- a/configure
+++ b/configure
@@ -2836,6 +2836,7 @@ if enabled network; then
check_type "sys/types.h sys/socket.h" "struct sockaddr_storage"
check_struct "sys/types.h sys/socket.h" "struct sockaddr" sa_len
check_header netinet/sctp.h
+ check_func getaddrinfo $network_extralibs
# Prefer arpa/inet.h over winsock2
if check_header arpa/inet.h ; then
check_func closesocket
@@ -2844,6 +2845,7 @@ if enabled network; then
network_extralibs="-lws2" || \
{ check_func_headers winsock2.h closesocket -lws2_32 && \
network_extralibs="-lws2_32"; }
+ check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
check_type ws2tcpip.h socklen_t
check_type ws2tcpip.h "struct addrinfo"
check_type ws2tcpip.h "struct group_source_req"
@@ -2863,8 +2865,6 @@ check_func nanosleep || { check_func nanosleep -lrt && add_extralibs -lrt; }
check_func fcntl
check_func fork
-check_func getaddrinfo $network_extralibs ||
- check_func_headers ws2tcpip.h getaddrinfo $network_extralibs
check_func gethrtime
check_func getopt
check_func getrusage
--
GitLab