remove sdl_static. Just do the right thing if static is yes
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
aae3481dc8
commit
1ac88f28dd
40
configure
vendored
40
configure
vendored
|
@ -893,7 +893,6 @@ sdl_too_old=no
|
||||||
|
|
||||||
if test "$sdl" = "yes" ; then
|
if test "$sdl" = "yes" ; then
|
||||||
sdl=no
|
sdl=no
|
||||||
sdl_static=no
|
|
||||||
|
|
||||||
cat > $TMPC << EOF
|
cat > $TMPC << EOF
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
|
@ -913,16 +912,18 @@ EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# static link with sdl ?
|
# static link with sdl ?
|
||||||
if test "$sdl" = "yes" ; then
|
if test "$sdl" = "yes" -a "$static" = "yes" ; then
|
||||||
aa="no"
|
aa="no"
|
||||||
`sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
|
sdl_libs=`sdl-config --static-libs 2>/dev/null`
|
||||||
sdl_static_libs=`sdl-config --static-libs 2>/dev/null`
|
if test `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then
|
||||||
if [ "$aa" = "yes" ] ; then
|
sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
|
||||||
sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
|
sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
|
if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then
|
||||||
sdl_static=yes
|
:
|
||||||
|
else
|
||||||
|
sdl=no
|
||||||
fi
|
fi
|
||||||
fi # static link
|
fi # static link
|
||||||
fi # sdl compile test
|
fi # sdl compile test
|
||||||
|
@ -1436,9 +1437,6 @@ if test "$darwin" = "yes" ; then
|
||||||
echo "Cocoa support $cocoa"
|
echo "Cocoa support $cocoa"
|
||||||
fi
|
fi
|
||||||
echo "SDL support $sdl"
|
echo "SDL support $sdl"
|
||||||
if test "$sdl" != "no" ; then
|
|
||||||
echo "SDL static link $sdl_static"
|
|
||||||
fi
|
|
||||||
echo "curses support $curses"
|
echo "curses support $curses"
|
||||||
echo "curl support $curl"
|
echo "curl support $curl"
|
||||||
echo "mingw32 support $mingw32"
|
echo "mingw32 support $mingw32"
|
||||||
|
@ -1477,9 +1475,6 @@ echo "preadv support $preadv"
|
||||||
if test $sdl_too_old = "yes"; then
|
if test $sdl_too_old = "yes"; then
|
||||||
echo "-> Your SDL version is too old - please upgrade to have SDL support"
|
echo "-> Your SDL version is too old - please upgrade to have SDL support"
|
||||||
fi
|
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_mak="config-host.mak"
|
||||||
config_host_h="config-host.h"
|
config_host_h="config-host.h"
|
||||||
|
@ -1648,24 +1643,11 @@ echo "TARGET_DIRS=$target_list" >> $config_host_mak
|
||||||
if [ "$build_docs" = "yes" ] ; then
|
if [ "$build_docs" = "yes" ] ; then
|
||||||
echo "BUILD_DOCS=yes" >> $config_host_mak
|
echo "BUILD_DOCS=yes" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
if test "$static" = "yes"; then
|
if test "$sdl" = "yes" ; then
|
||||||
sdl1=$sdl_static
|
|
||||||
else
|
|
||||||
sdl1=$sdl
|
|
||||||
fi
|
|
||||||
if test "$sdl1" = "yes" ; then
|
|
||||||
echo "#define CONFIG_SDL 1" >> $config_host_h
|
echo "#define CONFIG_SDL 1" >> $config_host_h
|
||||||
echo "CONFIG_SDL=y" >> $config_host_mak
|
echo "CONFIG_SDL=y" >> $config_host_mak
|
||||||
if test "$static" = "yes"; then
|
echo "SDL_LIBS=$sdl_libs" >> $config_host_mak
|
||||||
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
|
echo "SDL_CFLAGS=$sdl_cflags" >> $config_host_mak
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if test "$cocoa" = "yes" ; then
|
if test "$cocoa" = "yes" ; then
|
||||||
echo "#define CONFIG_COCOA 1" >> $config_host_h
|
echo "#define CONFIG_COCOA 1" >> $config_host_h
|
||||||
|
|
Loading…
Reference in a new issue