[FFmpeg-cvslog] r19431 - trunk/configure

diego subversion
Tue Jul 14 16:02:09 CEST 2009


Author: diego
Date: Tue Jul 14 16:02:09 2009
New Revision: 19431

Log:
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

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Jul 14 15:50:05 2009	(r19430)
+++ trunk/configure	Tue Jul 14 16:02:09 2009	(r19431)
@@ -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



More information about the ffmpeg-cvslog mailing list