From 74f42e182ae1f95f9c88368c86b1177d6607bc76 Mon Sep 17 00:00:00 2001 From: TeLeMan Date: Mon, 8 Feb 2010 13:56:44 +0800 Subject: [PATCH] configure: fix the static compilation for sdl The static compilation for sdl is broken after 79427693174a553d62f3da44aacd3f19ba8df3a7. Signed-off-by: TeLeMan Signed-off-by: Aurelien Jarno --- configure | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b46f1e6..0a84b0e 100755 --- a/configure +++ b/configure @@ -1057,7 +1057,11 @@ if test "$sdl" != "no" ; then int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } EOF sdl_cflags=`$sdlconfig --cflags 2> /dev/null` - sdl_libs=`$sdlconfig --libs 2> /dev/null` + if test "$static" = "yes" ; then + sdl_libs=`$sdlconfig --static-libs 2>/dev/null` + else + sdl_libs=`$sdlconfig --libs 2> /dev/null` + fi if compile_prog "$sdl_cflags" "$sdl_libs" ; then if test "$_sdlversion" -lt 121 ; then sdl_too_old=yes @@ -1069,7 +1073,6 @@ EOF # static link with sdl ? (note: sdl.pc's --static --libs is broken) if test "$sdl" = "yes" -a "$static" = "yes" ; then - sdl_libs=`sdl-config --static-libs 2>/dev/null` if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`" sdl_cflags="$sdl_cflags `aalib-config --cflags >2 /dev/null`" -- 2.7.4