summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-09 17:55:34 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-09 17:55:34 +0000
commite0b789ec7bf2a23d6bb640f7635649d9a1c3d98f (patch)
treef6b0ab6377a4e6be84c27ca8aebca1e6c004fc95 /configure
parent5c5087081fcc119a5579ebac8e81f76cd3cf4a15 (diff)
downloadmpv-e0b789ec7bf2a23d6bb640f7635649d9a1c3d98f.tar.bz2
mpv-e0b789ec7bf2a23d6bb640f7635649d9a1c3d98f.tar.xz
Disable winsock when we already found a working socklib instead of checking
blindly for cygwin and uselessly running the check on e.g. Linux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29986 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 8092e75d61..16049ced48 100755
--- a/configure
+++ b/configure
@@ -3050,7 +3050,8 @@ _socklib=no
for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do
cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break
done
-if test $_winsock2_h = auto && ! cygwin ; then
+test $_socklib = yes && test $_winsock2_h = auto && _winsock2_h=no
+if test $_winsock2_h = auto ; then
_winsock2_h=no
cat > $TMPC << EOF
#include <winsock2.h>