[git commit master 1/1] lxdialog: fix ncursesw include detection
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Fri Jun 11 13:35:57 UTC 2010
commit: http://git.uclibc.org/uClibc/commit/?id=0c5262ec8dde8fe5ccc59713e8aefbeac670161b
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
extra/config/Makefile | 2 +-
extra/config/lxdialog/check-lxdialog.sh | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
mode change 100755 => 100644 extra/config/lxdialog/check-lxdialog.sh
diff --git a/extra/config/Makefile b/extra/config/Makefile
index 800f750..46c3614 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
old mode 100755
new mode 100644
index fcef0f5..d34dfd4
--- 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>"'
--
1.7.1
More information about the uClibc-cvs
mailing list