From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:39320)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1TvA5Q-0002GJ-IX
	for qemu-devel@nongnu.org; Tue, 15 Jan 2013 12:14:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1TvA5M-0004cD-9Q
	for qemu-devel@nongnu.org; Tue, 15 Jan 2013 12:14:08 -0500
Received: from mx1.redhat.com ([209.132.183.28]:17681)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@redhat.com>) id 1TvA5M-0004bJ-32
	for qemu-devel@nongnu.org; Tue, 15 Jan 2013 12:14:04 -0500
From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Tue, 15 Jan 2013 18:13:53 +0100
Message-Id: <1358270033-18064-4-git-send-email-stefanha@redhat.com>
In-Reply-To: <1358270033-18064-1-git-send-email-stefanha@redhat.com>
References: <1358270033-18064-1-git-send-email-stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH 3/3] configure: try pkg-config for curses
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Anthony Liguori <aliguori@us.ibm.com>, Vadim Evard <v.e.evard@gmail.com>, Stefan Hajnoczi <stefanha@redhat.com>

From: Vadim Evard <v.e.evard@gmail.com>

Static linkikng against ncurses may require explicit -ltinfo.
In case -lcurses and -lncurses both didn't work give pkg-config a
chance.

Fixes #1094786 for me.

Signed-off-by: Vadim Evard <v.e.evard@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 configure | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index c908f66..40473a9 100755
--- a/configure
+++ b/configure
@@ -2039,7 +2039,7 @@ fi
 if test "$mingw32" = "yes" ; then
     curses_list="-lpdcurses"
 else
-    curses_list="-lncurses -lcurses"
+    curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)"
 fi
 
 if test "$curses" != "no" ; then
@@ -2052,13 +2052,16 @@ int main(void) {
   return s != 0;
 }
 EOF
+  IFS=:
   for curses_lib in $curses_list; do
+    unset IFS
     if compile_prog "" "$curses_lib" ; then
       curses_found=yes
       libs_softmmu="$curses_lib $libs_softmmu"
       break
     fi
   done
+  unset IFS
   if test "$curses_found" = "yes" ; then
     curses=yes
   else
-- 
1.8.0.2