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

* configure.in: Don't use defunct ncurses_version.

Browse Source 
Reported by Thomas Dickey <dickey@herndon4.his.com>
Set force_ncurses whenever --with-ncurses is used.  If set,
suppress checks for S-Lang and fail is ncurses is not found.
This commit is contained in:
Pavel Roskin 2002-02-06 05:06:16 +00:00
parent 727898de19
commit e9eac440ff
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,12 +1,16 @@
2002-02-05 Pavel Roskin <proski@gnu.org>
* configure.in: Don't use defunct ncurses_version.
Reported by Thomas Dickey <dickey@herndon4.his.com>
Set force_ncurses whenever --with-ncurses is used. If set,
suppress checks for S-Lang and fail is ncurses is not found.
* configure.in: Introduce a new variable screen_type that is
either "slang" or "ncurses" without additional text. Use it
instead of screen_manager whenever possible. Fix text in
AC_NCURSES call, use m4 quotes and move shell quotes into the
macro.
* acinclude.m4: Likewise.
Reported by Thomas Dickey <dickey@herndon4.his.com>
2002-01-28 Petr Kozelka <pkozelka@email.cz>

47
configure.in
View File

@ -333,7 +333,8 @@ esac
AC_ARG_WITH(ncurses,
[--with-ncurses[=base-dir] Compile with ncurses/locate base dir],
[if test x$withval = xyes
[force_ncurses=true
if test x$withval = xyes
then
search_ncurses=true
else
@ -517,24 +518,26 @@ AC_ARG_WITH(efence,
mem_debug="Electric Fence"
fi])
slang_check_lib=true
slang_term=""
slang_use_system_installed_lib=false
AC_CHECK_LIB(slang,SLang_init_tty,
[AC_CHECK_HEADERS(slang.h)
if test x$ac_cv_header_slang_h = xyes
then
slang_use_system_installed_lib=true
slang_check_lib=false
else
AC_CHECK_HEADERS(slang/slang.h)
if test x$ac_cv_header_slang_slang_h = xyes
then
slang_use_system_installed_lib=true
slang_check_lib=false
fi
fi
])
if test -z "$force_ncurses"; then
slang_check_lib=true
slang_term=""
slang_use_system_installed_lib=false
AC_CHECK_LIB(slang,SLang_init_tty,
[AC_CHECK_HEADERS(slang.h)
if test x$ac_cv_header_slang_h = xyes
then
slang_use_system_installed_lib=true
slang_check_lib=false
else
AC_CHECK_HEADERS(slang/slang.h)
if test x$ac_cv_header_slang_slang_h = xyes
then
slang_use_system_installed_lib=true
slang_check_lib=false
fi
fi
])
fi
AC_ARG_WITH(terminfo,
[--with-terminfo SLANG: Force usage of terminfo],[
@ -636,13 +639,17 @@ then
[renamed ncurses in /usr/include/ncurses])
fi
if test "x$screen_type" != xncurses && test -n "$force_ncurses"; then
AC_MSG_ERROR([Could not find ncurses])
fi
dnl Ncurses specific checks
dnl
dnl If ncurses exports the ESCDELAY variable it should be set to 0
dnl or you'll have to press Esc three times to dismiss a dialog box.
dnl
if test -n "$ncurses_version"; then
if test "x$screen_type" = xncurses; then
save_LIBS="$LIBS"
LIBS="$MCLIBS $LIBS"
AC_CACHE_CHECK([for ESCDELAY variable],