summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-09-24 14:22:15 +0200
committerMichal Marek <mmarek@suse.cz>2014-09-24 14:22:15 +0200
commit03d5356ee6d0a5455d9bb6ceb8965b6397e961ad (patch)
tree6eccef8b16ca651b53ce263b7cbb5c0aae1ebf50 /scripts
parent04d29c44a5c946e10e45c7c00515389aff647040 (diff)
parentbe8af2d54a66911693eddc556e4f7a866670082b (diff)
downloadlinux-next-03d5356ee6d0a5455d9bb6ceb8965b6397e961ad.tar.gz
Merge branch 'kbuild/kbuild' into kbuild/for-next
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/kconfig/lxdialog/check-lxdialog.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 9d2a4c585ee1..5075ebf2d3b9 100755
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -21,7 +21,11 @@ ldflags()
# Where is ncurses.h?
ccflags()
{
- if [ -f /usr/include/ncursesw/curses.h ]; then
+ if pkg-config --cflags ncursesw 2>/dev/null; then
+ echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
+ elif pkg-config --cflags ncurses 2>/dev/null; then
+ echo '-DCURSES_LOC="<ncurses.h>"'
+ elif [ -f /usr/include/ncursesw/curses.h ]; then
echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
echo ' -DNCURSES_WIDECHAR=1'
elif [ -f /usr/include/ncurses/ncurses.h ]; then