[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 35/46] indent with 2 spaces sdl tests
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 35/46] indent with 2 spaces sdl tests |
Date: |
Fri, 24 Jul 2009 20:30:35 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 65 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/configure b/configure
index 565ae54..c69862d 100755
--- a/configure
+++ b/configure
@@ -892,45 +892,42 @@ fi
sdl_too_old=no
if test "$sdl" = "yes" ; then
- sdl=no
-
-cat > $TMPC << EOF
+ sdl=no
+ 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
- sdl_cflags=`sdl-config --cflags 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
- _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" -a "$static" = "yes" ; then
- aa="no"
- sdl_libs=`sdl-config --static-libs 2>/dev/null`
- 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_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"
- fi
+ sdl_cflags=`sdl-config --cflags 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
+ _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 ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs >
/dev/null 2> /dev/null; then
- :
- else
- sdl=no
- fi
- fi # static link
- fi # sdl compile test
+ # static link with sdl ?
+ if test "$sdl" = "yes" -a "$static" = "yes" ; then
+ sdl_libs=`sdl-config --static-libs 2>/dev/null`
+ 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_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"
+ fi
+ if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>
/dev/null; then
+ :
+ else
+ sdl=no
+ fi
+ fi # static link
+ fi # sdl compile test
fi
if test "$sdl" = "yes" ; then
-cat > $TMPC <<EOF
+ cat > $TMPC <<EOF
#include <SDL.h>
#if defined(SDL_VIDEO_DRIVER_X11)
#include <X11/XKBlib.h>
@@ -939,9 +936,9 @@ cat > $TMPC <<EOF
#endif
int main(void) { return 0; }
EOF
- if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs >
/dev/null 2>&1 ; then
- sdl_libs="$sdl_libs -lX11"
- fi
+ if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs >
/dev/null 2>&1 ; then
+ sdl_libs="$sdl_libs -lX11"
+ fi
fi
##########################################
--
1.6.2.5
- [Qemu-devel] [PATCH 30/46] sdl_config value was always sdl-config, (continued)
- [Qemu-devel] [PATCH 30/46] sdl_config value was always sdl-config, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 31/46] Calculate sdl_libs and sdl_flags and use them everywhere, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 22/46] rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 32/46] instead of setup sdl_x11 just add -lX11 to sdl_libs, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 34/46] remove sdl_static. Just do the right thing if static is yes, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 33/46] target_softmmu is undefined at that point, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 36/46] Define and use xen libs in a single place, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 35/46] indent with 2 spaces sdl tests,
Juan Quintela <=
- [Qemu-devel] [PATCH 37/46] simplify curses library selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 38/46] simplify brlapi selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 39/46] simplify vde libs selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 40/46] simplify fdt libs selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 41/46] test if xen is enabled only once, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 42/46] define ENOTSUP the same that the other errors, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 43/46] rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 44/46] rename USE_NPTL to CONFIG_USE_NPTL, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 46/46] Generate config-host.h from config-host.mak, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 45/46] Remove AUDIO_DRIVERS define, Juan Quintela, 2009/07/24