]> git.sesse.net Git - ffmpeg/commitdiff
configure: Revert sdl hunk of 4fa18c56. This breaks OSX
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 May 2011 01:22:04 +0000 (03:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 May 2011 01:22:04 +0000 (03:22 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
configure

index 165fc26581ab3d2677c01dc939e8172b64a5909d..66081f4cada28ee6e3c54903c27f4ff1ed7d40a1 100755 (executable)
--- 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