summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2009-07-14 14:02:09 +0000
committerDiego Biurrun <diego@biurrun.de>2009-07-14 14:02:09 +0000
commitf4c13872492b1b5ea3d1d06b7b70f4d3562aa985 (patch)
treef37111f303e9ce6adb578f3ec1dc9b2a96bc2cbe /configure
parent1764e4bc5a0c88ab9040b47a2d67a6f15501f21f (diff)
Improve linker check for Winsock library name.
On Windows CE, the Winsock library name is ws2, not ws2_32. patch by Martin Storsjö, martin martin st Originally committed as revision 19431 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 5a914fbdec..a700220fbc 100755
--- a/configure
+++ b/configure
@@ -2216,9 +2216,11 @@ if enabled network; then
if check_header arpa/inet.h ; then
check_func closesocket
elif check_header winsock2.h ; then
- network_extralibs="-lws2_32"
+ check_func_headers winsock2.h closesocket -lws2 && \
+ network_extralibs="-lws2" || \
+ { check_func_headers winsock2.h closesocket -lws2_32 && \
+ network_extralibs="-lws2_32"; }
check_type ws2tcpip.h socklen_t
- check_func_headers winsock2.h closesocket
else
disable network
fi