ncurses 6.4 - patch 20230819

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index 8a74ab6eeee861cf367971372836d4aa9a0e93ad..4ad5523521c1906fa672ba04b83185d570c92ce5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.762 2023/04/22 22:16:28 tom Exp $
+dnl $Id: configure.in,v 1.765 2023/07/22 17:20:35 tom Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl For additional information, see
@@ -38,7 +38,7 @@ dnl     https://invisible-island.net/autoconf/my-autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20210101)
-AC_REVISION($Revision: 1.762 $)
+AC_REVISION($Revision: 1.765 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -696,7 +696,7 @@ AC_MSG_CHECKING(if xterm backspace sends BS or DEL)
 AC_ARG_WITH(xterm-kbs,
        [  --with-xterm-kbs=XXX    specify if xterm backspace sends BS or DEL],
        [with_xterm_kbs=$withval],
-       [with_xterm_kbs=BS])
+       [with_xterm_kbs=auto])
 case x$with_xterm_kbs in
 (xyes|xno|xBS|xbs|x8)
        with_xterm_kbs=BS
@@ -704,6 +704,9 @@ case x$with_xterm_kbs in
 (xDEL|xdel|x127)
        with_xterm_kbs=DEL
        ;;
+(xauto)
+       with_xterm_kbs=$want_xterm_kbs
+       ;;
 (*)
        with_xterm_kbs=$withval
        ;;
@@ -714,7 +717,7 @@ AC_SUBST(XTERM_KBS)
 
 if test "x$with_xterm_kbs" != "x$want_xterm_kbs"
 then
-       AC_MSG_WARN(expected --with-xterm-kbs=$want_xterm_kbs for $host_os)
+       AC_MSG_WARN([expected --with-xterm-kbs=$want_xterm_kbs for $host_os, have $with_xterm_kbs])
 fi
 
 MAKE_TERMINFO=
@@ -1169,7 +1172,6 @@ if test "x$with_ext_funcs" = xyes ; then
        AC_DEFINE(HAVE_RESIZE_TERM,1,[Define to 1 to enable resize_term() function in test-programs])
        AC_DEFINE(HAVE_TERM_ENTRY_H,1,[Define to 1 to enable term_entry() function in test-programs])
        AC_DEFINE(HAVE_USE_DEFAULT_COLORS,1,[Define to 1 to enable use_default_colors() function in test-programs])
-       AC_DEFINE(HAVE_USE_EXTENDED_NAMES,1,[Define to 1 to enable use_extended_names() function in test-programs])
        AC_DEFINE(HAVE_USE_SCREEN,1,[Define to 1 to enable use_screen() function in test-programs])
        AC_DEFINE(HAVE_USE_WINDOW,1,[Define to 1 to enable use_window() function in test-programs])
        AC_DEFINE(HAVE_WRESIZE,1,[Define to 1 to enable wresize() function in test-programs])
@@ -1263,17 +1265,13 @@ if test "x$with_ext_mouse" = xyes ; then
        CF_NCURSES_ABI_6
 fi
 
-case $cf_cv_abi_default in
-(5)
+if test $cf_cv_abi_default -le 5 ; then
        NCURSES_MOUSE_VERSION=1
-       ;;
-(6)
+elif test $cf_cv_abi_default -le 6 ; then
        NCURSES_MOUSE_VERSION=2
-       ;;
-([[789]])
+else
        NCURSES_MOUSE_VERSION=3
-       ;;
-esac
+fi
 
 AC_SUBST(NCURSES_MOUSE_VERSION)
 
@@ -1313,7 +1311,10 @@ AC_ARG_ENABLE(tcap-names,
        [with_tcap_names=$with_ext_funcs])
 AC_MSG_RESULT($with_tcap_names)
 NCURSES_XNAMES=0
-test "x$with_tcap_names" = xyes && NCURSES_XNAMES=1
+if test "x$with_tcap_names" = xyes; then
+       NCURSES_XNAMES=1
+       AC_DEFINE(NCURSES_XNAMES,1,[Define to 1 to compile with user-definable terminal capabilities])
+fi
 AC_SUBST(NCURSES_XNAMES)
 
 ##############################################################################