diff options
| author | mirabilos <tg@mirbsd.org> | 2015-07-22 14:40:24 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-07-25 16:19:37 +0200 |
| commit | 903927dfd3dcebfbae7b1085004a973d71cb2f2f (patch) | |
| tree | f6b34d7e2cb91824a439df4ecfa2d77a982e1999 | |
| parent | 74e47303e19fa31f5fa8ae053e4bdc87ec1c0eaa (diff) | |
fix ncursesw detection on Debian sid
| -rw-r--r-- | adk/config/Makefile | 4 | ||||
| -rw-r--r-- | 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 |