summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-03-21 23:00:03 +0100
committerMichal Marek <mmarek@suse.cz>2013-03-21 23:00:03 +0100
commit0f40d9d3c5fb40da75af343f27775ca8a15e3806 (patch)
tree0cdb5421236b0b817fbb544bd1863d0207501ddb
parent6dbe51c251a327e012439c4772097a13df43c5b8 (diff)
parent544e7e548fbe75cb93784cc02fc01ce1501286b6 (diff)
downloadop-kernel-dev-0f40d9d3c5fb40da75af343f27775ca8a15e3806.zip
op-kernel-dev-0f40d9d3c5fb40da75af343f27775ca8a15e3806.tar.gz
Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig
-rw-r--r--scripts/kconfig/Makefile4
-rw-r--r--scripts/kconfig/lxdialog/check-lxdialog.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 231b475..844bc9d 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` \
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-HOSTLOADLIBES_nconf = -lmenu -lpanel -lncurses
+HOSTLOADLIBES_nconf = $(shell \
+ pkg-config --libs menu panel ncurses 2>/dev/null \
+ || echo "-lmenu -lpanel -lncurses" )
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
ifeq ($(qconf-target),1)
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 8078813..782d200 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,6 +4,8 @@
# What library to link
ldflags()
{
+ pkg-config --libs ncursesw 2>/dev/null && exit
+ pkg-config --libs ncurses 2>/dev/null && exit
for ext in so a dll.a dylib ; do
for lib in ncursesw ncurses curses ; do
$cc -print-file-name=lib${lib}.${ext} | grep -q /
OpenPOWER on IntegriCloud