Patchwork [Qemu-trivial,v2] configure: try pkg-config for curses

login
register
mail settings
Submitter Vadim Evard
Date Jan. 15, 2013, 12:17 p.m.
Message ID <50F548D4.90903@gmail.com>
Download mbox | patch
Permalink /patch/212138/
State New
Headers show

Comments

Vadim Evard - Jan. 15, 2013, 12:17 p.m.
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>
---
  configure |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)

Patch

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