summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-06-11 15:35:57 +0200
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-06-11 15:35:57 +0200
commit0c5262ec8dde8fe5ccc59713e8aefbeac670161b (patch)
tree945634361ff9e1a03012e3183555c0f1c834a415
parente76d6c8738aea33317c8d7bb57e4b1acff111edb (diff)
lxdialog: fix ncursesw include detection
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--extra/config/Makefile2
-rw-r--r--[-rwxr-xr-x]extra/config/lxdialog/check-lxdialog.sh6
2 files changed, 6 insertions, 2 deletions
diff --git a/extra/config/Makefile b/extra/config/Makefile
index 800f750d3..46c3614a1 100644
--- a/extra/config/Makefile
+++ b/extra/config/Makefile
@@ -20,7 +20,7 @@ generated := $(addprefix $(obj)/,$(generated:.c=.o))
include $(top_srcdir)extra/config/Makefile.kconfig
PHONY += $(always)
chk-lxdialog := $(top_srcdir)$(src)/lxdialog/check-lxdialog.sh
-check-lxdialog := cd $(obj) && $(chk-lxdialog)
+check-lxdialog := cd $(obj) && $(CONFIG_SHELL) $(chk-lxdialog)
HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) -c '$(check-lxdialog) -ccflags')
HOST_LOADLIBES = $(shell $(CONFIG_SHELL) -c '$(check-lxdialog) -ldflags $(HOSTCC)')
HOST_EXTRACFLAGS += -DLOCALE
diff --git a/extra/config/lxdialog/check-lxdialog.sh b/extra/config/lxdialog/check-lxdialog.sh
index fcef0f59d..d34dfd46d 100755..100644
--- a/extra/config/lxdialog/check-lxdialog.sh
+++ b/extra/config/lxdialog/check-lxdialog.sh
@@ -19,7 +19,11 @@ ldflags()
# Where is ncurses.h?
ccflags()
{
- if [ -f /usr/include/ncurses/ncurses.h ]; then
+ if [ -f /usr/include/ncursesw/ncurses.h ]; then
+ echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"'
+ elif [ -f /usr/include/ncursesw/curses.h ]; then
+ echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+ elif [ -f /usr/include/ncurses/ncurses.h ]; then
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
elif [ -f /usr/include/ncurses/curses.h ]; then
echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'