From 903927dfd3dcebfbae7b1085004a973d71cb2f2f Mon Sep 17 00:00:00 2001 From: mirabilos Date: Wed, 22 Jul 2015 14:40:24 +0200 Subject: fix ncursesw detection on Debian sid --- adk/config/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'adk/config') 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="" +else ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h)) HOST_CFLAGS+= -I/usr/include/ncurses -DCURSES_LOC="" else @@ -49,6 +52,7 @@ endif endif endif endif +endif CONF_SRC =conf.c MCONF_SRC =mconf.c $(wildcard lxdialog/*.c) -- cgit v1.2.3 From 2c9f60e5770c4e243531df52b2fc6abf4cf04981 Mon Sep 17 00:00:00 2001 From: mirabilos Date: Wed, 22 Jul 2015 14:40:27 +0200 Subject: fix ncursesw library detection --- adk/config/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'adk/config') diff --git a/adk/config/Makefile b/adk/config/Makefile index 336b1f179..8481e3bff 100644 --- a/adk/config/Makefile +++ b/adk/config/Makefile @@ -12,36 +12,42 @@ HOST_CFLAGS+=-DKBUILD_NO_NLS -w all: ncurses conf mconf -LIBS= -lncurses +LIBS= ifeq (/usr/lib/libtinfo.so, $(wildcard /usr/lib/libtinfo.so)) -LIBS+= -ltinfo +LIBS= -ltinfo endif ifeq (/usr/include/ncursesw/curses.h, $(wildcard /usr/include/ncursesw/curses.h)) HOST_CFLAGS+= -I/usr/include/ncursesw -DCURSES_LOC="" +LIBS+= -lncursesw else ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h)) HOST_CFLAGS+= -I/usr/include/ncurses -DCURSES_LOC="" +LIBS+= -lncurses else ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h)) HOST_CFLAGS+= -I/usr/include/ncurses -DCURSES_LOC="" +LIBS+= -lncurses else ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h)) HOST_CFLAGS+= -I/usr/local/include/ncurses -DCURSES_LOC="" +LIBS+= -lncurses else ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h)) HOST_CFLAGS+= -I/usr/local/include/ncurses -DCURSES_LOC="" +LIBS+= -lncurses else ifeq (/usr/local/opt/ncurses/include/ncursesw/ncurses.h, $(wildcard /usr/local/opt/ncurses/include/ncursesw/ncurses.h)) HOST_CFLAGS+= -I/usr/local/opt/ncurses/include -DCURSES_LOC="" -LIBS+= -L/usr/local/opt/ncurses/lib -Wl,-rpath -Wl,/usr/local/opt/ncurses/lib +LIBS+= -L/usr/local/opt/ncurses/lib -Wl,-rpath -Wl,/usr/local/opt/ncurses/lib -lncursesw else ifeq (/usr/pkg/include/ncurses.h, $(wildcard /usr/pkg/include/ncurses.h)) HOST_CFLAGS+= -I/usr/pkg/include -DCURSES_LOC="" -LIBS+= -L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib +LIBS+= -L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib -lncurses else ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h)) HOST_CFLAGS+= -DCURSES_LOC="" +LIBS+= -lncurses else HOST_CFLAGS+= -DCURSES_LOC="" LIBS= -lcurses -- cgit v1.2.3