Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

6 files changed, 26 insertions, 13 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index ccd45130c482..b0cbbe2e41bb 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -375,7 +375,7 @@ int conf_write(const char *name)
                 if (!out_h)
                         return 1;
         }
-        sym = sym_lookup("KERNELRELEASE", 0);
+        sym = sym_lookup("KERNELVERSION", 0);
         sym_calc_value(sym);
         time(&now);
         env = getenv("KCONFIG_NOTIMESTAMP");
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index 9f5aabd58fa9..665bd5300a19 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -276,7 +276,7 @@ void init_main_window(const gchar * glade_file)
                                           NULL);
 
         sprintf(title, _("Linux Kernel v%s Configuration"),
-                getenv("KERNELRELEASE"));
+                getenv("KERNELVERSION"));
         gtk_window_set_title(GTK_WINDOW(main_wnd), title);
 
         gtk_widget_show(main_wnd);
diff --git a/scripts/kconfig/lxdialog/Makefile b/scripts/kconfig/lxdialog/Makefile
index 8f41d9a57aaa..fae3e29fc924 100644
--- a/scripts/kconfig/lxdialog/Makefile
+++ b/scripts/kconfig/lxdialog/Makefile
@@ -1,9 +1,9 @@
 # Makefile to build lxdialog package
 #
 
-check-lxdialog   := $(srctree)/$(src)/check-lxdialog.sh
-HOST_EXTRACFLAGS := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES   := $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags)
+check-lxdialog  := $(srctree)/$(src)/check-lxdialog.sh
+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 a3c141b49670..448e353923f3 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,11 +4,22 @@
 # What library to link
 ldflags()
 {
-        if [ `uname` == SunOS ]; then
-                echo '-lcurses'
-        else
+        echo "main() {}" | $cc -lncursesw -xc - -o /dev/null 2> /dev/null
+        if [ $? -eq 0 ]; then
+                echo '-lncursesw'
+                exit
+        fi
+        echo "main() {}" | $cc -lncurses -xc - -o /dev/null 2> /dev/null
+        if [ $? -eq 0 ]; then
                 echo '-lncurses'
+                exit
         fi
+        echo "main() {}" | $cc -lcurses -xc - -o /dev/null 2> /dev/null
+        if [ $? -eq 0 ]; then
+                echo '-lcurses'
+                exit
+        fi
+        exit 1
 }
 
 # Where is ncurses.h?
@@ -28,7 +39,7 @@ ccflags()
 compiler=""
 # Check if we can link to ncurses
 check() {
-        echo "main() {}" | $compiler -xc -
+        echo "main() {}" | $cc -xc - -o /dev/null 2> /dev/null
         if [ $? != 0 ]; then
                 echo " *** Unable to find the ncurses libraries."          1>&2
                 echo " *** make menuconfig require the ncurses libraries"  1>&2
@@ -51,13 +62,15 @@ fi
 case "$1" in
         "-check")
                 shift
-                compiler="$@"
+                cc="$@"
                 check
                 ;;
         "-ccflags")
                 ccflags
                 ;;
         "-ldflags")
+                shift
+                cc="$@"
                 ldflags
                 ;;
         "*")
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d63d7fb677e4..7f973195e79a 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -1051,7 +1051,7 @@ int main(int ac, char **av)
         conf_parse(av[1]);
         conf_read(NULL);
 
-        sym = sym_lookup("KERNELRELEASE", 0);
+        sym = sym_lookup("KERNELVERSION", 0);
         sym_calc_value(sym);
         sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"),
                 sym_get_string_value(sym));
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 69c2549c0baa..3d7877afccd5 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -61,10 +61,10 @@ void sym_init(void)
         if (p)
                 sym_add_default(sym, p);
 
-        sym = sym_lookup("KERNELRELEASE", 0);
+        sym = sym_lookup("KERNELVERSION", 0);
         sym->type = S_STRING;
         sym->flags |= SYMBOL_AUTO;
-        p = getenv("KERNELRELEASE");
+        p = getenv("KERNELVERSION");
         if (p)
                 sym_add_default(sym, p);