aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2011-03-19 15:45:48 +0100
committerLuca Barbato <lu_zero@gentoo.org>2011-03-19 16:39:54 +0100
commit8f1b06c81c7cc9ffc239bf1752abd9244793a48f (patch)
tree34143e66298d3f22e9027ae416e7faa15c433e0e
parent42cfb3835b5dad327b7dc22740e8b6e482ecfcd2 (diff)
downloadffmpeg-8f1b06c81c7cc9ffc239bf1752abd9244793a48f.tar.gz
configure: check for SDL_Linked_Version instead of SDL_Init
This avoids the main/SDL_main declaration clash caused by SDL on Windows and other platforms.
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 7b89564b25..59dce9527a 100755
--- a/configure
+++ b/configure
@@ -2886,7 +2886,7 @@ if enabled libdc1394; then
die "ERROR: No version of libdc1394 found "
fi
-if check_pkg_config sdl SDL.h SDL_Init; then
+if check_pkg_config sdl SDL_version.h SDL_Linked_Version; 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