Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (79 commits)
  Remove references to "make dep"
  kconfig: document use of HAVE_*
  Introduce new section reference annotations tags: __ref, __refdata, __refconst
  kbuild: warn about ld added unique sections
  kbuild: add verbose option to Section mismatch reporting in modpost
  kconfig: tristate choices with mixed tristate and boolean values
  asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
  remove __attribute_used__
  kbuild: support ARCH=x86 in buildtar
  kconfig: remove "enable"
  kbuild: simplified warning report in modpost
  kbuild: introduce a few helpers in modpost
  kbuild: use simpler section mismatch warnings in modpost
  kbuild: link vmlinux.o before kallsyms passes
  kbuild: introduce new option to enhance section mismatch analysis
  Use separate sections for __dev/__cpu/__mem code/data
  compiler.h: introduce __section()
  all archs: consolidate init and exit sections in vmlinux.lds.h
  kbuild: check section names consistently in modpost
  kbuild: introduce blacklisting in modpost
  ...

1 files changed, 9 insertions, 7 deletions

diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index 9681476b96e7..62e1e02126e6 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -36,14 +36,16 @@ trap "rm -f $tmp" 0 1 2 3 15
 
 # Check if we can link to ncurses
 check() {
-        echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+        echo -e " #include CURSES_LOC \n 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
-                echo " *** "                                               1>&2
-                echo " *** Install ncurses (ncurses-devel) and try again"  1>&2
-                echo " *** "                                               1>&2
-                exit 1
+            echo " *** Unable to find the ncurses libraries or the"       1>&2
+            echo " *** required header files."                            1>&2
+            echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
+            echo " *** "                                                  1>&2
+            echo " *** Install ncurses (ncurses-devel) and try again."    1>&2
+            echo " *** "                                                  1>&2
+            exit 1
         fi
 }