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>
This commit is contained in:
parent
3e84b48321
commit
ecbe251fa0
|
@ -2039,7 +2039,7 @@ fi
|
||||||
if test "$mingw32" = "yes" ; then
|
if test "$mingw32" = "yes" ; then
|
||||||
curses_list="-lpdcurses"
|
curses_list="-lpdcurses"
|
||||||
else
|
else
|
||||||
curses_list="-lncurses -lcurses"
|
curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$curses" != "no" ; then
|
if test "$curses" != "no" ; then
|
||||||
|
@ -2052,13 +2052,16 @@ int main(void) {
|
||||||
return s != 0;
|
return s != 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
IFS=:
|
||||||
for curses_lib in $curses_list; do
|
for curses_lib in $curses_list; do
|
||||||
|
unset IFS
|
||||||
if compile_prog "" "$curses_lib" ; then
|
if compile_prog "" "$curses_lib" ; then
|
||||||
curses_found=yes
|
curses_found=yes
|
||||||
libs_softmmu="$curses_lib $libs_softmmu"
|
libs_softmmu="$curses_lib $libs_softmmu"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
unset IFS
|
||||||
if test "$curses_found" = "yes" ; then
|
if test "$curses_found" = "yes" ; then
|
||||||
curses=yes
|
curses=yes
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue