From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 1 Jul 2010 17:41:40 +0000 (-0400)
Subject: cfdisk: search for ncursesw/ncurses.h
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30c97bb8c97e20c502b5b1d588c94059747a40a6;p=util-linux

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 8c5f92f4..e4f88840 100644
--- 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 552858b6..7fa0b191 100644
--- 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)