diff options
-rw-r--r-- | scripts/kconfig/Makefile | 4 | ||||
-rw-r--r-- | scripts/kconfig/lxdialog/check-lxdialog.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 231b4759c714..844bc9da08da 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
@@ -219,7 +219,9 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ | |||
219 | 219 | ||
220 | HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) | 220 | HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) |
221 | 221 | ||
222 | HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses | 222 | HOSTLOADLIBES_nconf = $(shell \ |
223 | pkg-config --libs menu panel ncurses 2>/dev/null \ | ||
224 | || echo "-lmenu -lpanel -lncurses" ) | ||
223 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck | 225 | $(obj)/qconf.o: $(obj)/.tmp_qtcheck |
224 | 226 | ||
225 | ifeq ($(qconf-target),1) | 227 | ifeq ($(qconf-target),1) |
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index 80788137c670..782d20085e1c 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh | |||
@@ -4,6 +4,8 @@ | |||
4 | # What library to link | 4 | # What library to link |
5 | ldflags() | 5 | ldflags() |
6 | { | 6 | { |
7 | pkg-config --libs ncursesw 2>/dev/null && exit | ||
8 | pkg-config --libs ncurses 2>/dev/null && exit | ||
7 | for ext in so a dll.a dylib ; do | 9 | for ext in so a dll.a dylib ; do |
8 | for lib in ncursesw ncurses curses ; do | 10 | for lib in ncursesw ncurses curses ; do |
9 | $cc -print-file-name=lib${lib}.${ext} | grep -q / | 11 | $cc -print-file-name=lib${lib}.${ext} | grep -q / |