dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.1044 2023/05/06 22:18:58 tom Exp $
+dnl $Id: aclocal.m4,v 1.1056 2023/10/28 16:51:30 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
CF_CHECK_ERRNO(errno)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ETIP_DEFINES version: 6 updated: 2021/01/02 17:09:14
+dnl CF_ETIP_DEFINES version: 7 updated: 2023/10/28 11:59:01
dnl ---------------
dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between
dnl math.h and builtin.h, only for ncurses
],[])
done
done
-AC_MSG_RESULT($cf_result)
+AC_MSG_RESULT([${cf_result:-(none)}])
CXXFLAGS="$cf_save_CXXFLAGS"
])
dnl ---------------------------------------------------------------------------
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: 99 updated: 2023/04/22 11:51: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
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_PKG_CONFIG version: 12 updated: 2021/10/10 20:18:09
+dnl CF_PKG_CONFIG version: 13 updated: 2023/10/28 11:59:01
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
dnl
[
AC_MSG_CHECKING(if you want to use pkg-config)
AC_ARG_WITH(pkg-config,
- [ --with-pkg-config{=path} enable/disable use of pkg-config],
+ [[ --with-pkg-config[=CMD] enable/disable use of pkg-config and its name CMD]],
[cf_pkg_config=$withval],
[cf_pkg_config=yes])
AC_MSG_RESULT($cf_pkg_config)
done
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 107 updated: 2021/09/04 06:47:34
+dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
cf_ld_rpath_opt=
test "$cf_cv_enable_rpath" = yes && cf_ld_rpath_opt="$LD_RPATH_OPT"
- AC_MSG_CHECKING(if release/abi version should be used for shared libs)
+ AC_MSG_CHECKING(whether to use release or ABI version in shared library file names)
AC_ARG_WITH(shlib-version,
- [ --with-shlib-version=X Specify rel or abi version for shared libs],
+ [[ --with-shlib-version[={rel|abi}] use release or ABI version in shared library file names]],
[test -z "$withval" && withval=auto
case "$withval" in
(yes)
cf_cv_abi_default=$cf_cv_abi_version
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_COMPILER version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_COMPILER version: 3 updated: 2023/10/28 11:59:01
dnl --------------------
dnl Command-line option to specify the Ada95 compiler.
AC_DEFUN([CF_WITH_ADA_COMPILER],[
-AC_MSG_CHECKING(for ada-compiler)
+AC_MSG_CHECKING(for Ada95 compiler)
AC_ARG_WITH(ada-compiler,
- [ --with-ada-compiler=CMD specify Ada95 compiler command (default gnatmake)],
+ [[ --with-ada-compiler[=CMD] use CMD as Ada95 compiler (default: gnatmake)]],
[cf_ada_compiler=$withval],
[cf_ada_compiler=gnatmake])
AC_SUBST(cf_ada_compiler)
AC_MSG_RESULT($cf_ada_compiler)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_INCLUDE version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_INCLUDE version: 3 updated: 2023/10/28 11:59:01
dnl -------------------
dnl Command-line option to specify where Ada includes will install.
AC_DEFUN([CF_WITH_ADA_INCLUDE],[
-AC_MSG_CHECKING(for ada-include)
+AC_MSG_CHECKING(for Ada95 include directory)
CF_WITH_PATH(ada-include,
- [ --with-ada-include=DIR Ada includes are in DIR],
+ [ --with-ada-include=DIR find Ada95 includes in DIR],
ADA_INCLUDE,
PREFIX/share/ada/adainclude,
[$]prefix/share/ada/adainclude)
AC_MSG_RESULT($ADA_INCLUDE)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_LIBNAME version: 1 updated: 2019/09/07 18:59:41
+dnl CF_WITH_ADA_LIBNAME version: 2 updated: 2023/10/28 11:59:01
dnl -------------------
dnl CF_WITH_ADA_LIBNAME
dnl -------------------
dnl Command-line option to specify how to name the resulting Ada library.
dnl $1 = default value
AC_DEFUN([CF_WITH_ADA_LIBNAME],[
-AC_MSG_CHECKING(for ada-libname)
+AC_MSG_CHECKING(for Ada95 curses library name)
AC_ARG_WITH(ada-libname,
- [ --with-ada-libname=XXX override default Ada library-name],
+ [ --with-ada-libname=XXX use XXX as Ada95 library name],
ADA_LIBNAME=[$]withval,
ADA_LIBNAME=$1)
case "x$ADA_LIBNAME" in
AC_MSG_RESULT($ADA_LIBNAME)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_OBJECTS version: 2 updated: 2010/06/26 17:35:58
+dnl CF_WITH_ADA_OBJECTS version: 3 updated: 2023/10/28 11:59:01
dnl -------------------
dnl Command-line option to specify where Ada objects will install.
AC_DEFUN([CF_WITH_ADA_OBJECTS],[
-AC_MSG_CHECKING(for ada-objects)
+AC_MSG_CHECKING(for Ada95 object directory)
CF_WITH_PATH(ada-objects,
- [ --with-ada-objects=DIR Ada objects are in DIR],
+ [ --with-ada-objects=DIR find Ada95 objects in DIR],
ADA_OBJECTS,
PREFIX/lib/ada/adalib,
[$]prefix/lib/ada/adalib)
AC_MSG_RESULT($ADA_OBJECTS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ADA_SHAREDLIB version: 5 updated: 2018/07/21 19:10:35
+dnl CF_WITH_ADA_SHAREDLIB version: 6 updated: 2023/10/28 11:59:01
dnl ---------------------
-dnl Command-line option to specify if an Ada95 shared-library should be built,
+dnl Command-line option to specify if an Ada95 shared library should be built,
dnl and optionally what its soname should be.
AC_DEFUN([CF_WITH_ADA_SHAREDLIB],[
AC_REQUIRE([CF_GNAT_PROJECTS])
-AC_MSG_CHECKING(if an Ada95 shared-library should be built)
+AC_MSG_CHECKING(whether to build an Ada95 shared library)
AC_ARG_WITH(ada-sharedlib,
- [ --with-ada-sharedlib=soname build shared-library (requires GNAT projects)],
+ [ --with-ada-sharedlib build Ada95 shared library; requires GNAT project support],
[with_ada_sharedlib=$withval],
[with_ada_sharedlib=no])
-AC_MSG_RESULT($with_ada_sharedlib)
+cf_ada_sharedlib_warn=no
if test "x$with_ada_sharedlib" != xno
then
if test "x$cf_gnat_projects" != xyes
then
- AC_MSG_WARN(disabling shared-library since GNAT projects are not supported)
with_ada_sharedlib=no
+ cf_ada_sharedlib_warn=yes
fi
fi
+AC_MSG_RESULT($with_ada_sharedlib)
+if test "x$cf_ada_sharedlib_warn" != xno
+then
+ AC_MSG_WARN(disabling Ada95 shared library since GNAT projects are not supported)
+fi
+
ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
MAKE_ADA_SHAREDLIB="#"
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_EXPORT_SYMS version: 3 updated: 2014/12/20 19:16:08
+dnl CF_WITH_EXPORT_SYMS version: 4 updated: 2023/10/28 11:59:01
dnl -------------------
dnl Use this with libtool to specify the list of symbols that may be exported.
dnl The input file contains one symbol per line; comments work with "#".
[
AC_MSG_CHECKING(if exported-symbols file should be used)
AC_ARG_WITH(export-syms,
- [ --with-export-syms=XXX limit exported symbols using libtool],
+ [ --with-export-syms=SYM-FILE limit symbols exported by libtool to those listed in SYM-FILE],
[with_export_syms=$withval],
[with_export_syms=no])
if test "x$with_export_syms" = xyes
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_LIBTOOL_OPTS version: 4 updated: 2015/04/17 21:13:04
+dnl CF_WITH_LIBTOOL_OPTS version: 5 updated: 2023/10/28 11:59:01
dnl --------------------
dnl Allow user to pass additional libtool options into the library creation
dnl and link steps. The main use for this is to do something like
AC_DEFUN([CF_WITH_LIBTOOL_OPTS],[
AC_MSG_CHECKING(for additional libtool options)
AC_ARG_WITH(libtool-opts,
- [ --with-libtool-opts=XXX specify additional libtool options],
+ [ --with-libtool-opts=XXX give libtool additional options XXX],
[with_libtool_opts=$withval],
[with_libtool_opts=no])
AC_MSG_RESULT($with_libtool_opts)
elif test -n "$PKG_CONFIG_LIBDIR"; then
cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,' -e 's,[[ ]]*$,,'`
else
- cf_search_path=auto
+ cf_search_path=libdir
fi
# if the option is used, let that override. otherwise default to "libdir"
AC_ARG_WITH(pkg-config-libdir,
[ --with-pkg-config-libdir=XXX use given directory for installing pc-files],
- [cf_search_path=$withval],
- [test "x$PKG_CONFIG" != xnone && test -z "$cf_search_path" && cf_search_path=libdir])
+ [cf_search_path=$withval])
case "x$cf_search_path" in
(xlibdir)
[USE_VALGRIND])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 10 updated: 2021/01/04 18:48:01
+dnl CF_WITH_VERSIONED_SYMS version: 11 updated: 2023/10/28 11:59:01
dnl ----------------------
dnl Use this when building shared library with ELF, to markup symbols with the
dnl version identifier from the given input file. Generally that identifier is
AC_MSG_CHECKING(if versioned-symbols file should be used)
AC_ARG_WITH(versioned-syms,
- [ --with-versioned-syms=X markup versioned symbols using ld],
+ [ --with-versioned-syms=MAP-FILE version ELF shared library symbols per MAP-FILE],
[with_versioned_syms=$withval],
[with_versioned_syms=no])
case "x$with_versioned_syms" in
AC_SUBST(WILDCARD_SYMS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_X11_RGB version: 2 updated: 2019/12/31 08:53:54
+dnl CF_WITH_X11_RGB version: 3 updated: 2023/10/28 11:59:01
dnl ---------------
dnl Handle configure option "--with-x11-rgb", setting these shell
dnl variables:
AC_DEFUN([CF_WITH_X11_RGB],[
AC_MSG_CHECKING(for X11 rgb file)
AC_ARG_WITH(x11-rgb,
- [ --with-x11-rgb=FILE file containing X11 rgb information (EPREFIX/lib/X11/rgb.txt)],
+ [ --with-x11-rgb=FILE obtain X11 color definitions from FILE (default: EPREFIX/lib/X11/rgb.txt)],
[RGB_PATH=$withval],
[RGB_PATH=auto])
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