diff -Naur slang-2.1.2.org/autoconf/aclocal.m4 slang-2.1.2/autoconf/aclocal.m4 --- slang-2.1.2.org/autoconf/aclocal.m4 2007-09-06 04:39:23.000000000 +0200 +++ slang-2.1.2/autoconf/aclocal.m4 2007-10-13 16:41:11.000000000 +0200 @@ -459,17 +459,19 @@ AC_DEFUN(JD_TERMCAP, dnl#{{{ [ AC_MSG_CHECKING(for Terminfo) -MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo" -if test ! -d $MISC_TERMINFO_DIRS -then - MISC_TERMINFO_DIRS="" -fi - -JD_Terminfo_Dirs="/usr/lib/terminfo \ - /usr/share/terminfo \ - /usr/share/lib/terminfo \ - /usr/local/lib/terminfo \ - $MISC_TERMINFO_DIRS" +if [ ! -z "$(type -p ncurses5-config)" ]; then + MISC_TERMINFO_DIRS=$(ncurses5-config --terminfo) +elif [ ! -z "$(type -p ncursesw5-config)" ]; then + MISC_TERMINFO_DIRS=$(ncursesw5-config --terminfo) +else + MISC_TERMINFO_DIRS='' +fi + +JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \ + /usr/lib/terminfo \ + /usr/share/terminfo \ + /usr/share/lib/terminfo \ + /usr/local/lib/terminfo" TERMCAP=-ltermcap diff -Naur slang-2.1.2.org/configure slang-2.1.2/configure --- slang-2.1.2.org/configure 2007-08-30 05:14:55.000000000 +0200 +++ slang-2.1.2/configure 2007-10-13 16:41:11.000000000 +0200 @@ -10608,17 +10608,19 @@ { echo "$as_me:$LINENO: checking for Terminfo" >&5 echo $ECHO_N "checking for Terminfo... $ECHO_C" >&6; } -MISC_TERMINFO_DIRS="$FINKPREFIX/share/terminfo" -if test ! -d $MISC_TERMINFO_DIRS -then - MISC_TERMINFO_DIRS="" -fi - -JD_Terminfo_Dirs="/usr/lib/terminfo \ - /usr/share/terminfo \ - /usr/share/lib/terminfo \ - /usr/local/lib/terminfo \ - $MISC_TERMINFO_DIRS" +if [ ! -z "$(type -p ncurses5-config)" ]; then + MISC_TERMINFO_DIRS=$(ncurses5-config --terminfo) +elif [ ! -z "$(type -p ncursesw5-config)" ]; then + MISC_TERMINFO_DIRS=$(ncursesw5-config --terminfo) +else + MISC_TERMINFO_DIRS='' +fi + +JD_Terminfo_Dirs="$MISC_TERMINFO_DIRS \ + /usr/lib/terminfo \ + /usr/share/terminfo \ + /usr/share/lib/terminfo \ + /usr/local/lib/terminfo" TERMCAP=-ltermcap diff -Naur slang-2.1.2.org/src/slang.h slang-2.1.2/src/slang.h --- slang-2.1.2.org/src/slang.h 2007-09-09 18:41:18.000000000 +0200 +++ slang-2.1.2/src/slang.h 2007-10-13 16:41:11.000000000 +0200 @@ -43,7 +43,7 @@ # endif #endif /* __watcomc__ */ -#if defined(unix) || defined(__unix) +#if defined(unix) || defined(__unix) || defined(__APPLE__) # ifndef __unix__ # define __unix__ 1 # endif diff -Naur slang-2.1.2.org/src/sltermin.c slang-2.1.2/src/sltermin.c --- slang-2.1.2.org/src/sltermin.c 2007-05-16 04:47:04.000000000 +0200 +++ slang-2.1.2/src/sltermin.c 2007-10-13 16:42:04.000000000 +0200 @@ -234,14 +234,14 @@ { NULL, /* $HOME/.terminfo */ NULL, /* $TERMINFO */ +#ifdef MISC_TERMINFO_DIRS + MISC_TERMINFO_DIRS, +#endif "/usr/share/terminfo", "/usr/lib/terminfo", "/usr/share/lib/terminfo", "/etc/terminfo", "/usr/local/lib/terminfo", -#ifdef MISC_TERMINFO_DIRS - MISC_TERMINFO_DIRS, -#endif "" };