* acinclude.m4 (MC_WITH_SLANG): Partly restore original order of

checks and add a comment with a warning.
From Pavel S. Shirshov <me@pavelsh.pp.ru>
This commit is contained in:
Pavel Roskin 2005-03-19 21:53:24 +00:00
parent 21cc7b340f
commit a4cf54d41c
2 changed files with 11 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2005-03-19 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (MC_WITH_SLANG): Partly restore original order of
checks and add a comment with a warning.
From Pavel S. Shirshov <me@pavelsh.pp.ru>
* acinclude.m4 (MC_WITH_SLANG): Reorder checks. Move termcap
checks ...
(MC_SLANG_TERMCAP): ... here.

View File

@ -756,6 +756,12 @@ AC_DEFUN([MC_WITH_SLANG], [
with_screen=mcslang
fi
dnl Check if termcap is needed.
dnl This check must be done before anything is linked against S-Lang.
if test x$with_screen = xslang; then
MC_SLANG_TERMCAP
fi
dnl Check the library
if test x$with_screen = xslang; then
AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
@ -776,7 +782,6 @@ it's not fully supported yet])
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
[Define to use S-Lang library installed on the system])
MC_SLANG_PRIVATE
MC_SLANG_TERMCAP
screen_type=slang
screen_msg="S-Lang library (installed on the system)"
else