[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 32/47] Calculate sdl_libs and sdl_flags and use them
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 32/47] Calculate sdl_libs and sdl_flags and use them everywhere |
Date: |
Mon, 27 Jul 2009 16:13:11 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index fafcc8f..742e1be 100755
--- a/configure
+++ b/configure
@@ -901,7 +901,9 @@ cat > $TMPC << EOF
#undef main /* We don't want SDL to override our main() */
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
EOF
- if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2>
/dev/null` $TMPC `sdl-config --libs 2> /dev/null` > $TMPSDLLOG 2>&1 ; then
+ 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
@@ -920,7 +922,7 @@ EOF
sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
fi
- if $cc -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2> /dev/null`
$TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
+ if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_static_libs >
/dev/null 2> /dev/null; then
sdl_static=yes
fi
fi # static link
@@ -937,7 +939,7 @@ cat > $TMPC <<EOF
#endif
int main(void) { return 0; }
EOF
- if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2>
/dev/null` $TMPC `sdl-config --libs 2> /dev/null` > /dev/null 2>&1 ; then
+ if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs >
/dev/null 2>&1 ; then
sdl_x11="yes"
fi
fi
@@ -1658,14 +1660,14 @@ if test "$sdl1" = "yes" ; then
if test "$target_softmmu" = "no" -o "$static" = "yes"; then
echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
elif test "$sdl_x11" = "yes" ; then
- echo "SDL_LIBS=`sdl-config --libs` -lX11" >> $config_host_mak
+ echo "SDL_LIBS=$sld_libs -lX11" >> $config_host_mak
else
- echo "SDL_LIBS=`sdl-config --libs`" >> $config_host_mak
+ echo "SDL_LIBS=$sdl_libs`" >> $config_host_mak
fi
if [ "${aa}" = "yes" ] ; then
- echo "SDL_CFLAGS=`sdl-config --cflags` `aalib-config --cflags`" >>
$config_host_mak
+ echo "SDL_CFLAGS=$sdl_cflags `aalib-config --cflags`" >> $config_host_mak
else
- echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_host_mak
+ echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
fi
fi
if test "$cocoa" = "yes" ; then
--
1.6.2.5
- [Qemu-devel] [PATCH 17/47] rename HOST_BSD to CONFIG_BSD, (continued)
- [Qemu-devel] [PATCH 17/47] rename HOST_BSD to CONFIG_BSD, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 16/47] O_LARGEFILE is already set in qemu-common.h, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 19/47] rename HAVE_PREADV to CONFIG_PREADV, Juan Quintela, 2009/07/27
- [Qemu-devel] [PATCH 28/47] Add CONFIG_POSIX, Juan Quintela, 2009/07/27
- [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 <=
- [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, 2009/07/27
- [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