motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-11 03:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nicer script formatting, by Ben Taylor.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3072 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-07-12 00:27:15 +00:00
parent 5b2849688e
commit 069b0bda72
1 changed files with 38 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

56
configure vendored
View file

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