dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.1038 2023/04/15 20:03:39 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
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],[
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
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
AC_SUBST(CPPFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_INSTALL_OPTS version: 2 updated: 2018/08/18 12:19:21
+dnl CF_INSTALL_OPTS version: 3 updated: 2023/06/03 15:17:30
dnl ---------------
dnl prompt for/fill-in useful install-program options
AC_DEFUN([CF_INSTALL_OPTS],
CF_INSTALL_OPT_S
CF_INSTALL_OPT_P
CF_INSTALL_OPT_O
+CF_INSTALL_OPT_STRIP_PROG
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_INSTALL_OPT_O version: 3 updated: 2020/12/31 20:19:42
AC_SUBST(INSTALL_OPT_S)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_INSTALL_OPT_STRIP_PROG version: 1 updated: 2023/06/03 15:17:30
+dnl -------------------------
+dnl Provide an option for overriding the strip program used in install "-s"
+dnl
+dnl coreutils install provides a --strip-program option
+dnl FreeBSD uses STRIPBIN environment variable, while NetBSD and OpenBSD use
+dnl STRIP environment variable. Other versions of install do not support this.
+AC_DEFUN([CF_INSTALL_OPT_STRIP_PROG],
+[
+AC_REQUIRE([CF_INSTALL_OPT_S])
+if test -n "$INSTALL_OPT_S"
+then
+ AC_MSG_CHECKING(if you want to specify strip-program)
+ AC_ARG_WITH(strip-program,
+ [ --with-strip-program=XX specify program to use when stripping in install],
+ [with_strip_program=$withval],
+ [with_strip_program=no])
+ AC_MSG_RESULT($with_strip_program)
+ if test "$with_strip_program" != no
+ then
+ AC_MSG_CHECKING(if strip-program is supported with this installer)
+ cf_install_program=`echo "$INSTALL" | sed -e 's%[[ ]]*[[ ]]-.%%'`
+ check_install_strip=no
+ if test -f "$cf_install_program"
+ then
+ check_install_version=`"$cf_install_program" --version 2>/dev/null | head -n 1 | grep coreutils`
+ if test -n "$check_install_version"
+ then
+ check_install_strip="option"
+ else
+ for check_strip_variable in STRIPBIN STRIP
+ do
+ if strings "$cf_install_program" | grep "^$check_strip_variable[$]" >/dev/null
+ then
+ check_install_strip="environ"
+ break
+ fi
+ done
+ fi
+ fi
+ AC_MSG_RESULT($check_install_strip)
+ case "$check_install_strip" in
+ (no)
+ AC_MSG_WARN($cf_install_program does not support strip program option)
+ with_strip_program=no
+ ;;
+ (environ)
+ cat >install.tmp <<-CF_EOF
+ #! $SHELL
+ STRIPBIN="$with_strip_program" \\
+ STRIP="$with_strip_program" \\
+ $INSTALL "[$]@"
+ CF_EOF
+ INSTALL="`pwd`/install.tmp"
+ chmod +x "$INSTALL"
+ CF_VERBOSE(created $INSTALL)
+ ;;
+ (option)
+ INSTALL_OPT_S="$INSTALL_OPT_S --strip-program=\"$with_strip_program\""
+ ;;
+ esac
+ fi
+fi
+AC_SUBST(INSTALL_OPT_S)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_INTEL_COMPILER version: 9 updated: 2023/02/18 17:41:25
dnl -----------------
dnl Check if the given compiler is really the Intel compiler for Linux. It
AC_SUBST(LIB_PREFIX)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LIB_RULES version: 98 updated: 2023/01/07 16:32:06
+dnl CF_LIB_RULES version: 100 updated: 2023/06/03 15:17:30
dnl ------------
dnl Append definitions and rules for the given models to the subdirectory
dnl Makefiles, and the recursion rule for the top-level Makefile. If the
distclean ::
rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
rm -f headers.sh headers.sed mk_shared_lib.sh
- rm -f edit_man.* man_alias.*
+ rm -f edit_man.* man_alias.* *.tmp
rm -rf \${DIRS_TO_MAKE}
CF_EOF
-# Special case: tack's manpage lives in its own directory.
-if test "x$cf_with_manpages" = xyes; then
-if test "x$cf_with_tack" = "xyes"; then
-cat >> Makefile <<CF_EOF
-
-install.man \\
-uninstall.man ::
- ( cd tack && \${MAKE} \${TOP_MFLAGS} \[$]@ )
-CF_EOF
-fi
-fi
-
dnl If we're installing into a subdirectory of /usr/include, etc., we should
dnl prepend the subdirectory's name to the "#include" paths. It won't hurt
dnl anything, and will make it more standardized. It's awkward to decide this
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_FORMAT version: 17 updated: 2023/01/21 16:49:25
+dnl CF_MANPAGE_FORMAT version: 18 updated: 2023/05/19 18:35:02
dnl -----------------
dnl Option to allow user to override automatic configuration of manpage format.
dnl There are several special cases:
esac
done
+AC_SUBST(cf_manpage_format)
+AC_SUBST(cf_manpage_inboth)
+AC_SUBST(cf_manpage_so_strip)
+AC_SUBST(cf_manpage_compress)
+
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_MANPAGE_RENAMES version: 17 updated: 2022/10/23 07:46:29
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 56 updated: 2023/01/21 16:49:25
+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
NCURSES_OSPEED="$NCURSES_OSPEED"
TERMINFO="$TERMINFO"
+TERMINFO_DIRS="$TERMINFO_DIRS"
INSTALL="$INSTALL"
INSTALL_DATA="$INSTALL_DATA"
cat >>$cf_edit_man <<CF_EOF
suffix=\`basename "\$cf_target" | sed -e 's%^[[^.]]*%%'\`
+ extra_suffix=
+ if test -n "$EXTRA_SUFFIX" ; then
+ case \$cf_target in
+ (*${EXTRA_SUFFIX}\$suffix)
+ extra_suffix="$EXTRA_SUFFIX"
+ ;;
+ esac
+ fi
if test "\$verb" = installing ; then
echo "\$verb \$cf_target"
\$INSTALL_DATA \$TMP "\$cf_target"
if test "\$section" = 1 ; then
cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
fi
+ cf_alias="\${cf_alias}\${extra_suffix}"
if test "$MANPAGE_SYMLINKS" = yes ; then
if test -f "\$cf_alias\${suffix}" ; then
if test "\$section" = 1 ; then
cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
fi
+ cf_alias="\${cf_alias}\${extra_suffix}"
echo ".. \$verb alias \$cf_alias\${suffix}"
rm -f "\$cf_alias\${suffix}"
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_NUMBER_SYNTAX version: 2 updated: 2015/04/17 21:13:04
+dnl CF_NUMBER_SYNTAX version: 3 updated: 2023/05/06 16:14:29
dnl ----------------
-dnl Check if the given variable is a number. If not, report an error.
+dnl Check if the given variable is a positive integer. Report an error if not.
dnl $1 is the variable
dnl $2 is the message
AC_DEFUN([CF_NUMBER_SYNTAX],[
if test -n "$1" ; then
- case $1 in
- ([[0-9]]*)
+ case `echo "$1" | sed -e 's/^[[0-9]]*$/0/g'` in
+ (0)
;;
(*)
AC_MSG_ERROR($2 is not a number: $1)
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SRC_MODULES version: 33 updated: 2021/01/01 13:31:04
+dnl CF_SRC_MODULES version: 34 updated: 2023/04/22 11:51:06
dnl --------------
dnl For each parameter, test if the source-directory exists, and if it contains
dnl a 'modules' file. If so, add to the list $cf_cv_src_modules which we'll
do
if test -f "$srcdir/$cf_dir/modules" ; then
- # We may/may not have tack in the distribution, though the
- # makefile is.
- if test "$cf_dir" = tack ; then
- if test "x$cf_with_tack" != "xyes"; then
- continue
- fi
- fi
-
if test -z "$cf_cv_src_modules"; then
cf_cv_src_modules=$cf_dir
else
# well. These are header files that are the same name as their
# directory. Ncurses is the only library that does not follow
# that pattern.
- if test "$cf_dir" = tack ; then
- continue
- elif test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then
+ if test -f "$srcdir/${cf_dir}/${cf_dir}.h" ; then
CF_UPPER(cf_have_include,$cf_dir)
AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H)
AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include})
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49
+dnl CF_WITH_REL_VERSION version: 2 updated: 2023/05/06 18:18:18
dnl -------------------
dnl Allow library's release-version to be overridden. Generally this happens when a
dnl packager has incremented the release-version past that used in the original package,
],[
$1_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'`
$1_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[[^.]]*//' -e 's/^\.//' -e 's/\..*//'`
+ test -n "$1_MINOR" || $1_MINOR=0
CF_NUMBER_SYNTAX([$]$1_MAJOR,Release major-version)
CF_NUMBER_SYNTAX([$]$1_MINOR,Release minor-version)
])
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,
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*)
projects / ncurses.git / blobdiff