diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 84 |
1 files changed, 39 insertions, 45 deletions
@@ -536,58 +536,52 @@ EOF sdl_too_old=no if test -z "$sdl" ; then - -sdl_config="sdl-config" -sdl=no -sdl_static=no - -if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then -# win32 cross compilation case - sdl_config="i386-mingw32msvc-sdl-config" - sdl=yes -else -# normal SDL probe + sdl_config="sdl-config" + sdl=no + sdl_static=no + + if test "$mingw32" = "yes" -a ! -z "$cross_prefix" ; then + # win32 cross compilation case + sdl_config="i386-mingw32msvc-sdl-config" + sdl=yes + else + # normal SDL probe cat > $TMPC << EOF #include <SDL.h> #undef main /* We don't want SDL to override our main() */ int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } EOF + if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then + _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'` + if test "$_sdlversion" -lt 121 ; then + sdl_too_old=yes + else + if test "$cocoa" = "no" ; then + sdl=yes + fi + fi -if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then -_sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'` -if test "$_sdlversion" -lt 121 ; then -sdl_too_old=yes -else - if test "$cocoa" = "no" ; then - sdl=yes - fi -fi - -# static link with sdl ? -if test "$sdl" = "yes" ; then -aa="no" -`$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes" -sdl_static_libs=`$sdl_config --static-libs 2>/dev/null` -if [ "$aa" = "yes" ] ; then - sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`" -fi - -if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then - sdl_static=yes -fi - -fi # static link - -fi # sdl compile test - -fi # cross compilation - + # static link with sdl ? + if test "$sdl" = "yes" ; then + aa="no" + `$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes" + sdl_static_libs=`$sdl_config --static-libs 2>/dev/null` + if [ "$aa" = "yes" ] ; then + sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`" + fi + + if $cc -o $TMPE `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs 2> /dev/null; then + sdl_static=yes + fi + fi # static link + fi # sdl compile test + fi # cross compilation else - # Make sure to disable cocoa if sdl was set - if test "$sdl" = "yes" ; then - cocoa="no" - coreaudio="no" - fi + # Make sure to disable cocoa if sdl was set + if test "$sdl" = "yes" ; then + cocoa="no" + coreaudio="no" + fi fi # -z $sdl ########################################## |