Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/scripts/kconfig/lxdialog/check-lxdialog.sh

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/scripts/kconfig/lxdialog/check-lxdialog.sh (modified) (3 diffs)

branches/3.3/mindi-busybox/scripts/kconfig/lxdialog/check-lxdialog.sh

@@ -5 +5 @@
 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 /
@@ -20 +22 @@
 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>"'
@@ -41 +46 @@
 # 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() {}