diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 23:18:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 23:18:11 +0100 |
| commit | 36eec03211820b5b58795a8ae3521f20cd0285df (patch) | |
| tree | efa4c45748cb4d01e8b8a639ac6047e4c96c7612 /configure | |
| parent | 490215cbd70ef3e5f0b7cf544f1980bd6e55042e (diff) | |
| parent | 6adf4290ebcf65ac8243d74f34ba0a508f561633 (diff) | |
| download | ffmpeg-36eec03211820b5b58795a8ae3521f20cd0285df.tar.gz | |
Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'
* commit '6adf4290ebcf65ac8243d74f34ba0a508f561633':
configure: Move inet_aton check into network function check block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4286,6 +4286,7 @@ if ! disabled network; then check_type netinet/sctp.h "struct sctp_event_subscribe" check_func getaddrinfo $network_extralibs check_func getservbyport $network_extralibs + check_func inet_aton $network_extralibs # Prefer arpa/inet.h over winsock2 if check_header arpa/inet.h ; then check_func closesocket @@ -4322,7 +4323,6 @@ check_func getopt check_func getrusage check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_func gettimeofday -check_func inet_aton $network_extralibs check_func isatty check_func localtime_r check_func ${malloc_prefix}memalign && enable memalign |