[FFmpeg-cvslog] configure: Fix SDL detection on OSX and win32

Kyle git at videolan.org
Wed May 11 20:25:35 CEST 2011


ffmpeg | branch: master | Kyle <kshawkeye at gmail.com> | Wed May 11 20:22:33 2011 +0200| [de545d2491c5d0013b16fec71696ab93e9997461] | committer: Michael Niedermayer

configure: Fix SDL detection on OSX and win32

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de545d2491c5d0013b16fec71696ab93e9997461
---

 configure |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index d4e961b..2fa0f3a 100755
--- a/configure
+++ b/configure
@@ -2946,6 +2946,12 @@ if "${SDL_CONFIG}" --version > /dev/null 2>&1; 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
+else
+    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
+    fi
 fi
 
 texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html



More information about the ffmpeg-cvslog mailing list