[git commit] kconfig: fix menuconfig on debian lenny
Mike Frysinger
vapier at gentoo.org
Mon Apr 4 03:59:15 UTC 2016
commit: https://git.busybox.net/busybox/commit/?id=f48bd92285e20f1f9955bd3b07599beb80ef9ea5
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
support to link menuconfig with ncursesw library was added. To compute
the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
ncursesw to be used as a replacement ncurses. However, when checking what
header file to include, we do not check /usr/include/ncursesw directory.
Add /usr/include/ncursesw to the list of directories that are checked.
With this patch, on my Debian Lenny box with libncursesw5-dev package but
not libncurses5-dev package, I can say "make menuconfig".
Signed-off-by: Junio C Hamano <gitster at pobox.com>
Acked-by: Sam Ravnborg <sam at ravnborg.org>
Signed-off-by: Michal Marek <mmarek at suse.cz>
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
scripts/kconfig/lxdialog/check-lxdialog.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index fcef0f5..82cc3a8 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -23,6 +23,8 @@ ccflags()
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>"'
+ elif [ -f /usr/include/ncursesw/curses.h ]; then
+ echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
elif [ -f /usr/include/ncurses.h ]; then
echo '-DCURSES_LOC="<ncurses.h>"'
else
More information about the busybox-cvs
mailing list