summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index 3bd8adcc11..78fcf6716f 100755
--- a/configure
+++ b/configure
@@ -2962,7 +2962,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>
@@ -6972,7 +6973,7 @@ if test "$_x264" = auto ; then
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
-#if X264_BUILD < 78
+#if X264_BUILD < 79
#error We do not support old versions of x264. Get the latest from git.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }