From e1c27ce98544acbbd0689f589500c8dce2e5f67c Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 18 Apr 2013 12:05:16 +0000
Subject: build: add new menuconfig code based on linux 3.9

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36361 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 scripts/config/lxdialog/check-lxdialog.sh | 47 ++++++++++++++-----------------
 1 file changed, 21 insertions(+), 26 deletions(-)

(limited to 'scripts/config/lxdialog/check-lxdialog.sh')

diff --git a/scripts/config/lxdialog/check-lxdialog.sh b/scripts/config/lxdialog/check-lxdialog.sh
index 9a6c915e5a..80788137c6 100644
--- a/scripts/config/lxdialog/check-lxdialog.sh
+++ b/scripts/config/lxdialog/check-lxdialog.sh
@@ -1,24 +1,14 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Check ncurses compatibility
 
 # What library to link
 ldflags()
 {
-	for ext in so dylib; do
-		for dir in "" /usr/local/lib /opt/local/lib; do
-			$cc ${dir:+-L$dir} -print-file-name=libncursesw.$ext | grep -q /
+	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
-				echo $dir '-lncursesw'
-				exit
-			fi
-			$cc ${dir:+-L$dir} -print-file-name=libncurses.$ext | grep -q /
-			if [ $? -eq 0 ]; then
-				echo $dir '-lncurses'
-				exit 
-			fi
-			$cc ${dir:+-L$dir} -print-file-name=libcurses.$ext | grep -q /
-			if [ $? -eq 0 ]; then
-				echo $dir '-lcurses'
+				echo "-l${lib}"
 				exit
 			fi
 		done
@@ -29,12 +19,13 @@ ldflags()
 # Where is ncurses.h?
 ccflags()
 {
-	if [ -f /usr/include/ncurses/ncurses.h ]; then
+	if [ -f /usr/include/ncursesw/curses.h ]; then
+		echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/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>"'
-	elif [ -f /opt/local/include/ncurses/ncurses.h ]; then
-		echo '-I/opt/local/include -I/opt/local/include/ncurses -DCURSES_LOC="<ncurses/ncurses.h>"'
 	elif [ -f /usr/include/ncurses.h ]; then
 		echo '-DCURSES_LOC="<ncurses.h>"'
 	else
@@ -48,19 +39,23 @@ 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
+        $cc -x c - -o $tmp 2>/dev/null <<'EOF'
+#include CURSES_LOC
+main() {}
+EOF
 	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
 }
 
 usage() {
-	printf "Usage: $0 [-check compiler options|-header|-library]\n"
+	printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
 }
 
 if [ $# -eq 0 ]; then
-- 
cgit v1.2.3