From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MJPje-0002zx-Nn
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 06:29:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MJPja-0002xm-BG
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 06:29:46 -0400
Received: from [199.232.76.173] (port=50563 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MJPja-0002x1-4h
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 06:29:42 -0400
Received: from gecko.sbs.de ([194.138.37.40]:21891)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jan.kiszka@siemens.com>) id 1MJPjX-000699-0v
	for qemu-devel@nongnu.org; Wed, 24 Jun 2009 06:29:39 -0400
Received: from mail2.sbs.de (localhost [127.0.0.1])
	by gecko.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n5OATC88019457
	for <qemu-devel@nongnu.org>; Wed, 24 Jun 2009 12:29:12 +0200
Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167]
	(may be forged))
	by mail2.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n5OATBaZ003619
	for <qemu-devel@nongnu.org>; Wed, 24 Jun 2009 12:29:12 +0200
Message-ID: <4A41FFF7.8080407@siemens.com>
Date: Wed, 24 Jun 2009 12:29:11 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH] Prefer ncurses over curses
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel <qemu-devel@nongnu.org>

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>
---

 configure |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 7e99ad2..d71629c 100755
--- a/configure
+++ b/configure
@@ -1078,6 +1078,7 @@ fi # -z $brlapi
 
 if test "$curses" = "yes" ; then
   curses=no
+  ncurses=no
   cat > $TMPC << EOF
 #include <curses.h>
 #ifdef __OpenBSD__
@@ -1085,7 +1086,10 @@ if test "$curses" = "yes" ; then
 #endif
 int main(void) { resize_term(0, 0); return curses_version(); }
 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
   fi
 fi # test "$curses"
@@ -1735,7 +1739,11 @@ fi
 if test "$curses" = "yes" ; then
   echo "#define CONFIG_CURSES 1" >> $config_h
   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
 if test "$atfile" = "yes" ; then
   echo "#define CONFIG_ATFILE 1" >> $config_h