aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Evard <v.e.evard@gmail.com>2013-01-15 16:17:24 +0400
committerStefan Hajnoczi <stefanha@redhat.com>2013-01-15 18:09:01 +0100
commitecbe251fa0eb4905c4a82c887e37057243b9fbad (patch)
treee10706aa9c820eeff4520dd427616c32efac3ba0
parent3e84b4832180db2aa6187b6b971054bc3ca68be0 (diff)
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 <v.e.evard@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index c908f66583..40473a9bd7 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