summaryrefslogtreecommitdiff
path: root/scripts/kconfig/lxdialog
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-09-14 14:57:50 +0400
committerMichal Marek <mmarek@suse.cz>2014-09-23 17:47:48 +0400
commitbe8af2d54a66911693eddc556e4f7a866670082b (patch)
tree7e0e5c346f4096c4e924e4ee8d9526a2921793dc /scripts/kconfig/lxdialog
parent7285996aa0006d671bb01f0d35991d254b2b2b01 (diff)
downloadlinux-be8af2d54a66911693eddc556e4f7a866670082b.tar.xz
kconfig/lxdialog: get ncurses CFLAGS with pkg-config
This makes "make menuconfig" also work on systems where ncurses is not installed in a standard location (such as on NixOS). This patch changes ccflags() so that it tries pkg-config first, and only if pkg-config fails does it go back to the fallback/manual checks. This is the same algorithm that ldflags() already uses. Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/kconfig/lxdialog')
-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