3 files changed, 15 insertions, 18 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index d64aae85c378..5760e057ecba 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -123,17 +123,7 @@ KBUILD_HAVE_NLS := $(shell \
     then echo yes ; \
     else echo no ; fi)
 ifeq ($(KBUILD_HAVE_NLS),no)
-  HOSTCFLAGS   += -DKBUILD_NO_NLS
+HOSTCFLAGS      += -DKBUILD_NO_NLS
-else
-  KBUILD_NEED_LINTL := $(shell \
-    if echo -e "\#include <libintl.h>\nint main(int a, char** b) { gettext(\"\"); return 0; }\n" | \
-      $(HOSTCC) $(HOSTCFLAGS) -x c - -o /dev/null> /dev/null 2>&1 ; \
-    then echo no ; \
-    else echo yes ; fi)
-  ifeq ($(KBUILD_NEED_LINTL),yes)
-    HOSTLOADLIBES_conf += -lintl
-    HOSTLOADLIBES_mconf        += -lintl
-  endif
 endif
 # generated files seem to need this to find local include files
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
index fae3e29fc924..bbf4887cff74 100644
--- a/scripts/kconfig/lxdialog/Makefile
+++ b/scripts/kconfig/lxdialog/Makefile
@@ -2,8 +2,11 @@
 #
 check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh
-HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES  := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+# Use reursively expanded variables so we do not call gcc unless
+# we really need to do so. (Do not call gcc as part of make mrproper)
+HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 
 HOST_EXTRACFLAGS += -DLOCALE 
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 448e353923f3..120d624e672c 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,17 +4,17 @@
 # What library to link
 ldflags()
 {
-        echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null
+        $cc -print-file-name=libncursesw.so | grep -q /
        if [ $? -eq 0 ]; then
                echo '-lncursesw'
                exit
        fi
-        echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null
+        $cc -print-file-name=libncurses.so | grep -q /
        if [ $? -eq 0 ]; then
                echo '-lncurses'
                exit
        fi
-        echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null
+        $cc -print-file-name=libcurses.so | grep -q /
        if [ $? -eq 0 ]; then
                echo '-lcurses'
                exit
@@ -36,10 +36,13 @@ ccflags()
        fi
 }
-compiler=""
+# Temp file, try to clean up after us
+tmp=.lxdialog.tmp
+trap "rm -f $tmp" 0 1 2 3 15
 # Check if we can link to ncurses
 check() {
-        echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null
+        echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
        if [ $? != 0 ]; then
                echo " *** Unable to find the ncurses libraries."          1>&2
                echo " *** make menuconfig require the ncurses libraries"  1>&2
@@ -59,6 +62,7 @@ if [ $# == 0 ]; then
        exit 1
 fi
+cc=""
 case "$1" in
        "-check")
                shift

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index d64aae85c378..5760e057ecba 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile
@@ -123,17 +123,7 @@ KBUILD_HAVE_NLS := $(shell \
123	then echo yes ; \	123	then echo yes ; \
124	else echo no ; fi)	124	else echo no ; fi)
125	ifeq ($(KBUILD_HAVE_NLS),no)	125	ifeq ($(KBUILD_HAVE_NLS),no)
126	HOSTCFLAGS += -DKBUILD_NO_NLS	126	HOSTCFLAGS += -DKBUILD_NO_NLS
127	else
128	KBUILD_NEED_LINTL := $(shell \
129	if echo -e "\#include <libintl.h>\nint main(int a, char** b) { gettext(\"\"); return 0; }\n" \| \
130	$(HOSTCC) $(HOSTCFLAGS) -x c - -o /dev/null> /dev/null 2>&1 ; \
131	then echo no ; \
132	else echo yes ; fi)
133	ifeq ($(KBUILD_NEED_LINTL),yes)
134	HOSTLOADLIBES_conf += -lintl
135	HOSTLOADLIBES_mconf += -lintl
136	endif
137	endif	127	endif
138		128
139	# generated files seem to need this to find local include files	129	# generated files seem to need this to find local include files


diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile index fae3e29fc924..bbf4887cff74 100644 --- a/scripts/kconfig/lxdialog/Makefile +++ b/scripts/kconfig/lxdialog/Makefile
@@ -2,8 +2,11 @@
2	#	2	#
3		3
4	check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh	4	check-lxdialog := $(srctree)/$(src)/check-lxdialog.sh
5	HOST_EXTRACFLAGS:= $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)	5
6	HOST_LOADLIBES := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))	6	# Use reursively expanded variables so we do not call gcc unless
		7	# we really need to do so. (Do not call gcc as part of make mrproper)
		8	HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
		9	HOST_LOADLIBES = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
7		10
8	HOST_EXTRACFLAGS += -DLOCALE	11	HOST_EXTRACFLAGS += -DLOCALE
9		12


diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh index 448e353923f3..120d624e672c 100644 --- a/scripts/kconfig/lxdialog/check-lxdialog.sh +++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,17 +4,17 @@
4	# What library to link	4	# What library to link
5	ldflags()	5	ldflags()
6	{	6	{
7	echo "main() {}" \| $cc -lncursesw -xc - -o /dev/null 2> /dev/null	7	$cc -print-file-name=libncursesw.so \| grep -q /
8	if [ $? -eq 0 ]; then	8	if [ $? -eq 0 ]; then
9	echo '-lncursesw'	9	echo '-lncursesw'
10	exit	10	exit
11	fi	11	fi
12	echo "main() {}" \| $cc -lncurses -xc - -o /dev/null 2> /dev/null	12	$cc -print-file-name=libncurses.so \| grep -q /
13	if [ $? -eq 0 ]; then	13	if [ $? -eq 0 ]; then
14	echo '-lncurses'	14	echo '-lncurses'
15	exit	15	exit
16	fi	16	fi
17	echo "main() {}" \| $cc -lcurses -xc - -o /dev/null 2> /dev/null	17	$cc -print-file-name=libcurses.so \| grep -q /
18	if [ $? -eq 0 ]; then	18	if [ $? -eq 0 ]; then
19	echo '-lcurses'	19	echo '-lcurses'
20	exit	20	exit
@@ -36,10 +36,13 @@ ccflags()
36	fi	36	fi
37	}	37	}
38		38
39	compiler=""	39	# Temp file, try to clean up after us
		40	tmp=.lxdialog.tmp
		41	trap "rm -f $tmp" 0 1 2 3 15
		42
40	# Check if we can link to ncurses	43	# Check if we can link to ncurses
41	check() {	44	check() {
42	echo "main() {}" \| $cc -xc - -o /dev/null 2> /dev/null	45	echo "main() {}" \| $cc -xc - -o $tmp 2> /dev/null
43	if [ $? != 0 ]; then	46	if [ $? != 0 ]; then
44	echo " *** Unable to find the ncurses libraries." 1>&2	47	echo " *** Unable to find the ncurses libraries." 1>&2
45	echo " *** make menuconfig require the ncurses libraries" 1>&2	48	echo " *** make menuconfig require the ncurses libraries" 1>&2
@@ -59,6 +62,7 @@ if [ $# == 0 ]; then
59	exit 1	62	exit 1
60	fi	63	fi
61		64
		65	cc=""
62	case "$1" in	66	case "$1" in
63	"-check")	67	"-check")
64	shift	68	shift