build-sys: ncurses headers cleanup

* assume ncursesw headers in ncursesw/ directory only
* prefer long paths, <term.h> and <ncurses.h> should be last
  possibility
* fix typos

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/configure.ac b/configure.ac
index 8bb7fb71e0c04267b6f1fcebe5e30da9e184df65..217d5dc5bb1f29ff7ff9962ecaf29bc9dca8c3b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -803,9 +803,8 @@ have_ncursesw_header=no
 AS_IF([test "x$with_ncursesw" != xno], [
   UL_NCURSES_CHECK([ncursesw])
   AS_IF([test "x$have_ncursesw" = xyes], [
-    AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses.h],
-                    [have_ncursesw_header=yes])
-    AC_CHECK_HEADERS([ncursesw/term.h term.h])
+    AC_CHECK_HEADERS([ncursesw/ncurses.h], [have_ncursesw_header=yes])
+    AC_CHECK_HEADERS([ncursesw/term.h])
     AS_IF([test "x$have_ncursesw_header" = xno], [have_ncursesw=no])
   ])
   AS_IF([test "x$have_ncursesw" = xyes], [
@@ -830,8 +829,7 @@ AS_CASE([$with_ncurses:$build_widechar],
 AS_IF([test "x$have_ncursesw" = xno -a "x$with_ncurses" != xno ], [
   UL_NCURSES_CHECK([ncurses])
   AS_IF([test "x$have_ncurses" = xyes], [
-    AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h],
-                    [have_ncurses_header=yes])
+    AC_CHECK_HEADERS([ncurses/ncurses.h ncurses.h], [have_ncurses_header=yes])
     AC_CHECK_HEADERS([ncurses/term.h term.h])
     AS_IF([test "x$have_ncurses_header" = xno], [have_ncurses=no])
   ])

diff --git a/lib/colors.c b/lib/colors.c
index 72c5158cb3d551e875ebcd3ce161acecff8e60ef..f82496d7a12a3e06460d3742655ccd5efcc4cf4e 100644 (file)
--- a/lib/colors.c
+++ b/lib/colors.c
@@ -12,12 +12,19 @@
 #include <ctype.h>
 
 #if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW)
-# ifdef HAVE_TERM_H
-#  include <term.h>
+# if defined(HAVE_NCURSESW_NCURSES_H)
+#  include <ncursesw/ncurses.h>
+# elif defined(HAVE_NCURSES_NCURSES_H)
+#  include <ncurses/ncurses.h>
+# elif defined(HAVE_NCURSES_H)
+#  include <ncurses.h>
+# endif
+# if defined(HAVE_NCURSESW_TERM_H)
+#  include <ncursesw/term.h>
 # elif defined(HAVE_NCURSES_TERM_H)
 #  include <ncurses/term.h>
-# elif defined(HAVE_NCURSESW_TERM_H)
-#  include <ncursesw/term.h>
+# elif defined(HAVE_TERM_H)
+#  include <term.h>
 # endif
 #endif
 

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 2b16979db407f10ff1b2d59a02fc23a6f38e405d..604eb26a7675b629e3a058903a34270cb92813fe 100644 (file)
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -80,12 +80,12 @@ static int has_term = 0;
 static const char *Senter = "", *Sexit = "";   /* enter and exit standout mode */
 
 #if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW)
-# ifdef HAVE_TERM_H
-#  include <term.h>
+# if defined(HAVE_NCURSESW_TERM_H)
+#  include <ncursesw/term.h>
 # elif defined(HAVE_NCURSES_TERM_H)
 #  include <ncurses/term.h>
-# elif defined(HAVE_NCURSESW_TERM_H)
-#  include <ncursesw/term.h>
+# elif defined(HAVE_TERM_H)
+#  include <term.h>
 # endif
 #endif
 

diff --git a/term-utils/setterm.c b/term-utils/setterm.c
index 53826f95409bd009593d375abeaf2b68911b4bd4..9f60e569342ffb8a312f42b607f4f20cd0502bb1 100644 (file)
--- a/term-utils/setterm.c
+++ b/term-utils/setterm.c
@@ -60,12 +60,12 @@
 #include <termios.h>
 #include <unistd.h>
 
-#ifdef HAVE_TERM_H
-# include <term.h>
+#if defined(HAVE_NCURSESW_TERM_H)
+# include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_TERM_H)
 # include <ncurses/term.h>
-#elif defined(HAVE_NCURSESW_TERM_H)
-# include <ncursesw/term.h>
+#elif defined(HAVE_TERM_H)
+# include <term.h>
 #endif
 
 #ifdef HAVE_LINUX_TIOCL_H

diff --git a/text-utils/more.c b/text-utils/more.c
index cc53075f616d77ca2dbbf351218745cf082bae54..72dd96bf4231f13648a1f0e1fe307700eb19930f 100644 (file)
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -190,12 +190,12 @@ static struct {
 } context, screen_start;
 extern char PC;                        /* pad character */
 
-#ifdef HAVE_TERM_H
-# include <term.h>
+#if defined(HAVE_NCURSESW_TERM_H)
+# include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_TERM_H)
 # include <ncurses/term.h>
-#elif defined(HAVE_NCURSESW_TERM_H)
-#  include <ncursesw/term.h>
+#elif defined(HAVE_TERM_H)
+# include <term.h>
 #endif
 
 #define TERM_AUTO_RIGHT_MARGIN    "am"

diff --git a/text-utils/pg.c b/text-utils/pg.c
index bc485e2fe9ef0eee3a39dd8ec68c721ea9a1edf1..1b9b8d7dd9ab013d359d761f67524d21dbc8a9c5 100644 (file)
--- a/text-utils/pg.c
+++ b/text-utils/pg.c
@@ -59,22 +59,20 @@
 #include <signal.h>
 #include <setjmp.h>
 
-#ifdef HAVE_NCURSESW_H
-# include <ncursesw.h>
-#elif defined(HAVE_NCURSES_H)
-# include <ncurses.h>
-#elif defined(HAVE_NCURSESW_NCURSES_H)
+#if defined(HAVE_NCURSESW_NCURSES_H)
 # include <ncursesw/ncurses.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)
 # include <ncurses/ncurses.h>
+#elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
 #endif
 
-#ifdef HAVE_TERM_H
-# include <term.h>
+#if defined(HAVE_NCURSESW_TERM_H)
+# include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_TERM_H)
 # include <ncurses/term.h>
-#elif defined(HAVE_NCURSESW_TERM_H)
-# include <ncursesw/term.h>
+#elif defined(HAVE_TERM_H)
+# include <term.h>
 #endif
 
 #include "nls.h"

diff --git a/text-utils/ul.c b/text-utils/ul.c
index 3d1518ceacc87efcee2e0ed3e11a82d372eb6347..3986b420609eb80c199797bcdc2310e03a16ec3a 100644 (file)
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -49,12 +49,12 @@
 #include <errno.h>
 #include <getopt.h>
 
-#ifdef HAVE_TERM_H
-# include <term.h>
+#if defined(HAVE_NCURSESW_TERM_H)
+# include <ncursesw/term.h>
 #elif defined(HAVE_NCURSES_TERM_H)
 # include <ncurses/term.h>
-#elif defined(HAVE_NCURSESW_TERM_H)
-# include <ncursesw/term.h>
+#elif defined(HAVE_TERM_H)
+# include <term.h>
 #endif
 
 #include "nls.h"