dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.1025 2023/01/07 21:35:57 tom Exp $
+dnl $Id: aclocal.m4,v 1.1029 2023/01/22 18:37:42 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
dnl
dnl ---------------------------------------------------------------------------
dnl ---------------------------------------------------------------------------
-dnl AM_LANGINFO_CODESET version: 6 updated: 2021/01/01 16:53:59
+dnl AM_LANGINFO_CODESET version: 7 updated: 2023/01/11 04:05:23
dnl -------------------
dnl Inserted as requested by gettext 0.10.40
dnl File from /usr/share/aclocal
AC_DEFUN([AM_LANGINFO_CODESET],
[
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
- [AC_TRY_LINK([#include <langinfo.h>],
+ [AC_TRY_LINK([
+$ac_includes_default
+#include <langinfo.h>],
[char* cs = nl_langinfo(CODESET); (void)cs],
am_cv_langinfo_codeset=yes,
am_cv_langinfo_codeset=no)
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_ENVIRON version: 3 updated: 2010/05/26 16:44:57
+dnl CF_CHECK_ENVIRON version: 4 updated: 2023/01/14 07:48:15
dnl ----------------
dnl Check for data that is usually declared in <unistd.h>, e.g., the 'environ'
dnl variable. Define a DECL_xxx symbol if we must declare it ourselves.
#include <stdlib.h>
#endif
#include <unistd.h> ],
- ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1,
+ ifelse([$2],,void*,[$2]) x = (ifelse([$2],,void*,[$2])) $1; (void)x,
[cf_cv_dcl_$1=yes],
[cf_cv_dcl_$1=no])
])
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_FORMAT version: 16 updated: 2022/11/05 16:12:11
+dnl CF_MANPAGE_FORMAT version: 17 updated: 2023/01/21 16:49:25
dnl -----------------
dnl Option to allow user to override automatic configuration of manpage format.
dnl There are several special cases:
if test -n "$cf_unknown" ; then
AC_MSG_WARN(Unexpected manpage-format $cf_unknown)
fi
+
+cf_manpage_format=no
+cf_manpage_inboth=no
+cf_manpage_so_strip=
+cf_manpage_compress=
+
+for cf_item in $MANPAGE_FORMAT
+do
+case "$cf_item" in
+(catonly)
+ cf_manpage_format=yes
+ cf_manpage_inboth=no
+ ;;
+(formatted)
+ cf_manpage_format=yes
+ cf_manpage_inboth=yes
+ ;;
+(compress)
+ cf_manpage_so_strip="Z"
+ cf_manpage_compress=compress
+ ;;
+(gzip)
+ cf_manpage_so_strip="gz"
+ cf_manpage_compress=gzip
+ ;;
+(bzip2)
+ cf_manpage_so_strip="bz2"
+ cf_manpage_compress=bzip2
+ ;;
+(xz)
+ cf_manpage_so_strip="xz"
+ cf_manpage_compress=xz
+ ;;
+esac
+done
+
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_MANPAGE_RENAMES version: 17 updated: 2022/10/23 07:46:29
AC_SUBST(MANPAGE_RENAMES)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_SYMLINKS version: 6 updated: 2015/04/17 21:13:04
+dnl CF_MANPAGE_SYMLINKS version: 7 updated: 2023/01/21 16:37:17
dnl -------------------
dnl Some people expect each tool to make all aliases for manpages in the
dnl man-directory. This accommodates the older, less-capable implementations
[MANPAGE_SYMLINKS=$withval],
[MANPAGE_SYMLINKS=$cf_use_symlinks])
-if test "$$cf_use_symlinks" = no; then
+if test "$cf_use_symlinks" = no; then
if test "$MANPAGE_SYMLINKS" = yes ; then
AC_MSG_WARN(cannot make symlinks, will use .so files)
MANPAGE_SYMLINKS=no
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 54 updated: 2022/11/05 16:12:11
+dnl CF_MAN_PAGES version: 56 updated: 2023/01/21 16:49:25
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
cf_prefix="$prefix"
fi
-case "$MANPAGE_FORMAT" in
-(*catonly*)
- cf_format=yes
- cf_inboth=no
- ;;
-(*formatted*)
- cf_format=yes
- cf_inboth=yes
- ;;
-(*)
- cf_format=no
- cf_inboth=no
- ;;
-esac
-
test ! -d man && mkdir man
-cf_so_strip=
-cf_compress=
-for cf_manpage_format in $MANPAGE_FORMAT
-do
-case "$cf_manpage_format" in
-(compress)
- cf_so_strip="Z"
- cf_compress=compress
- ;;
-(gzip)
- cf_so_strip="gz"
- cf_compress=gzip
- ;;
-(bzip2)
- cf_so_strip="bz2"
- cf_compress=bzip2
- ;;
-(xz)
- cf_so_strip="xz"
- cf_compress=xz
- ;;
-esac
-done
-
cf_edit_man=./edit_man.sh
cf_man_alias=`pwd`/man_alias.sed
shift || exit 1
if test "\$form" = normal ; then
- if test "$cf_format" = yes ; then
- if test "$cf_inboth" = no ; then
+ if test "$cf_manpage_format" = yes ; then
+ if test "$cf_manpage_inboth" = no ; then
$SHELL "\[$]0" format "\$verb" "\$mandir" "\$srcdir" "\[$]@"
exit $?
fi
aliases=
cf_source=\`basename "\$i"\`
- inalias=\$cf_source
- test ! -f "\$inalias" && inalias="\$srcdir/\$inalias"
- if test ! -f "\$inalias" ; then
+ cf_full_alias=\$cf_source
+ test ! -f "\$cf_full_alias" && cf_full_alias="\$srcdir/\$cf_full_alias"
+ if test ! -f "\$cf_full_alias" ; then
echo ".. skipped \$cf_source"
continue
fi
if test "$MANPAGE_ALIASES" != no ; then
cat >>$cf_edit_man <<CF_EOF
nCurses=ignore.3x
+ cf_part_alias=\`echo \$cf_full_alias| sed -e 's,^.*/,,'\`
test "$with_curses_h" = yes && nCurses=ncurses.3x
- aliases=\`sed -f "\$top_srcdir/man/manlinks.sed" "\$inalias" |sed -f "$cf_man_alias" | sort -u; test "\$inalias" = "\$nCurses" && echo curses\`
+ aliases=\`sed -f "\$top_srcdir/man/manlinks.sed" "\$cf_full_alias" |sed -f "$cf_man_alias" | sort -u; test "\$cf_part_alias" = "\$nCurses" && echo curses\`
CF_EOF
fi
fi
CF_EOF
-if test -n "$cf_compress" ; then
+if test -n "$cf_manpage_compress" ; then
cat >>$cf_edit_man <<CF_EOF
if test "\$verb" = installing ; then
- if ( "$cf_compress" -f \$TMP )
+ if ( "$cf_manpage_compress" -f \$TMP )
then
- mv \$TMP.$cf_so_strip \$TMP
+ mv \$TMP.$cf_manpage_so_strip \$TMP
fi
fi
- cf_target="\$cf_target.$cf_so_strip"
+ cf_target="\$cf_target.$cf_manpage_so_strip"
CF_EOF
fi
test -n "\$aliases" && (
cd "\$cf_subdir\${section}" && (
cf_source=\`echo "\$cf_target" |sed -e 's%^.*/\\([[^/]][[^/]]*/[[^/]][[^/]]*$\\)%\\1%'\`
- test -n "$cf_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_so_strip\$%%'\`
+ test -n "$cf_manpage_so_strip" && cf_source=\`echo "\$cf_source" |sed -e 's%\\.$cf_manpage_so_strip\$%%'\`
cf_target=\`basename "\$cf_target"\`
for cf_alias in \$aliases
do
elif test "\$cf_target" != "\$cf_alias\${suffix}" ; then
echo ".so \$cf_source" >\$TMP
CF_EOF
-if test -n "$cf_compress" ; then
+if test -n "$cf_manpage_compress" ; then
cat >>$cf_edit_man <<CF_EOF
- if test -n "$cf_so_strip" ; then
- "$cf_compress" -f \$TMP
- mv \$TMP.$cf_so_strip \$TMP
+ if test -n "$cf_manpage_so_strip" ; then
+ "$cf_manpage_compress" -f \$TMP
+ mv \$TMP.$cf_manpage_so_strip \$TMP
fi
CF_EOF
fi
esac
done
-if test "$cf_inboth" = yes ; then
+if test "$cf_manpage_inboth" = yes ; then
if test "\$form" != format ; then
$SHELL "\[$]0" format "\$verb" "\$mandir" "\$srcdir" "\[$]@"
fi
$1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 9 updated: 2021/05/19 19:35:25
+dnl CF_UTF8_LIB version: 10 updated: 2023/01/11 04:05:23
dnl -----------
dnl Check for multibyte support, and if not found, utf8 compatibility library
AC_DEFUN([CF_UTF8_LIB],
AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
cf_save_LIBS="$LIBS"
AC_TRY_LINK([
-#include <stdlib.h>
-#include <stdio.h>
+$ac_includes_default
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_PKG_CONFIG_LIBDIR version: 20 updated: 2022/01/29 17:03:42
+dnl CF_WITH_PKG_CONFIG_LIBDIR version: 21 updated: 2023/01/22 13:37:42
dnl -------------------------
dnl Allow the choice of the pkg-config library directory to be overridden.
dnl
dnl c) builtin-list (added if $PKG_CONFIG_LIBDIR is not set)
dnl
dnl pkgconf (used with some systems such as FreeBSD in place of pkg-config)
-dnl optionally ignores $PKG_CONFIG_LIBDIR.
+dnl optionally ignores $PKG_CONFIG_LIBDIR. Very old versions of pkg-config,
+dnl e.g., Solaris 10 also do not recognize $PKG_CONFIG_LIBDIR.
AC_DEFUN([CF_WITH_PKG_CONFIG_LIBDIR],[
case "$PKG_CONFIG" in
esac
# if $PKG_CONFIG_LIBDIR is set, try to use that
-cf_search_path=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,'`
+if test -n "$PKG_CONFIG_PATH"; then
+ cf_search_path=`echo "$PKG_CONFIG_PATH" | sed -e 's/:/ /g' -e 's,^[[ ]]*,,' -e 's,[[ ]]*$,,'`
+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
+fi
# if the option is used, let that override. otherwise default to "libdir"
AC_ARG_WITH(pkg-config-libdir,
projects / ncurses.git / blobdiff