[FFmpeg-cvslog] configure: check for SDL_Linked_Version instead of SDL_Init
Luca Barbato
git at videolan.org
Sat Mar 19 20:22:16 CET 2011
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Mar 19 15:45:48 2011 +0100| [8f1b06c81c7cc9ffc239bf1752abd9244793a48f] | committer: Luca Barbato
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.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f1b06c81c7cc9ffc239bf1752abd9244793a48f
---
configure | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 7b89564..59dce95 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
More information about the ffmpeg-cvslog
mailing list