[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 35/47] remove sdl_static. Just do the right thing if
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 35/47] remove sdl_static. Just do the right thing if static is yes |
Date: |
Mon, 27 Jul 2009 16:13:14 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 42 ++++++++++++------------------------------
1 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/configure b/configure
index b7d1214..6bbf296 100755
--- a/configure
+++ b/configure
@@ -893,7 +893,6 @@ sdl_too_old=no
if test "$sdl" = "yes" ; then
sdl=no
- sdl_static=no
cat > $TMPC << EOF
#include <SDL.h>
@@ -913,16 +912,18 @@ EOF
fi
# static link with sdl ?
- if test "$sdl" = "yes" ; then
+ if test "$sdl" = "yes" -a "$static" = "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`"
+ 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_static_libs >
/dev/null 2> /dev/null; then
- sdl_static=yes
+ 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
@@ -1436,9 +1437,6 @@ if test "$darwin" = "yes" ; then
echo "Cocoa support $cocoa"
fi
echo "SDL support $sdl"
-if test "$sdl" != "no" ; then
- echo "SDL static link $sdl_static"
-fi
echo "curses support $curses"
echo "curl support $curl"
echo "mingw32 support $mingw32"
@@ -1477,9 +1475,6 @@ echo "preadv support $preadv"
if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
fi
-#if test "$sdl_static" = "no"; then
-# echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a
graphical output"
-#fi
config_host_mak="config-host.mak"
config_host_h="config-host.h"
@@ -1648,24 +1643,11 @@ echo "TARGET_DIRS=$target_list" >> $config_host_mak
if [ "$build_docs" = "yes" ] ; then
echo "BUILD_DOCS=yes" >> $config_host_mak
fi
-if test "$static" = "yes"; then
- sdl1=$sdl_static
-else
- sdl1=$sdl
-fi
-if test "$sdl1" = "yes" ; then
+if test "$sdl" = "yes" ; then
echo "#define CONFIG_SDL 1" >> $config_host_h
echo "CONFIG_SDL=y" >> $config_host_mak
- if test "$static" = "yes"; then
- echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
- else
- echo "SDL_LIBS=$sdl_libs`" >> $config_host_mak
- fi
- if [ "${aa}" = "yes" ] ; then
- echo "SDL_CFLAGS=$sdl_cflags `aalib-config --cflags`" >> $config_host_mak
- else
- echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
- fi
+ echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
+ echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
fi
if test "$cocoa" = "yes" ; then
echo "#define CONFIG_COCOA 1" >> $config_host_h
--
1.6.2.5
- [Qemu-devel] [PATCH 27/47] rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN, (continued)
- [Qemu-devel] [PATCH 27/47] rename WORDS_BIGENDIAN to HOST_WORDS_BIGENDIAN, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 30/47] the else part of this test is obsolete We are testing for sdl = yes inside the else part of the test if sdl = yes, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 33/47] instead of setup sdl_x11 just add -lX11 to sdl_libs, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 29/47] Use CONFIG_POSIX to simplify Makefile, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 32/47] Calculate sdl_libs and sdl_flags and use them everywhere, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 31/47] sdl_config value was always sdl-config, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 37/47] Define and use xen libs in a single place, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 36/47] indent with 2 spaces sdl tests, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 38/47] simplify curses library selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 39/47] simplify brlapi selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 35/47] remove sdl_static. Just do the right thing if static is yes,
Juan Quintela <=
- [Qemu-devel] [PATCH 34/47] target_softmmu is undefined at that point, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 40/47] simplify vde libs selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 41/47] simplify fdt libs selection, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 42/47] test if xen is enabled only once, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 46/47] Generate config-host.h from config-host.mak, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 45/47] rename USE_NPTL to CONFIG_USE_NPTL, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 43/47] define ENOTSUP the same that the other errors, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 44/47] rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 47/47] move on_vcpu inside proper #ifdef, Juan Quintela, 2009/07/27