diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2007-08-24 15:10:04 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2007-08-24 15:10:04 +0000 |
| commit | 73b46a95d2ebb51bf2cd0ca407106d76ab851822 (patch) | |
| tree | 71de1eb407cf15475ae32adbf8ab9292188c1003 /configure | |
| parent | b1312aa24db3d4bfd6968c76983b7aceb6d88801 (diff) | |
| download | ffmpeg-73b46a95d2ebb51bf2cd0ca407106d76ab851822.tar.gz | |
Group network checks together
Originally committed as revision 10209 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 13 insertions, 6 deletions
@@ -1192,7 +1192,6 @@ case $targetos in SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)" SLIB_INSTALL_EXTRA_CMD="-install -m 644 \$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib) \"\$(SHLIBDIR)/\$(SLIBNAME_WITH_MAJOR:\$(SLIBSUF)=.lib)\"" SHFLAGS="-shared -Wl,--output-def,\$(@:${SLIBSUF}=.def),--out-implib,lib\$(SLIBNAME:\$(SLIBSUF)=.dll.a) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base" - enabled network && add_extralibs -lws2_32 ;; cygwin*) targetos=cygwin @@ -1542,9 +1541,6 @@ check_func gethrtime check_header termios.h check_header conio.h -check_header arpa/inet.h -check_header winsock2.h - check_func inet_aton enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no" @@ -1631,8 +1627,6 @@ check_func getrusage check_func2 windows.h GetProcessTimes check_func fork -check_func closesocket || - check_func2 winsock2.h closesocket test "$vhook" = "default" && vhook="$dlopen" @@ -1688,6 +1682,19 @@ fi texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html ########################################## +# Network check + +if enabled network; then + # Prefer arpa/inet.h over winsock2 + if check_header arpa/inet.h ; then + check_func closesocket + elif check_header winsock2.h ; then + add_extralibs -lws2_32 + check_func2 winsock2.h closesocket + fi +fi + +########################################## # IPv6 check enabled network && enabled ipv6 && check_ld <<EOF && ipv6=yes || ipv6=no |