aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle <kshawkeye@gmail.com>2011-05-11 20:22:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-05-11 20:24:38 +0200
commitde545d2491c5d0013b16fec71696ab93e9997461 (patch)
treea9a26a62400907abbaa72ead84a31bcdc0691508
parentf1e7822e171c6d97a1fff3f456b738a9815db3f0 (diff)
downloadffmpeg-de545d2491c5d0013b16fec71696ab93e9997461.tar.gz
configure: Fix SDL detection on OSX and win32
-rwxr-xr-xconfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index d4e961bb64..2fa0f3aa55 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