OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Prefer ncurses over curses

Browse Source 
Not every distro provides libcurses anymore, at least OpenSUSE, and at
least under a standard library search path. So try to link against
standard ncurses first and then fall back to legacy curses.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-06-24 12:29:11 +02:00 committed by Anthony Liguori
parent fc57bc5780
commit ab4e5602a8
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -1078,6 +1078,7 @@ fi # -z $brlapi
if test "$curses" = "yes" ; then if test "$curses" = "yes" ; then
curses=no curses=no
ncurses=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <curses.h> #include <curses.h>
#ifdef __OpenBSD__ #ifdef __OpenBSD__
@ -1085,7 +1086,10 @@ if test "$curses" = "yes" ; then
#endif #endif
int main(void) { resize_term(0, 0); return curses_version(); } int main(void) { resize_term(0, 0); return curses_version(); }
EOF EOF
if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
curses=yes
ncurses=yes
elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
curses=yes curses=yes
fi fi
fi # test "$curses" fi # test "$curses"
@ -1735,7 +1739,11 @@ fi
if test "$curses" = "yes" ; then if test "$curses" = "yes" ; then
echo "#define CONFIG_CURSES 1" >> $config_h echo "#define CONFIG_CURSES 1" >> $config_h
echo "CONFIG_CURSES=yes" >> $config_mak echo "CONFIG_CURSES=yes" >> $config_mak
echo "CURSES_LIBS=-lcurses" >> $config_mak if test "$ncurses" = "yes" ; then
echo "CURSES_LIBS=-lncurses" >> $config_mak
else
echo "CURSES_LIBS=-lcurses" >> $config_mak
fi
fi fi
if test "$atfile" = "yes" ; then if test "$atfile" = "yes" ; then
echo "#define CONFIG_ATFILE 1" >> $config_h echo "#define CONFIG_ATFILE 1" >> $config_h