mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

* acinclude.m4 (MC_WITH_MCSLANG): Check for terminfo and use

Browse Source 
termcap if terminfo is missing in the known locations.
* configure.in: Remove --with-termcap processing, it is now in
acinclude.m4.
This commit is contained in:
Pavel Roskin 2002-10-08 04:42:10 +00:00
parent a7dd92996c
commit d570124a7a
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-10-08 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (MC_WITH_MCSLANG): Check for terminfo and use
termcap if terminfo is missing in the known locations.
* configure.in: Remove --with-termcap processing, it is now in
acinclude.m4.
2002-10-02 Pavel Roskin <proski@gnu.org> 2002-10-02 Pavel Roskin <proski@gnu.org>
* syntax/syntax.syntax: Fix highlighting for "gray". * syntax/syntax.syntax: Fix highlighting for "gray".

26
acinclude.m4
View File

@ -610,7 +610,7 @@ dnl Try using termcap database and link with libtermcap if possible.
dnl dnl
AC_DEFUN([MC_USE_TERMCAP], [ AC_DEFUN([MC_USE_TERMCAP], [
screen_msg="$screen_msg with termcap database" screen_msg="$screen_msg with termcap database"
AC_MSG_NOTICE([using S-Lang screen manager with termcap]) AC_MSG_NOTICE([using S-Lang screen library with termcap])
AC_DEFINE(USE_TERMCAP, 1, [Define to use termcap database]) AC_DEFINE(USE_TERMCAP, 1, [Define to use termcap database])
AC_CHECK_LIB(termcap, tgoto, [MCLIBS="$MCLIBS -ltermcap"], , [$LIBS]) AC_CHECK_LIB(termcap, tgoto, [MCLIBS="$MCLIBS -ltermcap"], , [$LIBS])
]) ])
@ -704,6 +704,30 @@ dnl
AC_DEFUN([MC_WITH_MCSLANG], [ AC_DEFUN([MC_WITH_MCSLANG], [
screen_type=slang screen_type=slang
screen_msg="Included S-Lang library (mcslang)" screen_msg="Included S-Lang library (mcslang)"
# Search for terminfo database.
use_terminfo=
if test x"$with_termcap" != xyes; then
if test x"$with_termcap" = xno; then
use_terminfo=yes
fi
if test -n "$TERMINFO" && test -r "$TERMINFO/v/vt100"; then
use_terminfo=yes
fi
for dir in "/usr/share/terminfo" "/usr/lib/terminfo" \
"/usr/share/lib/terminfo" "/etc/terminfo" \
"/usr/local/lib/terminfo" "$HOME/.terminfo"; do
if test -r "$dir/v/vt100"; then
use_terminfo=yes
fi
done
fi
# If there is no terminfo, use termcap
if test -z "$use_terminfo"; then
MC_USE_TERMCAP
fi
_MC_WITH_XSLANG _MC_WITH_XSLANG
]) ])

9
configure.in
View File

@ -441,13 +441,12 @@ esac
dnl dnl
dnl Force using termcap dnl Force using termcap. This option is processed in MC_WITH_MCSLANG.
dnl Report an error if this option is not applicable.
dnl dnl
AC_ARG_WITH(termcap, AC_ARG_WITH(termcap,
[ --with-termcap Try using termcap database [[no]]], [ --with-termcap Try using termcap database [[only if no terminfo]]],
[if test x$with_screen = xmcslang; then [if test x$with_screen != xmcslang; then
MC_USE_TERMCAP
else
AC_MSG_ERROR([Option `--with-termcap' only works with `--with-screen=mcslang']) AC_MSG_ERROR([Option `--with-termcap' only works with `--with-screen=mcslang'])
fi fi
]) ])