* acinclude.m4 (MC_WITH_SLANG): Don't add -lslang to MCLIBS if

the system S-Lang is rejected.
This commit is contained in:
Pavel Roskin 2002-12-24 20:13:05 +00:00
parent 76fda9fe79
commit c3fd15e72a
2 changed files with 8 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2002-12-24 Pavel Roskin <proski@gnu.org> 2002-12-24 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (MC_WITH_SLANG): Don't add -lslang to MCLIBS if
the system S-Lang is rejected.
* lib/mc.ext.in: Play *.mov by mplayer. * lib/mc.ext.in: Play *.mov by mplayer.
2002-12-23 Pavel Roskin <proski@gnu.org> 2002-12-23 Pavel Roskin <proski@gnu.org>

View File

@ -724,8 +724,6 @@ dnl If not, and $1 is "strict", exit, otherwise fall back to mcslang.
dnl dnl
AC_DEFUN([MC_WITH_SLANG], [ AC_DEFUN([MC_WITH_SLANG], [
with_screen=slang with_screen=slang
AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
[with_screen=mcslang])
dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
m4_if([$1], strict, , m4_if([$1], strict, ,
@ -734,6 +732,11 @@ AC_DEFUN([MC_WITH_SLANG], [
it doesn't work well]) it doesn't work well])
with_screen=mcslang])]) with_screen=mcslang])])
if test x$with_screen = xslang; then
AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
[with_screen=mcslang])
fi
dnl Check the header dnl Check the header
if test x$with_screen = xslang; then if test x$with_screen = xslang; then
slang_h_found= slang_h_found=