From: Martin Storsjö Date: Wed, 28 Mar 2012 17:37:13 +0000 (+0300) Subject: configure: Check for a different SDL function X-Git-Tag: android-x86-4.4-r1~8529^2~2400 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9bd41bb191f7c3bb6edeeb3b09bd2c6d6e4aa677;p=android-x86%2Fexternal-ffmpeg.git configure: Check for a different SDL function This one is available both in SDL 1.2 and in 1.3 (which is the current version available e.g. in macports), while 1.3 doesn't contain SDL_Linked_Version(). The current check for SDL_Linked_Version() (available since SDL 1.2.13) was added in 8f1b06c8, because including the headers for SDL_Init() redirects the main() function, requiring the main function signature to match the one of SDL_main (including argc/argv). Signed-off-by: Martin Storsjö --- diff --git a/configure b/configure index 7418bcadd5..4606b236e3 100755 --- a/configure +++ b/configure @@ -2983,7 +2983,7 @@ if enabled libdc1394; then die "ERROR: No version of libdc1394 found " fi -if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then +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