virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-19 05:33:15 +02:00
Code Issues Releases Activity

Group network checks together

Browse Source 
Originally committed as revision 10209 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2007-08-24 15:10:04 +00:00
parent b1312aa24d
commit 73b46a95d2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -1192,7 +1192,6 @@ case $targetos in
SLIB_EXTRA_CMD="-lib /machine:i386 /def:\$(@:${SLIBSUF}=.def)" 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)\"" 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" 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*) cygwin*)
targetos=cygwin targetos=cygwin
@ -1542,9 +1541,6 @@ check_func gethrtime
check_header termios.h check_header termios.h
check_header conio.h check_header conio.h
check_header arpa/inet.h
check_header winsock2.h
check_func inet_aton check_func inet_aton
enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no" enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"
@ -1631,8 +1627,6 @@ check_func getrusage
check_func2 windows.h GetProcessTimes check_func2 windows.h GetProcessTimes
check_func fork check_func fork
check_func closesocket ||
check_func2 winsock2.h closesocket
test "$vhook" = "default" && vhook="$dlopen" test "$vhook" = "default" && vhook="$dlopen"
@ -1687,6 +1681,19 @@ fi
texi2html -version >/dev/null 2>&1 && enable texi2html || disable texi2html 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 # IPv6 check