提交 d3d9738f 编写于 作者: J Juan Quintela 提交者: Anthony Liguori

sdl_config value was always sdl-config

Signed-off-by: NJuan Quintela <quintela@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 a68551bc
...@@ -893,7 +893,6 @@ fi ...@@ -893,7 +893,6 @@ fi
sdl_too_old=no sdl_too_old=no
if test "$sdl" = "yes" ; then if test "$sdl" = "yes" ; then
sdl_config="sdl-config"
sdl=no sdl=no
sdl_static=no sdl_static=no
...@@ -902,8 +901,8 @@ cat > $TMPC << EOF ...@@ -902,8 +901,8 @@ cat > $TMPC << EOF
#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
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 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
_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
...@@ -915,13 +914,13 @@ EOF ...@@ -915,13 +914,13 @@ EOF
# static link with sdl ? # static link with sdl ?
if test "$sdl" = "yes" ; then if test "$sdl" = "yes" ; then
aa="no" aa="no"
`$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes" `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
sdl_static_libs=`$sdl_config --static-libs 2>/dev/null` sdl_static_libs=`sdl-config --static-libs 2>/dev/null`
if [ "$aa" = "yes" ] ; then if [ "$aa" = "yes" ] ; then
sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`" sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
fi 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-config --cflags 2> /dev/null` $TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
sdl_static=yes sdl_static=yes
fi fi
fi # static link fi # static link
...@@ -938,7 +937,7 @@ cat > $TMPC <<EOF ...@@ -938,7 +937,7 @@ 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_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-config --cflags 2> /dev/null` $TMPC `sdl-config --libs 2> /dev/null` > /dev/null 2>&1 ; then
sdl_x11="yes" sdl_x11="yes"
fi fi
fi fi
...@@ -1659,14 +1658,14 @@ if test "$sdl1" = "yes" ; then ...@@ -1659,14 +1658,14 @@ if test "$sdl1" = "yes" ; then
if test "$target_softmmu" = "no" -o "$static" = "yes"; then if test "$target_softmmu" = "no" -o "$static" = "yes"; then
echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
elif test "$sdl_x11" = "yes" ; then elif test "$sdl_x11" = "yes" ; then
echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_host_mak echo "SDL_LIBS=`sdl-config --libs` -lX11" >> $config_host_mak
else else
echo "SDL_LIBS=`$sdl_config --libs`" >> $config_host_mak echo "SDL_LIBS=`sdl-config --libs`" >> $config_host_mak
fi fi
if [ "${aa}" = "yes" ] ; then if [ "${aa}" = "yes" ] ; then
echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_host_mak echo "SDL_CFLAGS=`sdl-config --cflags` `aalib-config --cflags`" >> $config_host_mak
else else
echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_host_mak echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_host_mak
fi fi
fi fi
if test "$cocoa" = "yes" ; then if test "$cocoa" = "yes" ; then
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册