1 From 87c26ce5b689abe1b52181f98ef3c9eb1b1a5165 Mon Sep 17 00:00:00 2001
2 From: Karel Zak <kzak@redhat.com>
3 Date: Tue, 1 Aug 2017 14:36:25 +0200
4 Subject: [PATCH] build-sys: support ncursesw without headers in ncursesw/
7 Let's check always for alone ncurses.h and term.h if the preferred
8 variant with ncursesw/ subdirectory is not available.
10 The patch also minimize number of HAVE_...NCURSES_H macros in
11 config.h. We don't need to check for ncurses.h if ncurses/ncurses.h is
14 Reported-by: Carlos Santos <casantos@datacom.ind.br>
15 Signed-off-by: Karel Zak <kzak@redhat.com>
17 configure.ac | 18 ++++++++++++++++--
18 1 file changed, 16 insertions(+), 2 deletions(-)
20 diff --git a/configure.ac b/configure.ac
21 index b204ec11e..592bd587e 100644
24 @@ -810,6 +810,13 @@ AS_IF([test "x$with_ncursesw" != xno], [
25 AS_IF([test "x$have_ncursesw" = xyes], [
26 AC_CHECK_HEADERS([ncursesw/ncurses.h], [have_ncursesw_header=yes])
27 AC_CHECK_HEADERS([ncursesw/term.h])
29 + # Define HAVE_NCURSES_H only if check for HAVE_NCURSESW_NCURSES_H is
30 + # unsuccessful to avoid too many *_H permitations in config.h
31 + AS_IF([test "x$have_ncursesw_header" = xno], [
32 + AC_CHECK_HEADERS([ncurses.h], [have_ncursesw_header=yes])
33 + AC_CHECK_HEADERS([term.h])
35 AS_IF([test "x$have_ncursesw_header" = xno], [have_ncursesw=no])
37 AS_IF([test "x$have_ncursesw" = xyes], [
38 @@ -834,8 +841,15 @@ AS_CASE([$with_ncurses:$build_widechar],
39 AS_IF([test "x$have_ncursesw" = xno -a "x$with_ncurses" != xno ], [
40 UL_NCURSES_CHECK([ncurses])
41 AS_IF([test "x$have_ncurses" = xyes], [
42 - AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h], [have_ncurses_header=yes])
43 - AC_CHECK_HEADERS([ncurses/term.h term.h])
44 + AC_CHECK_HEADERS([ncurses/ncurses.h], [have_ncurses_header=yes])
45 + AC_CHECK_HEADERS([ncurses/term.h])
47 + # Define HAVE_NCURSES_H only if check for HAVE_NCURSES_NCURSES_H is
48 + # unsuccessful to avoid too many *_H permitations in config.h
49 + AS_IF([test "x$have_ncurses_header" = xno], [
50 + AC_CHECK_HEADERS([ncurses.h], [have_ncurses_header=yes])
51 + AC_CHECK_HEADERS([term.h])
53 AS_IF([test "x$have_ncurses_header" = xno], [have_ncurses=no])
55 AS_IF([test "x$have_ncurses" = xyes], [