diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 16:53:10 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-15 16:53:10 -0600 |
| commit | 58a864dec23f9052a5379a3ce81566e065c14afa (patch) | |
| tree | 8fc11aa19816f0089a0bb9e58346a1566c84c1e6 /configure | |
| parent | b9f84ac0fa81315bf4efa8db64f0705273b7499a (diff) | |
| parent | ecbe251fa0eb4905c4a82c887e37057243b9fbad (diff) | |
| download | qemu-58a864dec23f9052a5379a3ce81566e065c14afa.zip qemu-58a864dec23f9052a5379a3ce81566e065c14afa.tar.gz qemu-58a864dec23f9052a5379a3ce81566e065c14afa.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: try pkg-config for curses
qom: Make object_resolve_path_component() path argument const
Add libcacard/trace/generated-tracers.c to .gitignore
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 |