Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f40d9d3 authored by Michal Marek's avatar Michal Marek
Browse files

Merge branch 'yem-kconfig-rc-fixes' of... 

Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/kconfig
parents 6dbe51c2 544e7e54

scripts/kconfig/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -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)

scripts/kconfig/lxdialog/check-lxdialog.sh

+2 −0
Original line number Diff line number Diff line
@@ -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 /