summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-06-03 17:54:33 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-07-12 00:03:17 +0200
commit5e9f2de8726bcc3c80d0149ad7aee9dedf5412db (patch)
treeaddcbf18f476683101502d34712f623960fc7e99
parenta8095ddb3cdae4d2cb56563ed656bf09b091180c (diff)
backports: use check-lxdialog.sh
Upstream commit d58be321df286371d50ed54e835efeea087a9fac We ship it, so we should use it. This should fix issues like one distro needing "-lncurses -ltinfo" and others requiring just "-lncurses" and not having "tinfo". Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--backport/kconfig/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/backport/kconfig/Makefile b/backport/kconfig/Makefile
index ff5c2701..dfd793ae 100644
--- a/backport/kconfig/Makefile
+++ b/backport/kconfig/Makefile
@@ -3,7 +3,7 @@ CFLAGS=-Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
LXDIALOG := lxdialog/checklist.o lxdialog/inputbox.o lxdialog/menubox.o lxdialog/textbox.o lxdialog/util.o lxdialog/yesno.o
conf: conf.o zconf.tab.o
-mconf: LDFLAGS = -Wl,--no-as-needed -lncurses -ltinfo
+mconf: LDFLAGS = -Wl,--no-as-needed $(shell ./lxdialog/check-lxdialog.sh -ldflags $(CC))
mconf: CFLAGS += -DCURSES_LOC="<ncurses.h>" -DLOCALE
mconf: mconf.o zconf.tab.o $(LXDIALOG)