gwj / at91sam9263 · Commits

Commit 4baae0acb833bd3c1e7b155685946251c5322b76

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent eb82284f

simplify vde libs selection 

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 6 additions and 6 deletions
configure
  View file @4baae0a
@@ -997,6 +997,8 @@ fi @@ -997,6 +997,8 @@ fi
997 ########################################## 997 ##########################################
998 # vde libraries probe 998 # vde libraries probe
999 if test "$vde" = "yes" ; then 999 if test "$vde" = "yes" ; then
  1000 + vde=no
  1001 + vde_libs="-lvdeplug"
1000 cat > $TMPC << EOF 1002 cat > $TMPC << EOF
1001 #include <libvdeplug.h> 1003 #include <libvdeplug.h>
1002 int main(void) 1004 int main(void)
@@ -1006,11 +1008,9 @@ int main(void) @@ -1006,11 +1008,9 @@ int main(void)
1006 return 0; 1008 return 0;
1007 } 1009 }
1008 EOF 1010 EOF
1009 - if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lvdeplug > /dev/null 2> /dev/null ; then  
1010 - :  
1011 - else  
1012 - vde="no"  
1013 - fi 1011 + if $cc $ARCH_CFLAGS -o $TMPE $TMPC $vde_libs > /dev/null 2> /dev/null ; then
  1012 + vde=yes
  1013 + fi
1014 fi 1014 fi
1015 1015
1016 ########################################## 1016 ##########################################
@@ -1589,7 +1589,7 @@ fi @@ -1589,7 +1589,7 @@ fi
1589 if test "$vde" = "yes" ; then 1589 if test "$vde" = "yes" ; then
1590 echo "CONFIG_VDE=y" >> $config_host_mak 1590 echo "CONFIG_VDE=y" >> $config_host_mak
1591 echo "#define CONFIG_VDE 1" >> $config_host_h 1591 echo "#define CONFIG_VDE 1" >> $config_host_h
1592 - echo "VDE_LIBS=-lvdeplug" >> $config_host_mak 1592 + echo "VDE_LIBS=$vde_libs" >> $config_host_mak
1593 fi 1593 fi
1594 for card in $audio_card_list; do 1594 for card in $audio_card_list; do
1595 def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'` 1595 def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`