gwj / at91sam9263 · Commits

Commit d3d9738f995dcd4d887e7f10e16af64a77f1c140

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent a68551bc

sdl_config value was always sdl-config 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 10 additions and 11 deletions
configure
  View file @d3d9738
@@ -893,7 +893,6 @@ fi @@ -893,7 +893,6 @@ fi
893 sdl_too_old=no 893 sdl_too_old=no
894 894
895 if test "$sdl" = "yes" ; then 895 if test "$sdl" = "yes" ; then
896 - sdl_config="sdl-config"  
897 sdl=no 896 sdl=no
898 sdl_static=no 897 sdl_static=no
899 898
@@ -902,8 +901,8 @@ cat &gt; $TMPC &lt;&lt; EOF @@ -902,8 +901,8 @@ cat &gt; $TMPC &lt;&lt; EOF
902 #undef main /* We don't want SDL to override our main() */ 901 #undef main /* We don't want SDL to override our main() */
903 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } 902 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
904 EOF 903 EOF
905 - 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  
906 - _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'` 904 + 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
  905 + _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
907 if test "$_sdlversion" -lt 121 ; then 906 if test "$_sdlversion" -lt 121 ; then
908 sdl_too_old=yes 907 sdl_too_old=yes
909 else 908 else
@@ -915,13 +914,13 @@ EOF @@ -915,13 +914,13 @@ EOF
915 # static link with sdl ? 914 # static link with sdl ?
916 if test "$sdl" = "yes" ; then 915 if test "$sdl" = "yes" ; then
917 aa="no" 916 aa="no"
918 - `$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"  
919 - sdl_static_libs=`$sdl_config --static-libs 2>/dev/null` 917 + `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
  918 + sdl_static_libs=`sdl-config --static-libs 2>/dev/null`
920 if [ "$aa" = "yes" ] ; then 919 if [ "$aa" = "yes" ] ; then
921 sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`" 920 sdl_static_libs="$sdl_static_libs `aalib-config --static-libs`"
922 fi 921 fi
923 922
924 - if $cc -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC $sdl_static_libs > /dev/null 2> /dev/null; then 923 + if $cc -o $TMPE ${OS_CFLAGS} `sdl-config --cflags 2> /dev/null` $TMPC $sdl_static_libs > /dev/null 2> /dev/null; then
925 sdl_static=yes 924 sdl_static=yes
926 fi 925 fi
927 fi # static link 926 fi # static link
@@ -938,7 +937,7 @@ cat &gt; $TMPC &lt;&lt;EOF @@ -938,7 +937,7 @@ cat &gt; $TMPC &lt;&lt;EOF
938 #endif 937 #endif
939 int main(void) { return 0; } 938 int main(void) { return 0; }
940 EOF 939 EOF
941 - 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 940 + 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
942 sdl_x11="yes" 941 sdl_x11="yes"
943 fi 942 fi
944 fi 943 fi
@@ -1659,14 +1658,14 @@ if test &quot;$sdl1&quot; = &quot;yes&quot; ; then @@ -1659,14 +1658,14 @@ if test &quot;$sdl1&quot; = &quot;yes&quot; ; then
1659 if test "$target_softmmu" = "no" -o "$static" = "yes"; then 1658 if test "$target_softmmu" = "no" -o "$static" = "yes"; then
1660 echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak 1659 echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
1661 elif test "$sdl_x11" = "yes" ; then 1660 elif test "$sdl_x11" = "yes" ; then
1662 - echo "SDL_LIBS=`$sdl_config --libs` -lX11" >> $config_host_mak 1661 + echo "SDL_LIBS=`sdl-config --libs` -lX11" >> $config_host_mak
1663 else 1662 else
1664 - echo "SDL_LIBS=`$sdl_config --libs`" >> $config_host_mak 1663 + echo "SDL_LIBS=`sdl-config --libs`" >> $config_host_mak
1665 fi 1664 fi
1666 if [ "${aa}" = "yes" ] ; then 1665 if [ "${aa}" = "yes" ] ; then
1667 - echo "SDL_CFLAGS=`$sdl_config --cflags` `aalib-config --cflags`" >> $config_host_mak 1666 + echo "SDL_CFLAGS=`sdl-config --cflags` `aalib-config --cflags`" >> $config_host_mak
1668 else 1667 else
1669 - echo "SDL_CFLAGS=`$sdl_config --cflags`" >> $config_host_mak 1668 + echo "SDL_CFLAGS=`sdl-config --cflags`" >> $config_host_mak
1670 fi 1669 fi
1671 fi 1670 fi
1672 if test "$cocoa" = "yes" ; then 1671 if test "$cocoa" = "yes" ; then