[FFmpeg-cvslog] configure: Revert sdl hunk of 4fa18c56. This breaks OSX

Michael Niedermayer git at videolan.org
Tue May 10 03:32:14 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 10 03:22:04 2011 +0200| [ca87d439065c705311d0a98076df3c021b187adb] | committer: Michael Niedermayer

configure: Revert sdl hunk of 4fa18c56. This breaks OSX

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/configure b/configure
index 165fc26..66081f4 100755
--- a/configure
+++ b/configure
@@ -2941,7 +2941,11 @@ if enabled libdc1394; then
     die "ERROR: No version of libdc1394 found "
 fi
 
-if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
+SDL_CONFIG="${cross_prefix}sdl-config"
+if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+    sdl_cflags=$("${SDL_CONFIG}" --cflags)
+    sdl_libs=$("${SDL_CONFIG}" --libs)
+    check_func_headers SDL.h SDL_Init $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



More information about the ffmpeg-cvslog mailing list