Fix lxdialog check
This commit is contained in:
parent
c205d496ee
commit
0853243f05
@ -192,6 +192,8 @@ clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
|
|||||||
clean-files += mconf qconf gconf nconf
|
clean-files += mconf qconf gconf nconf
|
||||||
clean-files += config.pot linux.pot
|
clean-files += config.pot linux.pot
|
||||||
|
|
||||||
|
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
|
||||||
|
|
||||||
# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
|
# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
|
||||||
PHONY += $(obj)/dochecklxdialog
|
PHONY += $(obj)/dochecklxdialog
|
||||||
$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
|
$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
|
||||||
@ -217,8 +219,6 @@ HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
|
|||||||
HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
|
HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
|
||||||
-Wno-missing-prototypes
|
-Wno-missing-prototypes
|
||||||
|
|
||||||
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
|
|
||||||
|
|
||||||
HOSTLOADLIBES_nconf = $(shell \
|
HOSTLOADLIBES_nconf = $(shell \
|
||||||
pkg-config --libs menuw panelw ncursesw 2>/dev/null \
|
pkg-config --libs menuw panelw ncursesw 2>/dev/null \
|
||||||
|| pkg-config --libs menu panel ncurses 2>/dev/null \
|
|| pkg-config --libs menu panel ncurses 2>/dev/null \
|
||||||
|
@ -43,7 +43,7 @@ trap "rm -f $tmp" 0 1 2 3 15
|
|||||||
check() {
|
check() {
|
||||||
$cc -x c - -o $tmp 2>/dev/null <<'EOF'
|
$cc -x c - -o $tmp 2>/dev/null <<'EOF'
|
||||||
#include CURSES_LOC
|
#include CURSES_LOC
|
||||||
main() {}
|
int main() { return 0; }
|
||||||
EOF
|
EOF
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
echo " *** Unable to find the ncurses libraries or the" 1>&2
|
echo " *** Unable to find the ncurses libraries or the" 1>&2
|
||||||
|
Loading…
x
Reference in New Issue
Block a user