diff -r 8864e5255c2d -r 20f02d426e15 kconfig/lxdialog/check-lxdialog.sh --- a/kconfig/lxdialog/check-lxdialog.sh Wed Mar 04 18:56:07 2009 +0000 +++ b/kconfig/lxdialog/check-lxdialog.sh Mon May 24 16:33:45 2010 +0200 @@ -1,14 +1,24 @@ #!/bin/sh # Check ncurses compatibility +OS=`uname` + +# Under MACOS make sure that the macports-installed version is used. +case "$OS" in + Darwin) BASEDIR="/opt/local";; + *) BASEDIR="/usr";; +esac + +INCLUDEPATH="${BASEDIR}/include" +LIBPATH="${BASEDIR}/lib" + # What library to link ldflags() { for ext in so a dylib ; do for lib in ncursesw ncurses curses ; do - $cc -print-file-name=lib${lib}.${ext} | grep -q / - if [ $? -eq 0 ]; then - echo "-l${lib}" + if [ -f "${LIBPATH}/lib${lib}.${ext}" ]; then + echo "-L${LIBPATH} -l${lib}" exit fi done @@ -19,14 +29,20 @@ # Where is ncurses.h? ccflags() { - if [ -f /usr/include/ncurses/ncurses.h ]; then - echo '-I/usr/include/ncurses -DCURSES_LOC=""' - elif [ -f /usr/include/ncurses/curses.h ]; then - echo '-I/usr/include/ncurses -DCURSES_LOC=""' - elif [ -f /usr/include/ncurses.h ]; then - echo '-DCURSES_LOC=""' + if [ -f "${INCLUDEPATH}/ncursesw/ncurses.h" ]; then + echo "-I${INCLUDEPATH} \"-DCURSES_LOC=\"" + elif [ -f "${INCLUDEPATH}/ncurses/ncurses.h" ]; then + echo "-I${INCLUDEPATH} \"-DCURSES_LOC=\"" + elif [ -f "${INCLUDEPATH}/ncursesw/curses.h" ]; then + echo "-I${INCLUDEPATH} \"-DCURSES_LOC=\"" + elif [ -f "${INCLUDEPATH}/ncurses/curses.h" ]; then + echo "-I${INCLUDEPATH} \"-DCURSES_LOC=\"" + elif [ -f "${INCLUDEPATH}/ncurses.h" ]; then + echo "-I${INCLUDEPATH} \"-DCURSES_LOC=\"" + elif [ -f "${INCLUDEPATH}/curses.h" ]; then + echo "-I${INCLUDEPATH} \"-DCURSES_LOC=\"" else - echo '-DCURSES_LOC=""' + exit 1 fi } @@ -36,7 +52,8 @@ # Check if we can link to ncurses check() { - $cc -xc - -o $tmp 2>/dev/null <<'EOF' + IF=`echo $(ccflags) | sed -e 's/"//g'` + $cc $IF $(ldflags) -xc - -o $tmp 2>/dev/null <<'EOF' #include CURSES_LOC main() {} EOF