From a4cf54d41cea642f6c95779be61539afaaba445c Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 19 Mar 2005 21:53:24 +0000 Subject: [PATCH] * acinclude.m4 (MC_WITH_SLANG): Partly restore original order of checks and add a comment with a warning. From Pavel S. Shirshov --- ChangeLog | 4 ++++ acinclude.m4 | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c82dc56e2..46aabdbe4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-03-19 Pavel Roskin + * acinclude.m4 (MC_WITH_SLANG): Partly restore original order of + checks and add a comment with a warning. + From Pavel S. Shirshov + * acinclude.m4 (MC_WITH_SLANG): Reorder checks. Move termcap checks ... (MC_SLANG_TERMCAP): ... here. diff --git a/acinclude.m4 b/acinclude.m4 index c5dd833a7..4736af0f3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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"], @@ -775,8 +781,7 @@ it's not fully supported yet]) if test x$with_screen = xslang; then AC_DEFINE(HAVE_SYSTEM_SLANG, 1, [Define to use S-Lang library installed on the system]) - MC_SLANG_PRIVATE - MC_SLANG_TERMCAP + MC_SLANG_PRIVATE screen_type=slang screen_msg="S-Lang library (installed on the system)" else