[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 37/46] simplify curses library selection
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 37/46] simplify curses library selection |
Date: |
Fri, 24 Jul 2009 20:30:37 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index 8b8e186..3b0fb72 100755
--- a/configure
+++ b/configure
@@ -1099,8 +1099,6 @@ fi # -z $brlapi
# curses probe
if test "$curses" = "yes" ; then
- curses=no
- ncurses=no
cat > $TMPC << EOF
#include <curses.h>
#ifdef __OpenBSD__
@@ -1109,10 +1107,11 @@ if test "$curses" = "yes" ; then
int main(void) { resize_term(0, 0); return curses_version(); }
EOF
if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
- curses=yes
- ncurses=yes
+ curses_libs="-lncurses"
elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
- curses=yes
+ curses_libs="-lcurses"
+ else
+ curses=no
fi
fi # test "$curses"
@@ -1654,11 +1653,7 @@ fi
if test "$curses" = "yes" ; then
echo "#define CONFIG_CURSES 1" >> $config_host_h
echo "CONFIG_CURSES=y" >> $config_host_mak
- if test "$ncurses" = "yes" ; then
- echo "CURSES_LIBS=-lncurses" >> $config_host_mak
- else
- echo "CURSES_LIBS=-lcurses" >> $config_host_mak
- fi
+ echo "CURSES_LIBS=$curses_libs" >> $config_host_mak
fi
if test "$atfile" = "yes" ; then
echo "#define CONFIG_ATFILE 1" >> $config_host_h
--
1.6.2.5
- [Qemu-devel] [PATCH 31/46] Calculate sdl_libs and sdl_flags and use them everywhere, (continued)
- [Qemu-devel] [PATCH 31/46] Calculate sdl_libs and sdl_flags and use them everywhere, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 22/46] rename HAVE_MACHINE_BSWAP_H to CONFIG_MACHINE_BSWAP_H, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 32/46] instead of setup sdl_x11 just add -lX11 to sdl_libs, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 34/46] remove sdl_static. Just do the right thing if static is yes, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 33/46] target_softmmu is undefined at that point, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 36/46] Define and use xen libs in a single place, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 35/46] indent with 2 spaces sdl tests, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 37/46] simplify curses library selection,
Juan Quintela <=
- [Qemu-devel] [PATCH 38/46] simplify brlapi selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 39/46] simplify vde libs selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 40/46] simplify fdt libs selection, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 41/46] test if xen is enabled only once, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 42/46] define ENOTSUP the same that the other errors, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 43/46] rename NEEDS_LIBSUNMATH to CONFIG_NEEDS_LIBSUNMATH, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 44/46] rename USE_NPTL to CONFIG_USE_NPTL, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 46/46] Generate config-host.h from config-host.mak, Juan Quintela, 2009/07/24
- [Qemu-devel] [PATCH 45/46] Remove AUDIO_DRIVERS define, Juan Quintela, 2009/07/24