[patch] curses[tinfo].patch

0001-configure-try-pkg-config-for-curses.patch (text/plain), 1.24 KB, created by Justin Lecher (RETIRED) on 2013-02-14 12:08:49 UTC

From ecbe251fa0eb4905c4a82c887e37057243b9fbad Mon Sep 17 00:00:00 2001
From: Vadim Evard <[e-mail]>
Date: Tue, 15 Jan 2013 16:17:24 +0400
Subject: [PATCH] configure: try pkg-config for curses

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 <[e-mail]>
Signed-off-by: Stefan Hajnoczi <[e-mail]>
---
 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.7.10.2 (Apple Git-33)