summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-18 19:25:32 -0700
committerMichal Marek <mmarek@suse.cz>2010-09-20 14:09:31 +0200
commit8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 (patch)
tree2b0268c63b7444d28aa27a10635ee8554f6b2e4b /scripts
parentcec1921ec9a91b9bc7c083b6ebe47c17552b9a81 (diff)
downloadlinux-stable-8c41e5e363db55d91aa3b1cdce4ab02ad9821de7.tar.gz
linux-stable-8c41e5e363db55d91aa3b1cdce4ab02ad9821de7.tar.bz2
linux-stable-8c41e5e363db55d91aa3b1cdce4ab02ad9821de7.zip
kconfig: fix menuconfig on debian lenny
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@pobox.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/lxdialog/check-lxdialog.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index fcef0f59d553..82cc3a85e7f8 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