gwj / at91sam9263 · Commits

Commit e0b7a42bc9e9272c8263bf8b1af5ee89b7164d3d

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent b2266bee

simplify curses library 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 5 additions and 10 deletions
configure
  View file @e0b7a42
@@ -1099,8 +1099,6 @@ fi # -z $brlapi @@ -1099,8 +1099,6 @@ fi # -z $brlapi
1099 # curses probe 1099 # curses probe
1100 1100
1101 if test "$curses" = "yes" ; then 1101 if test "$curses" = "yes" ; then
1102 - curses=no  
1103 - ncurses=no  
1104 cat > $TMPC << EOF 1102 cat > $TMPC << EOF
1105 #include <curses.h> 1103 #include <curses.h>
1106 #ifdef __OpenBSD__ 1104 #ifdef __OpenBSD__
@@ -1109,10 +1107,11 @@ if test &quot;$curses&quot; = &quot;yes&quot; ; then @@ -1109,10 +1107,11 @@ if test &quot;$curses&quot; = &quot;yes&quot; ; then
1109 int main(void) { resize_term(0, 0); return curses_version(); } 1107 int main(void) { resize_term(0, 0); return curses_version(); }
1110 EOF 1108 EOF
1111 if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then 1109 if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
1112 - curses=yes  
1113 - ncurses=yes 1110 + curses_libs="-lncurses"
1114 elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then 1111 elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
1115 - curses=yes 1112 + curses_libs="-lcurses"
  1113 + else
  1114 + curses=no
1116 fi 1115 fi
1117 fi # test "$curses" 1116 fi # test "$curses"
1118 1117
@@ -1654,11 +1653,7 @@ fi @@ -1654,11 +1653,7 @@ fi
1654 if test "$curses" = "yes" ; then 1653 if test "$curses" = "yes" ; then
1655 echo "#define CONFIG_CURSES 1" >> $config_host_h 1654 echo "#define CONFIG_CURSES 1" >> $config_host_h
1656 echo "CONFIG_CURSES=y" >> $config_host_mak 1655 echo "CONFIG_CURSES=y" >> $config_host_mak
1657 - if test "$ncurses" = "yes" ; then  
1658 - echo "CURSES_LIBS=-lncurses" >> $config_host_mak  
1659 - else  
1660 - echo "CURSES_LIBS=-lcurses" >> $config_host_mak  
1661 - fi 1656 + echo "CURSES_LIBS=$curses_libs" >> $config_host_mak
1662 fi 1657 fi
1663 if test "$atfile" = "yes" ; then 1658 if test "$atfile" = "yes" ; then
1664 echo "#define CONFIG_ATFILE 1" >> $config_host_h 1659 echo "#define CONFIG_ATFILE 1" >> $config_host_h