Browse Source

fix ncursesw detection on Debian sid

mirabilos 8 years ago
parent
commit
903927dfd3
2 changed files with 12 additions and 10 deletions
  1. 4 0
      adk/config/Makefile
  2. 8 10
      scripts/scan-tools.sh

+ 4 - 0
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)

+ 8 - 10
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