From f1b599de68684c28fe1b386b878eb2307a7f5946 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Wed, 6 Mar 2013 14:02:02 +0100 Subject: [PATCH] --- yaml --- r: 373692 b: refs/heads/master c: 544e7e548fbe75cb93784cc02fc01ce1501286b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/Makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 22f830429b75..f744a4819ac4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc9c6e000f62c2eeda426d4d5f022b3d57729bb0 +refs/heads/master: 544e7e548fbe75cb93784cc02fc01ce1501286b6 diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile index 231b4759c714..844bc9da08da 100644 --- a/trunk/scripts/kconfig/Makefile +++ b/trunk/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)