cfdisk: search for ncursesw/ncurses.h

Some distros install the wide version of ncurses side by side with the
non-wide version and place the wide headers in an ncursesw/ subdir.  So
detect that behavior and include the right header with cfdisk.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/configure.ac b/configure.ac
index 8c5f92f42a9d3ee82bf24e5efd645538a7bd374d..e4f88840728cc73ba9a64225c3843c69521b76a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -442,6 +442,7 @@ if test "x$with_ncurses" != xno; then
     if test "x$with_ncurses" = xauto; then
       UTIL_CHECK_LIB(ncursesw, initscr, ncurses)
       if test "x$have_ncurses" = xyes; then
+        AC_CHECK_HEADERS([ncursesw/ncurses.h])
         NCURSES_LIBS="-lncursesw"
       fi
     fi

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index 552858b6b77639cf052f05f3c019752f5026d121..7fa0b1916521b7122ee707d2d356af70f1352c7c 100644 (file)
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -75,6 +75,8 @@
 #include <slcurses.h>
 #elif defined(HAVE_SLANG_SLCURSES_H)
 #include <slang/slcurses.h>
+#elif defined(HAVE_NCURSESW_NCURSES_H) && defined(HAVE_WIDECHAR)
+#include <ncursesw/ncurses.h>
 #elif defined(HAVE_NCURSES_H)
 #include <ncurses.h>
 #elif defined(HAVE_NCURSES_NCURSES_H)