gwj / at91sam9263 · Commits

Commit ac119f9d0cb9f1eff62eda7c831b2e154baed033

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 1ac88f28

indent with 2 spaces sdl tests 

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 31 additions and 34 deletions
configure
  View file @ac119f9
@@ -892,45 +892,42 @@ fi @@ -892,45 +892,42 @@ fi
892 sdl_too_old=no 892 sdl_too_old=no
893 893
894 if test "$sdl" = "yes" ; then 894 if test "$sdl" = "yes" ; then
895 - sdl=no  
896 -  
897 -cat > $TMPC << EOF 895 + sdl=no
  896 + cat > $TMPC << EOF
898 #include <SDL.h> 897 #include <SDL.h>
899 #undef main /* We don't want SDL to override our main() */ 898 #undef main /* We don't want SDL to override our main() */
900 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } 899 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
901 EOF 900 EOF
902 - sdl_cflags=`sdl-config --cflags 2> /dev/null`  
903 - sdl_libs=`sdl-config --libs 2> /dev/null`  
904 - if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > $TMPSDLLOG 2>&1 ; then  
905 - _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`  
906 - if test "$_sdlversion" -lt 121 ; then  
907 - sdl_too_old=yes  
908 - else  
909 - if test "$cocoa" = "no" ; then  
910 - sdl=yes  
911 - fi  
912 - fi  
913 -  
914 - # static link with sdl ?  
915 - if test "$sdl" = "yes" -a "$static" = "yes" ; then  
916 - aa="no"  
917 - sdl_libs=`sdl-config --static-libs 2>/dev/null`  
918 - if test `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then  
919 - sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"  
920 - sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"  
921 - fi 901 + sdl_cflags=`sdl-config --cflags 2> /dev/null`
  902 + sdl_libs=`sdl-config --libs 2> /dev/null`
  903 + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > $TMPSDLLOG 2>&1 ; then
  904 + _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
  905 + if test "$_sdlversion" -lt 121 ; then
  906 + sdl_too_old=yes
  907 + else
  908 + if test "$cocoa" = "no" ; then
  909 + sdl=yes
  910 + fi
  911 + fi
922 912
923 - if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then  
924 - :  
925 - else  
926 - sdl=no  
927 - fi  
928 - fi # static link  
929 - fi # sdl compile test 913 + # static link with sdl ?
  914 + if test "$sdl" = "yes" -a "$static" = "yes" ; then
  915 + sdl_libs=`sdl-config --static-libs 2>/dev/null`
  916 + if test `sdl-config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` ; then
  917 + sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
  918 + sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"
  919 + fi
  920 + if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then
  921 + :
  922 + else
  923 + sdl=no
  924 + fi
  925 + fi # static link
  926 + fi # sdl compile test
930 fi 927 fi
931 928
932 if test "$sdl" = "yes" ; then 929 if test "$sdl" = "yes" ; then
933 -cat > $TMPC <<EOF 930 + cat > $TMPC <<EOF
934 #include <SDL.h> 931 #include <SDL.h>
935 #if defined(SDL_VIDEO_DRIVER_X11) 932 #if defined(SDL_VIDEO_DRIVER_X11)
936 #include <X11/XKBlib.h> 933 #include <X11/XKBlib.h>
@@ -939,9 +936,9 @@ cat &gt; $TMPC &lt;&lt;EOF @@ -939,9 +936,9 @@ cat &gt; $TMPC &lt;&lt;EOF
939 #endif 936 #endif
940 int main(void) { return 0; } 937 int main(void) { return 0; }
941 EOF 938 EOF
942 - if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then  
943 - sdl_libs="$sdl_libs -lX11"  
944 - fi 939 + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then
  940 + sdl_libs="$sdl_libs -lX11"
  941 + fi
945 fi 942 fi
946 943
947 ########################################## 944 ##########################################