kconfig/lxdialog: get ncurses CFLAGS with pkg-config

PATCH In review Bjørn Forsman 2 participants 2 messages Sep 14, 2014 – Sep 23, 2014

Subsystems (2)

Kbuild Kconfig

lore

Share & tools

lore

Bjørn Forsman

author

2014-09-14 10:58 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 scripts/kconfig/lxdialog/check-lxdialog.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

scripts/kconfig/lxdialog/check-lxdialog.sh +5 -1

index 9d2a4c5..5075ebf 100644
@@ -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

Signature · 1 line

2.1.0

Michal Marek

2014-09-23 14:08 UTC #1 lore raw

Quoted 6 lines · Bjørn Forsman

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.

Applied to kbuild.git#kbuild, thanks.

Michal