gwj / at91sam9263 · Commits

Commit 681306dfaa1924dc046746a4b270837fd126716e

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 8ad3a7dd

instead of setup sdl_x11 just add -lX11 to sdl_libs 

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 1 additions and 4 deletions
configure
  View file @681306d
@@ -201,7 +201,6 @@ aix=&quot;no&quot; @@ -201,7 +201,6 @@ aix=&quot;no&quot;
201 blobs="yes" 201 blobs="yes"
202 fdt="yes" 202 fdt="yes"
203 sdl="yes" 203 sdl="yes"
204 -sdl_x11="no"  
205 xen="yes" 204 xen="yes"
206 pkgversion="" 205 pkgversion=""
207 206
@@ -940,7 +939,7 @@ cat &gt; $TMPC &lt;&lt;EOF @@ -940,7 +939,7 @@ cat &gt; $TMPC &lt;&lt;EOF
940 int main(void) { return 0; } 939 int main(void) { return 0; }
941 EOF 940 EOF
942 if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then 941 if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then
943 - sdl_x11="yes" 942 + sdl_libs="$sdl_libs -lX11"
944 fi 943 fi
945 fi 944 fi
946 945
@@ -1659,8 +1658,6 @@ if test &quot;$sdl1&quot; = &quot;yes&quot; ; then @@ -1659,8 +1658,6 @@ if test &quot;$sdl1&quot; = &quot;yes&quot; ; then
1659 echo "CONFIG_SDL=y" >> $config_host_mak 1658 echo "CONFIG_SDL=y" >> $config_host_mak
1660 if test "$target_softmmu" = "no" -o "$static" = "yes"; then 1659 if test "$target_softmmu" = "no" -o "$static" = "yes"; then
1661 echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak 1660 echo "SDL_LIBS=$sdl_static_libs" >> $config_host_mak
1662 - elif test "$sdl_x11" = "yes" ; then  
1663 - echo "SDL_LIBS=$sld_libs -lX11" >> $config_host_mak  
1664 else 1661 else
1665 echo "SDL_LIBS=$sdl_libs`" >> $config_host_mak 1662 echo "SDL_LIBS=$sdl_libs`" >> $config_host_mak
1666 fi 1663 fi