Mercurial > mplayer.hg

changeset 29944:72279983abb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable winsock when we already found a working socklib instead of checking blindly for cygwin and uselessly running the check on e.g. Linux.
author reimar
date Wed, 09 Dec 2009 17:55:34 +0000
parents 1752ec1e845a
children 38485def91ba
files configure
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Wed Dec 09 17:52:18 2009 +0000
+++ b/configure	Wed Dec 09 17:55:34 2009 +0000
@@ -3050,7 +3050,8 @@
 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>