Commit 36eec032 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6adf4290'

* commit '6adf4290':
  configure: Move inet_aton check into network function check block
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 490215cb 6adf4290
...@@ -4286,6 +4286,7 @@ if ! disabled network; then ...@@ -4286,6 +4286,7 @@ if ! disabled network; then
check_type netinet/sctp.h "struct sctp_event_subscribe" check_type netinet/sctp.h "struct sctp_event_subscribe"
check_func getaddrinfo $network_extralibs check_func getaddrinfo $network_extralibs
check_func getservbyport $network_extralibs check_func getservbyport $network_extralibs
check_func inet_aton $network_extralibs
# Prefer arpa/inet.h over winsock2 # Prefer arpa/inet.h over winsock2
if check_header arpa/inet.h ; then if check_header arpa/inet.h ; then
check_func closesocket check_func closesocket
...@@ -4322,7 +4323,6 @@ check_func getopt ...@@ -4322,7 +4323,6 @@ check_func getopt
check_func getrusage check_func getrusage
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func gettimeofday check_func gettimeofday
check_func inet_aton $network_extralibs
check_func isatty check_func isatty
check_func localtime_r check_func localtime_r
check_func ${malloc_prefix}memalign && enable memalign check_func ${malloc_prefix}memalign && enable memalign
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment