update

[l4.git] / l4 / pkg / uclibc / lib / contrib / uclibc / extra / config / lxdialog / check-lxdialog.sh

diff --git a/l4/pkg/uclibc/lib/contrib/uclibc/extra/config/lxdialog/check-lxdialog.sh b/l4/pkg/uclibc/lib/contrib/uclibc/extra/config/lxdialog/check-lxdialog.sh
index d34dfd46d902e112f8dae7278f28f71555f38746..9d2a4c585ee18526f4f141988f965852c2765e73 100755 (executable)
--- a/l4/pkg/uclibc/lib/contrib/uclibc/extra/config/lxdialog/check-lxdialog.sh
+++ b/l4/pkg/uclibc/lib/contrib/uclibc/extra/config/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,13 @@ ldflags()
 # Where is ncurses.h?
 ccflags()
 {
-       if [ -f /usr/include/ncursesw/ncurses.h ]; then
-               echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncurses.h>"'
-       elif [ -f /usr/include/ncursesw/curses.h ]; then
-               echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
+       if [ -f /usr/include/ncursesw/curses.h ]; then
+               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 +41,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