diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:22:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 19:23:32 +0300 |
| commit | f38efd166e43f5cae783f38f9913d2859557143e (patch) | |
| tree | 38f49af429d4147e390f0b52384294b2e35b9d6f /configure | |
| parent | 7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff) | |
| parent | 4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff) | |
| download | mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2 mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz | |
Merge svn changes up to r31097
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 1 insertions, 12 deletions
@@ -3234,8 +3234,6 @@ if test "$_malloc" = yes ; then else def_malloc_h='#define HAVE_MALLOC_H 0' fi -# malloc.h emits a warning in FreeBSD and OpenBSD -freebsd || openbsd || dragonfly && def_malloc_h='#define HAVE_MALLOC_H 0' echores "$_malloc" @@ -4496,7 +4494,7 @@ if test "$_vidix" = auto ; then _vidix=no x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \ && _vidix=yes - x86_64 && win32 && _vidix=no + x86_64 && ! linux && _vidix=no (ppc || alpha) && linux && _vidix=yes fi echores "$_vidix" @@ -5125,15 +5123,7 @@ EOF _ld_tmp="$($_sdlconfig --libs)" fi if cc_check $_inc_tmp $_ld_tmp >>"$TMPLOG" 2>&1 ; then - _sdlversion=$($_sdlconfig --version | sed 's/[^0-9]//g') - if test "$_sdlversion" -gt 116 ; then - if test "$_sdlversion" -lt 121 ; then - def_sdlbuggy='#define BUGGY_SDL' - else - def_sdlbuggy='#undef BUGGY_SDL' - fi _sdl=yes - fi fi fi fi @@ -8410,7 +8400,6 @@ $def_quartz $def_s3fb $def_sdl $def_sdl_sdl_h -$def_sdlbuggy $def_svga $def_tdfxfb $def_tdfxvid |