From 225e21ef6ce922485f8f82c397a1139b46440330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sun, 11 Feb 2007 12:11:57 +0000 Subject: [PATCH] simplify SDL check Originally committed as revision 7922 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 6bd233b766..d274fd9437 100755 --- a/configure +++ b/configure @@ -1666,21 +1666,17 @@ fi sdl_too_old=no sdl=no SDL_CONFIG="${cross_prefix}sdl-config" -if ("${SDL_CONFIG}" --version) >/dev/null 2>&1 ; then - temp_cflags `"${SDL_CONFIG}" --cflags` +if "${SDL_CONFIG}" --version >/dev/null 2>&1; then + sdl_cflags=`"${SDL_CONFIG}" --cflags` + temp_cflags $sdl_cflags temp_extralibs `"${SDL_CONFIG}" --libs` - check_ld < -#undef main /* We don't want SDL to override our main() */ -int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } -EOF - if test $? = 0; then + if check_lib SDL.h SDL_Init; then _sdlversion=`"${SDL_CONFIG}" --version | sed 's/[^0-9]//g'` if test "$_sdlversion" -lt 121 ; then sdl_too_old=yes else sdl=yes - check_cc < int main(void){ const SDL_VideoInfo *vi = SDL_GetVideoInfo();