|
@@ -1390,7 +1390,7 @@ else
|
|
|
AC_SEARCH_LIBS(${sym}, ${preferl}, [
|
|
AC_SEARCH_LIBS(${sym}, ${preferl}, [
|
|
|
curses=yes
|
|
curses=yes
|
|
|
eval "curseslib=\"\${ac_cv_search_${sym}}\""
|
|
eval "curseslib=\"\${ac_cv_search_${sym}}\""
|
|
|
- barelib="${curseslib/-l/}"
|
|
|
|
|
|
|
+ barelib=`echo "${curseslib}" | sed -e 's/-l//'`
|
|
|
optlist="$optlist ${barelib}/curses"
|
|
optlist="$optlist ${barelib}/curses"
|
|
|
if test "x${curseslib}" != "xnone required"; then
|
|
if test "x${curseslib}" != "xnone required"; then
|
|
|
NCURSES_LIBS="${curseslib}"
|
|
NCURSES_LIBS="${curseslib}"
|
|
@@ -1398,8 +1398,8 @@ else
|
|
|
|
|
|
|
|
# Need to check for headers in subdirectories, to ensure we get wide stuff
|
|
# Need to check for headers in subdirectories, to ensure we get wide stuff
|
|
|
AC_MSG_CHECKING([for curses header subdirectory])
|
|
AC_MSG_CHECKING([for curses header subdirectory])
|
|
|
- barelib="${barelib/6/}"
|
|
|
|
|
- barelib="${barelib/5/}"
|
|
|
|
|
|
|
+ barelib=`echo "${barelib}" | sed -e 's/6//'`
|
|
|
|
|
+ barelib=`echo "${barelib}" | sed -e 's/5//'`
|
|
|
cursesincl=`echo '#include <'"${barelib}"'/curses.h>' | ${CPP} -M - 2>/dev/null | sed -E -e 's/^[^:]+:[[:space:]]*(([^[:space:]]|\\\\[[:space:]])*)curses\\.h([[:space:]].*|$)$/\\1/' -e 't my' -e d -e ': my' -e 's/\\\\?([\\\\[:space:]])/\\\\\\1/g'`
|
|
cursesincl=`echo '#include <'"${barelib}"'/curses.h>' | ${CPP} -M - 2>/dev/null | sed -E -e 's/^[^:]+:[[:space:]]*(([^[:space:]]|\\\\[[:space:]])*)curses\\.h([[:space:]].*|$)$/\\1/' -e 't my' -e d -e ': my' -e 's/\\\\?([\\\\[:space:]])/\\\\\\1/g'`
|
|
|
if test "x$cursesincl" != "x"; then
|
|
if test "x$cursesincl" != "x"; then
|
|
|
NCURSES_CPPFLAGS="-I${cursesincl}"
|
|
NCURSES_CPPFLAGS="-I${cursesincl}"
|
Luke Dashjr