ncurses 6.4 - patch 20231021

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 451a527c6256024ca8d36ff734b2d58ae62e1ea8..3b5b241b744d451521626780b224d75ee106c365 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1048 2023/06/03 19:19:41 tom Exp $
+dnl $Id: aclocal.m4,v 1.1053 2023/10/21 12:54:23 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -67,7 +67,7 @@ $ac_includes_default
        fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ABI_DEFAULTS version: 4 updated: 2023/01/07 16:32:06
+dnl CF_ABI_DEFAULTS version: 5 updated: 2023/10/21 08:54:23
 dnl ---------------
 dnl Provide configure-script defaults for different ncurses ABIs.
 AC_DEFUN([CF_ABI_DEFAULTS],[
@@ -88,9 +88,10 @@ cf_dft_opaque_curses=no
 cf_dft_ordinate_type=short
 cf_dft_signed_char=no
 cf_dft_tparm_arg=long
+cf_dft_widec=no
 cf_dft_with_lp64=no
 
-# ABI 6 defaults:
+# ABI 6 default differences from ABI 5:
 case x$cf_cv_abi_default in
 (x[[6789]])
        cf_dft_chtype=uint32_t
@@ -102,17 +103,18 @@ case x$cf_cv_abi_default in
        cf_dft_filter_syms=yes
        cf_dft_interop=yes
        cf_dft_mmask_t=uint32_t
+       cf_dft_opaque_curses=yes
        cf_dft_tparm_arg=intptr_t
+       cf_dft_widec=yes
        cf_dft_with_lp64=yes
        ;;
 esac
 
-# ABI 7 defaults:
+# ABI 7 default differences from ABI 6:
 case x$cf_cv_abi_default in
 (x[[789]])
        cf_dft_ccharw_max=6
        cf_dft_mmask_t=uint64_t
-       cf_dft_opaque_curses=yes
        cf_dft_ordinate_type=int
        cf_dft_signed_char=yes
        # also: remove the wgetch-events feature in ABI 7
@@ -5916,7 +5918,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 57 updated: 2023/05/13 19:14:15
+dnl CF_MAN_PAGES version: 58 updated: 2023/07/28 20:13:29
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -5954,6 +5956,7 @@ NCURSES_PATCH="$NCURSES_PATCH"
 
 NCURSES_OSPEED="$NCURSES_OSPEED"
 TERMINFO="$TERMINFO"
+TERMINFO_DIRS="$TERMINFO_DIRS"
 
 INSTALL="$INSTALL"
 INSTALL_DATA="$INSTALL_DATA"
@@ -10001,7 +10004,7 @@ fi
 AC_SUBST(no_x11_rgb)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 66 updated: 2023/04/03 04:19:37
+dnl CF_XOPEN_SOURCE version: 67 updated: 2023/09/06 18:55:27
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -10061,7 +10064,7 @@ case "$host_os" in
        cf_xopen_source="-D_SGI_SOURCE"
        cf_XOPEN_SOURCE=
        ;;
-(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*)
+(linux*gnu|linux*gnuabi64|linux*gnuabin32|linux*gnueabi|linux*gnueabihf|linux*gnux32|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin|msys|mingw*|linux*uclibc)
        CF_GNU_SOURCE($cf_XOPEN_SOURCE)
        ;;
 (minix*)