* configure.in: Eliminate LIBSLANG and LSLANG.

* acinclude.m4: Likewise.  Use MCLIBS for -lslang.

resizeterm() and keyok() only if configuring with ncurses.
This commit is contained in:
Pavel Roskin 2001-09-10 21:54:05 +00:00
parent c0ddf2c09a
commit b55e0f0e18
2 changed files with 4 additions and 10 deletions

View File

@ -633,12 +633,12 @@ AC_DEFUN([AC_WITH_SLANG], [
if $slang_use_system_installed_lib
then
AC_DEFINE(HAVE_SYSTEM_SLANG)
LSLANG="-lslang"
MCLIBS="-lslang $MCLIBS"
screen_manager="SLang (system-installed library)"
AC_MSG_RESULT([Using system installed SLang library])
rm -f slang/slang.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LSLANG"
LIBS="$LIBS -lslang"
AC_TRY_RUN(
[
#ifdef SLANG_H_INSIDE_SLANG_DIR
@ -654,9 +654,7 @@ AC_DEFUN([AC_WITH_SLANG], [
[LIBS="$ac_save_LIBS"; AC_USE_TERMINFO],
[LIBS="$ac_save_LIBS"; AC_USE_TERMCAP])
else
LIBSLANG="libmcslang.a"
screen_manager="SLang"
LSLANG="-lmcslang"
CPPFLAGS="$CPPFLAGS -I../slang"
fastdepslang=fastdepslang
mkdir -p slang

View File

@ -567,8 +567,6 @@ AC_ARG_WITH(included-slang,
fi]
)
LIBSLANG=""
LSLANG=""
AC_ARG_WITH(slang,
[--with-slang Compile with the slang screen manager],[
if test x$withval = xyes; then
@ -576,9 +574,6 @@ AC_ARG_WITH(slang,
fi
])
AC_SUBST(LIBSLANG)
AC_SUBST(LSLANG)
LIBEDIT_A=""
MCEDIT=""
LEDIT=""
@ -797,7 +792,8 @@ AM_CONDITIONAL(USE_UNDEL_FS, [test -n "$undelfs_o"])
AM_CONDITIONAL(USE_SAMBA_FS, [test -n "$SAMBAFILES"])
AM_CONDITIONAL(MCSERV_INSTALL,
[test "x$enable_mcserv_install$mcserv" = xyesmcserv])
AM_CONDITIONAL(INCLUDED_SLANG, [test -n "$LIBSLANG"])
AM_CONDITIONAL(INCLUDED_SLANG,
[test "x$slang_use_system_installed_lib" = xfalse])
AM_CONDITIONAL(CHARSET, [test -n "$have_charset"])
AM_CONDITIONAL(CONS_SAVER, [test -n "$cons_saver"])