OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

indent with 2 spaces sdl tests 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-07-27 16:13:15 +02:00 committed by Anthony Liguori
parent 1ac88f28dd
commit ac119f9d0c
1 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
configure vendored
View File

@ -892,45 +892,42 @@ fi
sdl_too_old=no sdl_too_old=no
if test "$sdl" = "yes" ; then if test "$sdl" = "yes" ; then
sdl=no sdl=no
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
sdl_cflags=`sdl-config --cflags 2> /dev/null` sdl_cflags=`sdl-config --cflags 2> /dev/null`
sdl_libs=`sdl-config --libs 2> /dev/null` sdl_libs=`sdl-config --libs 2> /dev/null`
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > $TMPSDLLOG 2>&1 ; then if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > $TMPSDLLOG 2>&1 ; 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" -a "$static" = "yes" ; then if test "$sdl" = "yes" -a "$static" = "yes" ; then
aa="no" sdl_libs=`sdl-config --static-libs 2>/dev/null`
sdl_libs=`sdl-config --static-libs 2>/dev/null` if test `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then
if test `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`" sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"
sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`" fi
fi if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then
:
if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then else
: sdl=no
else fi
sdl=no fi # static link
fi fi # sdl compile test
fi # static link
fi # sdl compile test
fi fi
if test "$sdl" = "yes" ; then if test "$sdl" = "yes" ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF
#include <SDL.h> #include <SDL.h>
#if defined(SDL_VIDEO_DRIVER_X11) #if defined(SDL_VIDEO_DRIVER_X11)
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
@ -939,9 +936,9 @@ cat > $TMPC <<EOF
#endif #endif
int main(void) { return 0; } int main(void) { return 0; }
EOF EOF
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then
sdl_libs="$sdl_libs -lX11" sdl_libs="$sdl_libs -lX11"
fi fi
fi fi
########################################## ##########################################