diff mbox

Fix legacy ncurses detection.

Message ID 20161107133833.3681-1-msuchanek@suse.de (mailing list archive)
State New, archived
Headers show

Commit Message

Michal Suchanek Nov. 7, 2016, 1:38 p.m. UTC 
ncurses version in SUSE does not have .pc files so this is still needed to
build from git.

Signed-off-by: Michal Suchanek <msuchanek@suse.de>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Maydell Nov. 7, 2016, 1:55 p.m. UTC | #1 
On 7 November 2016 at 13:38, Michal Suchanek <msuchanek@suse.de> wrote:
> ncurses version in SUSE does not have .pc files so this is still needed to
> build from git.
>
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
>  configure | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index fd6f898..aab70ef 100755
> --- a/configure
> +++ b/configure
> @@ -2926,7 +2926,7 @@ if test "$curses" != "no" ; then
>      curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
>      curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
>    else
> -    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"
> +    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null)-I/usr/include/ncursesw:"
>      curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"

I think this will produce malformed output on platforms where
pkg-config does output something useful:
-D_GNU_SOURCE -I/usr/include/ncursesw-I/usr/include/ncursesw:

because there's no colon after the ')'.

In fact this code looks kind of dubious in general, because
it seems to assume that the output of pkg_config never has
a ':' in it...

thanks
-- PMM
diff mbox

Patch

diff --git a/configure b/configure
index fd6f898..aab70ef 100755
--- a/configure
+++ b/configure
@@ -2926,7 +2926,7 @@  if test "$curses" != "no" ; then
     curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
     curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
   else
-    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):"
+    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null)-I/usr/include/ncursesw:"
     curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
   fi
   curses_found=no