[FFmpeg-devel] [PATCH] fix post r9988 Cygwin builds

[Ramiro Polla]

M?ns Rullg?rd wrote:
> Ramiro Polla <ramiro at lisha.ufsc.br> writes:
>
>   
>> M?ns Rullg?rd wrote:
>>     
>>> "V?ctor Paesa" <wzrlpy at arsystel.com> writes:
>>>
>>>
>>>       
>>>> Hi,
>>>>
>>>> The attached patch (from Ramiro) fixes post SVN-r9988 Cygwin builds,
>>>> as discussed here:
>>>>
>>>> http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/2007-August/008963.html
>>>>
>>>> Another patch to fix cross-compiles for MinGW under Cygwin is yet needed.
>>>>
>>>> OK to commit?
>>>>
>>>> Regards,
>>>> V?ctor
>>>>
>>>>
>>>> Index: configure
>>>> ===================================================================
>>>> --- configure	(revision 10065)
>>>> +++ configure	(working copy)
>>>> @@ -1537,8 +1538,10 @@
>>>>  check_header termios.h
>>>>  check_header conio.h
>>>>  -check_header arpa/inet.h
>>>> -check_header winsock2.h
>>>> +enabled network &&
>>>> +check_header arpa/inet.h ||
>>>> +check_header winsock2.h ||
>>>> +disable network
>>>>
>>>>         
>>> Adding
>>>
>>> network_deps_any="arpa_inet_h winsock2_h"
>>>
>>> seems simpler.
>>>
>>>
>>>       
>> Two patches attached.
>>
>> Ramiro Polla
>> Index: configure
>> ===================================================================
>> --- configure	(revision 10072)
>> +++ configure	(working copy)
>> @@ -1537,7 +1537,7 @@
>>  check_header termios.h
>>  check_header conio.h
>>
>> -check_header arpa/inet.h
>> +check_header arpa/inet.h ||
>>  check_header winsock2.h
>>     
>
> Why the || ?
>
>   

This is the fix for Cygwin, which has both arpa/inet.h and winsock2.h. 
It can't use both.

>>  check_func inet_aton
>> Index: configure
>> ===================================================================
>> --- configure	(revision 10072)
>> +++ configure	(working copy)
>> @@ -766,6 +766,7 @@
>>  libxvid_encoder_deps="libxvid"
>>
>>  # demuxers / muxers
>> +network_deps_any="arpa_inet_h winsock2_h"
>>     
>
> Wrong place.
>
>   

Indeed, I'll put it in alphabetical order. Is it wrong because it's not 
in alphabetical order, or because of something else?

Ramiro Polla