Merge branch 'busybox' into merge

2 files changed, 13 insertions, 6 deletions

diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index d34dfd46d..5075ebf2d 100644..100755
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -4,7 +4,9 @@
 # What library to link
 ldflags()
 {
-        for ext in so a dylib ; do
+        pkg-config --libs ncursesw 2>/dev/null && exit
+        pkg-config --libs ncurses 2>/dev/null && exit
+        for ext in so a dll.a dylib ; do
                 for lib in ncursesw ncurses curses ; do
                         $cc -print-file-name=lib${lib}.${ext} | grep -q /
                         if [ $? -eq 0 ]; then
@@ -19,14 +21,17 @@ ldflags()
 # Where is ncurses.h?
 ccflags()
 {
-        if [ -f /usr/include/ncursesw/ncurses.h ]; then
-                echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"'
+        if pkg-config --cflags ncursesw 2>/dev/null; then
+                echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
+        elif pkg-config --cflags ncurses 2>/dev/null; then
+                echo '-DCURSES_LOC="<ncurses.h>"'
         elif [ -f /usr/include/ncursesw/curses.h ]; then
-                echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+                echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
+                echo ' -DNCURSES_WIDECHAR=1'
         elif [ -f /usr/include/ncurses/ncurses.h ]; then
                 echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
         elif [ -f /usr/include/ncurses/curses.h ]; then
-                echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+                echo '-I/usr/include/ncurses -DCURSES_LOC="<curses.h>"'
         elif [ -f /usr/include/ncurses.h ]; then
                 echo '-DCURSES_LOC="<ncurses.h>"'
         else
@@ -40,7 +45,7 @@ trap "rm -f $tmp" 0 1 2 3 15
 
 # Check if we can link to ncurses
 check() {
-        $cc -xc - -o $tmp 2>/dev/null <<'EOF'
+        $cc -x c - -o $tmp 2>/dev/null <<'EOF'
 #include CURSES_LOC
 main() {}
 EOF
diff --git a/scripts/trylink b/scripts/trylink
index 3c431edc3..15435f009 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -140,6 +140,8 @@ try $CC $CFLAGS $LDFLAGS \
 || {
     echo "Failed: $l_list"
     cat $EXE.out
+    echo 'Note: if build needs additional libraries, put them in CONFIG_EXTRA_LDLIBS.'
+    echo 'Example: CONFIG_EXTRA_LDLIBS="pthread dl tirpc audit pam"'
     exit 1
 }