diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:31:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:31:46 +0100 |
| commit | b94df21a5164c7f1591935deccc13f85d8c43717 (patch) | |
| tree | 5fcd0f9edb3359bf6051c7043f6c951ce3a8c545 /configure | |
| parent | d469fa1923958f98df9d9b0a9cc167248d8516fb (diff) | |
| parent | 2eaa3663fda750dac66d41fe8541a8744d5563a4 (diff) | |
| download | ffmpeg-b94df21a5164c7f1591935deccc13f85d8c43717.tar.gz | |
Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'
* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
avplay: enable only when SDL 1.2 is found
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -1460,7 +1460,6 @@ HAVE_LIST=" rsync_contimeout sched_getaffinity sdl - sdl_video_size SetConsoleTextAttribute setmode setrlimit @@ -4001,16 +4000,16 @@ fi SDL_CONFIG="${cross_prefix}sdl-config" if check_pkg_config sdl SDL_events.h SDL_PollEvent; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && - enable sdl && - check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size + check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && + enable sdl else if "${SDL_CONFIG}" --version > /dev/null 2>&1; then sdl_cflags=$("${SDL_CONFIG}" --cflags) sdl_libs=$("${SDL_CONFIG}" --libs) check_func_headers SDL_version.h SDL_Linked_Version $sdl_cflags $sdl_libs && check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && - enable sdl && - check_struct SDL.h SDL_VideoInfo current_w $sdl_cflags && enable sdl_video_size + check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && + enable sdl fi fi enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs |