From 903927dfd3dcebfbae7b1085004a973d71cb2f2f Mon Sep 17 00:00:00 2001
From: mirabilos <tg@mirbsd.org>
Date: Wed, 22 Jul 2015 14:40:24 +0200
Subject: fix ncursesw detection on Debian sid

---
 adk/config/Makefile   |  4 ++++
 scripts/scan-tools.sh | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/adk/config/Makefile b/adk/config/Makefile
index 989dbeee8..336b1f179 100644
--- a/adk/config/Makefile
+++ b/adk/config/Makefile
@@ -17,6 +17,9 @@ ifeq (/usr/lib/libtinfo.so, $(wildcard /usr/lib/libtinfo.so))
 LIBS+=		-ltinfo
 endif
 
+ifeq (/usr/include/ncursesw/curses.h, $(wildcard /usr/include/ncursesw/curses.h))
+HOST_CFLAGS+=	-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"
+else
 ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
 HOST_CFLAGS+=	-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
 else
@@ -49,6 +52,7 @@ endif
 endif
 endif
 endif
+endif
 
 CONF_SRC  =conf.c
 MCONF_SRC =mconf.c $(wildcard lxdialog/*.c)
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index b5d35183a..835606e60 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -176,16 +176,14 @@ if [[ $X != *@(Native compiler works)* ]]; then
 	out=1
 fi
 
-if [[ ! -s /usr/include/ncurses.h ]]; then
-	if [[ ! -s /usr/include/curses.h ]]; then
-		if [[ ! -s /usr/include/ncurses/ncurses.h ]]; then
-			if [[ ! -s /usr/local/opt/ncurses/include/ncursesw/ncurses.h ]]; then
-				echo Install ncurses header files, please.
-				echo
-				out=1
-			fi
-		fi
-	fi
+if [[ ! -s /usr/include/ncursesw/curses.h && \
+    ! -s /usr/include/ncurses.h && \
+    ! -s /usr/include/curses.h && \
+    ! -s /usr/include/ncurses/ncurses.h && \
+    ! -s /usr/local/opt/ncurses/include/ncursesw/ncurses.h ]]; then
+	echo Install ncurses header files, please.
+	echo
+	out=1
 fi
 
 if ! which wget >/dev/null 2>&1; then
-- 
cgit v1.2.3