diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-18 18:54:42 +0200 |
| commit | efcc9ad7120e01a17fc3659cb0229135b1cebb95 (patch) | |
| tree | eb15edb75377eedd5d7397209e8c0d594020663e /configure | |
| parent | 1598302be65c77c107330dc46fd0dabface3112d (diff) | |
| parent | 8fcbe5835d038649e70da410d46c4f5cd502c261 (diff) | |
| download | mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.bz2 mpv-efcc9ad7120e01a17fc3659cb0229135b1cebb95.tar.xz | |
Merge svn changes up to r30055
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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; } |