dnl***************************************************************************
-dnl Copyright 2018-2022,2023 Thomas E. Dickey *
+dnl Copyright 2018-2023,2024 Thomas E. Dickey *
dnl Copyright 1998-2017,2018 Free Software Foundation, Inc. *
dnl *
dnl Permission is hereby granted, free of charge, to any person obtaining a *
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.1059 2023/11/25 21:12:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.1069 2024/03/30 22:15:45 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_BOOL_DECL version: 8 updated: 2004/01/30 15:51:18
+dnl CF_BOOL_DECL version: 9 updated: 2023/12/03 09:21:34
dnl ------------
dnl Test if 'bool' is a builtin type in the configured C++ compiler. Some
dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc
AC_MSG_CHECKING(if we should include stdbool.h)
AC_CACHE_VAL(cf_cv_header_stdbool_h,[
- AC_TRY_COMPILE([],[bool foo = false],
+ AC_TRY_COMPILE([],[bool foo = false; (void)foo],
[cf_cv_header_stdbool_h=0],
[AC_TRY_COMPILE([
#ifndef __BEOS__
#include <stdbool.h>
#endif
-],[bool foo = false],
+],[bool foo = false; (void)foo],
[cf_cv_header_stdbool_h=1],
[cf_cv_header_stdbool_h=0])])])
AC_TRY_COMPILE([
#include <stdio.h>
#include <sys/types.h>
-],[bool x = false],
+],[bool x = false; (void)x],
[ifelse($1,,cf_cv_builtin_bool,[$1])=1],
[ifelse($1,,cf_cv_builtin_bool,[$1])=0])
])
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_GETENV version: 3 updated: 2023/01/05 17:47:56
+dnl CF_CHECK_GETENV version: 4 updated: 2023/12/03 10:18:09
dnl ---------------
dnl Check if repeated getenv calls return the same pointer, e.g., it does not
dnl discard the previous pointer when returning a new one.
}
}
} while (found);
- sprintf(value, "%lu:%p", (unsigned long) k, &mynames[j]);
+ sprintf(value, "%lu:%p", (unsigned long) k, (void*)&mynames[j]);
set_value(name, value);
mynames[j] = str_alloc(name);
myvalues[j] = str_alloc(value);
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_WCHAR_H version: 4 updated: 2023/02/18 17:41:25
+dnl CF_CHECK_WCHAR_H version: 5 updated: 2023/12/03 09:21:34
dnl ----------------
dnl Check if wchar.h can be used, i.e., without defining _XOPEN_SOURCE_EXTENDED
AC_DEFUN([CF_CHECK_WCHAR_H],[
#endif
],[
wint_t foo = 0;
- int bar = iswpunct(foo)],
+ int bar = iswpunct(foo); (void) bar],
[cf_cv_wchar_h_okay=yes],
[cf_cv_wchar_h_okay=no])])
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_WCWIDTH_GRAPHICS version: 3 updated: 2023/01/05 18:01:30
+dnl CF_CHECK_WCWIDTH_GRAPHICS version: 4 updated: 2023/12/03 10:17:07
dnl -------------------------
dnl Most "modern" terminal emulators are based to some degree on VT100, and
dnl should support line-drawing. Even with Unicode. There is a problem.
main(void)
{
FILE *fp;
- int value;
+ unsigned value;
char buffer[MY_LEN + 1];
char notes[MY_LEN + 1];
int totals = 0;
fprintf(stderr, "\\t%s", buffer);
} else if (sscanf(buffer, "%x %s", &value, notes) == 2) {
++totals;
- if (wcwidth(value) == 1)
+ if (wcwidth((int)value) == 1)
++passed;
- fprintf(stderr, "%d\\t%s", wcwidth(value), buffer);
+ fprintf(stderr, "%d\\t%s", wcwidth((int)value), buffer);
} else {
fprintf(stderr, "?\\t%s", buffer);
}
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_CONST_X_STRING version: 7 updated: 2021/06/07 17:39:17
+dnl CF_CONST_X_STRING version: 8 updated: 2023/12/01 17:22:50
dnl -----------------
dnl The X11R4-X11R6 Xt specification uses an ambiguous String type for most
dnl character-strings.
AC_CACHE_CHECK(for X11/Xt const-feature,cf_cv_const_x_string,[
AC_TRY_COMPILE(
[
+#undef _CONST_X_STRING
#define _CONST_X_STRING /* X11R7.8 (perhaps) */
#undef XTSTRINGDEFINES /* X11R5 and later */
#include <stdlib.h>
test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP,1,[Define to 1 if we have nanosleep()])
])
dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_OPENPTY version: 6 updated: 2021/01/01 13:31:04
+dnl CF_FUNC_OPENPTY version: 7 updated: 2023/12/03 09:21:34
dnl ---------------
dnl Check for openpty() function, along with <pty.h> header. It may need the
dnl "util" library as well.
],[
int x = openpty((int *)0, (int *)0, (char *)0,
(struct termios *)0, (struct winsize *)0);
+ (void)x;
],[
cf_cv_func_openpty=$cf_header
break
test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR,1,[Define to 1 if we have tcgetattr])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_VSSCANF version: 7 updated: 2021/01/01 13:31:04
+dnl CF_FUNC_VSSCANF version: 8 updated: 2023/12/03 19:09:59
dnl ---------------
dnl Check for vsscanf() function, which is in c9x but generally not in earlier
-dnl versions of C. It is in the GNU C library, and can often be simulated by
-dnl other functions.
+dnl versions of C. It can often be simulated by other functions on older
+dnl systems (where FILE is not opaque).
AC_DEFUN([CF_FUNC_VSSCANF],
[
AC_CACHE_CHECK(for vsscanf function or workaround,cf_cv_func_vsscanf,[
AC_TRY_LINK([
#include <stdarg.h>
-#include <stdio.h>],[
+#include <stdio.h>
+
+static void
+myfunc(const char *str, const char *fmt, ...)
+{
va_list ap;
- vsscanf("from", "%d", ap)],[cf_cv_func_vsscanf=vsscanf],[
+ va_start(ap, fmt);
+ vsscanf(str, fmt, ap);
+ va_end(ap);
+}
+],[
+ myfunc("55", "%d");
+],[cf_cv_func_vsscanf=vsscanf],[
AC_TRY_LINK([
#include <stdarg.h>
#include <stdio.h>],[
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ISASCII version: 4 updated: 2012/10/06 17:56:13
+dnl CF_ISASCII version: 5 updated: 2023/12/03 09:21:34
dnl ----------
dnl Check if we have either a function or macro for 'isascii()'.
AC_DEFUN([CF_ISASCII],
[
AC_MSG_CHECKING(for isascii)
AC_CACHE_VAL(cf_cv_have_isascii,[
- AC_TRY_LINK([#include <ctype.h>],[int x = isascii(' ')],
+ AC_TRY_LINK([#include <ctype.h>],[int x = isascii(' '); (void)x],
[cf_cv_have_isascii=yes],
[cf_cv_have_isascii=no])
])dnl
test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII,1,[Define to 1 if we have isascii()])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 12 updated: 2020/03/19 20:23:48
+dnl CF_LARGEFILE version: 13 updated: 2023/12/03 19:09:59
dnl ------------
dnl Add checks for large file support.
AC_DEFUN([CF_LARGEFILE],[
#pragma GCC diagnostic error "-Wincompatible-pointer-types"
#include <sys/types.h>
#include <dirent.h>
+
+#ifndef __REDIRECT
+/* if transitional largefile support is setup, this is true */
+extern struct dirent64 * readdir(DIR *);
+#endif
],[
- /* if transitional largefile support is setup, this is true */
- extern struct dirent64 * readdir(DIR *);
- struct dirent64 *x = readdir((DIR *)0);
- struct dirent *y = readdir((DIR *)0);
+ DIR *dp = opendir(".");
+ struct dirent64 *x = readdir(dp);
+ struct dirent *y = readdir(dp);
int z = x - y;
(void)z;
],
test -n "$LIB_SUFFIX" && $2="${LIB_SUFFIX}[$]{$2}"
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LINK_DATAONLY version: 13 updated: 2020/02/08 15:59:30
+dnl CF_LINK_DATAONLY version: 15 updated: 2023/12/03 10:03:10
dnl ----------------
dnl Some systems have a non-ANSI linker that doesn't pull in modules that have
dnl only data (i.e., no functions), for example NeXT. On those systems we'll
rm -f conftest.$ac_ext data.o
cat >conftest.$ac_ext <<EOF
#line __oline__ "configure"
+extern int testfunc(void);
+#if defined(NeXT)
int testfunc(void)
{
-#if defined(NeXT)
${cf_cv_main_return:-return}(1); /* I'm told this linker is broken */
+}
#else
- extern int testdata[[3]];
+extern int testdata[[3]];
+int testfunc(void)
+{
return testdata[[0]] == 123
&& testdata[[1]] == 456
&& testdata[[2]] == 789;
-#endif
}
+#endif
EOF
if AC_TRY_EVAL(ac_compile); then
mv conftest.o func.o && \
cf_saveLIBS="$LIBS"
LIBS="conftest.a $LIBS"
AC_TRY_RUN([
+ extern int testfunc(void);
int main(void)
{
- extern int testfunc();
${cf_cv_main_return:-return} (!testfunc());
}
],
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_LINK_FUNCS version: 12 updated: 2023/01/05 17:51:41
+dnl CF_LINK_FUNCS version: 13 updated: 2023/12/03 09:24:04
dnl -------------
dnl Most Unix systems have both link and symlink, a few don't have symlink.
dnl A few non-Unix systems implement symlink, but not link.
int main(void)
{
int fail = 0;
- char *src = "conftest.tmp";
- char *dst = "conftest.chk";
+ char src[] = "conftest.tmp";
+ char dst[] = "conftest.chk";
struct stat src_sb, dst_sb;
FILE *fp = fopen(src, "w");
if (fp == 0) { fail = 3; } else {
AC_SUBST(MAKE_LOWER_TAGS)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MANPAGE_FORMAT version: 18 updated: 2023/05/19 18:35:02
+dnl CF_MANPAGE_FORMAT version: 19 updated: 2024/03/30 08:27:40
dnl -----------------
dnl Option to allow user to override automatic configuration of manpage format.
dnl There are several special cases:
cf_manpage_inboth=no
cf_manpage_so_strip=
cf_manpage_compress=
+cf_manpage_coptions=
for cf_item in $MANPAGE_FORMAT
do
(gzip)
cf_manpage_so_strip="gz"
cf_manpage_compress=gzip
+ cf_manpage_coptions=-n
;;
(bzip2)
cf_manpage_so_strip="bz2"
AC_SUBST(cf_manpage_inboth)
AC_SUBST(cf_manpage_so_strip)
AC_SUBST(cf_manpage_compress)
+AC_SUBST(cf_manpage_coptions)
])dnl
dnl ---------------------------------------------------------------------------
AC_MSG_RESULT($MANPAGE_TBL)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 58 updated: 2023/07/28 20:13:29
+dnl CF_MB_LEN_MAX version: 1 updated: 2024/03/02 15:45:10
+dnl -------------
+dnl Check if <limits.h> defines a usable MB_LEN_MAX. That may be because it is
+dnl not defined, or it may be a bogus value.
+AC_DEFUN([CF_MB_LEN_MAX],[
+AC_CACHE_CHECK(if MB_LEN_MAX is usable,cf_cv_mb_len_max,[
+AC_TRY_COMPILE([
+$ac_includes_default
+#include <limits.h>],
+[
+#if defined(MB_LEN_MAX) && MB_LEN_MAX >= 6
+ ${cf_cv_main_return:-return}(0);
+#else
+#error MB_LEN_MAX is not usable
+#endif
+], [cf_cv_mb_len_max=yes],
+ [cf_cv_mb_len_max=no])])
+if test "$cf_cv_mb_len_max" = yes
+then
+ AC_DEFINE(HAVE_CONSISTENT_MB_LEN_MAX,1,[Define to 1 if MB_LEN_MAX is usable])
+else
+ AC_MSG_WARN(MB_LEN_MAX is missing/inconsistent in system headers)
+fi
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_MAN_PAGES version: 59 updated: 2024/03/30 08:27:40
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
if test -n "$cf_manpage_compress" ; then
cat >>$cf_edit_man <<CF_EOF
if test -n "$cf_manpage_so_strip" ; then
- "$cf_manpage_compress" -f \$TMP
+ "$cf_manpage_compress" $cf_manpage_coptions -f \$TMP
mv \$TMP.$cf_manpage_so_strip \$TMP
fi
CF_EOF
test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_MKSTEMP version: 12 updated: 2023/01/05 17:53:11
+dnl CF_MKSTEMP version: 13 updated: 2023/12/01 17:22:50
dnl ----------
dnl Check for a working mkstemp. This creates two files, checks that they are
dnl successfully created and distinct (AmigaOS apparently fails on the last).
int main(void)
{
- char *tmpl = "conftestXXXXXX";
+ static char tmpl[] = "conftestXXXXXX";
char name[2][80];
int n;
int result = 0;
done
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 108 updated: 2023/10/28 11:59:01
+dnl CF_SHARED_OPTS version: 111 updated: 2024/03/29 20:08:49
dnl --------------
dnl --------------
dnl Attempt to determine the appropriate CC/LD options for creating a shared
for CC_SHARED_OPTS in -fPIC -fpic ''
do
CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- AC_TRY_COMPILE([#include <stdio.h>],[int x = 1],[break],[])
+ AC_TRY_COMPILE([#include <stdio.h>],[int x = 1; (void)x],[break],[])
done
AC_MSG_RESULT($CC_SHARED_OPTS)
CFLAGS="$cf_save_CFLAGS"
# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
if test "$DFT_LWR_MODEL" = "shared" ; then
- LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
+ LOCAL_LDFLAGS="-R\$(LOCAL_LIBDIR):\${libdir}"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
fi
if test "$cf_cv_enable_rpath" = yes ; then
- EXTRA_LDFLAGS="-R \${libdir} $EXTRA_LDFLAGS"
+ EXTRA_LDFLAGS="-R\${libdir} $EXTRA_LDFLAGS"
fi
CF_SHARED_SONAME
if test "$GCC" != yes; then
done
CFLAGS="$cf_save_CFLAGS"
CC_SHARED_OPTS=$cf_shared_opts
- MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]'
else
- MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -h '$cf_cv_shared_soname' -o $[@]'
+ MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -dy -G -Wl,-h,'$cf_cv_shared_soname' -o $[@]'
fi
;;
(sysv5uw7*|unix_sv*)
AC_DEFUN([CF_STRIP_G_OPT],
[$1=`echo "${$1}" | CF__SED_TRIMBLANKS(-e 's%-g %%' -e 's%-g$%%')`])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_SIGACTION version: 5 updated: 2012/10/06 17:56:13
+dnl CF_STRUCT_SIGACTION version: 6 updated: 2023/12/03 09:21:34
dnl -------------------
dnl Check if we need _POSIX_SOURCE defined to use struct sigaction. We'll only
dnl do this if we've found the sigaction function.
AC_TRY_COMPILE([
#include <sys/types.h>
#include <signal.h>],
- [struct sigaction act],
+ [struct sigaction act; (void)act],
[sigact_bad=no],
[
AC_TRY_COMPILE([
#define _POSIX_SOURCE
#include <sys/types.h>
#include <signal.h>],
- [struct sigaction act],
+ [struct sigaction act; (void)act],
[sigact_bad=yes
AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])],
[sigact_bad=unknown])])
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_STRUCT_TERMIOS version: 11 updated: 2020/03/19 20:46:13
+dnl CF_STRUCT_TERMIOS version: 13 updated: 2023/12/03 19:38:54
dnl -----------------
dnl Some machines require _POSIX_SOURCE to completely define struct termios.
AC_DEFUN([CF_STRUCT_TERMIOS],[
if test "$termios_bad" = maybe ; then
AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE)
AC_TRY_COMPILE([#include <termios.h>],
- [struct termios foo; int x = foo.c_iflag = 1; (void)x],
+ [struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x],
termios_bad=no, [
AC_TRY_COMPILE([
#define _POSIX_SOURCE
#include <termios.h>],
- [struct termios foo; int x = foo.c_iflag = 2; (void)x],
+ [struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x],
termios_bad=unknown,
termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE]))
])
AC_DEFINE_UNQUOTED(TYPEOF_CHTYPE,$cf_cv_typeof_chtype,[Define to actual type if needed for chtype])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_TYPE_SIGACTION version: 4 updated: 2012/10/06 17:56:13
+dnl CF_TYPE_SIGACTION version: 5 updated: 2023/12/03 09:21:34
dnl -----------------
dnl
AC_DEFUN([CF_TYPE_SIGACTION],
AC_CACHE_VAL(cf_cv_type_sigaction,[
AC_TRY_COMPILE([
#include <signal.h>],
- [sigaction_t x],
+ [sigaction_t x; (void)x],
[cf_cv_type_sigaction=yes],
[cf_cv_type_sigaction=no])])
AC_MSG_RESULT($cf_cv_type_sigaction)
test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_UNSIGNED_LITERALS version: 2 updated: 1998/02/07 22:10:16
+dnl CF_UNSIGNED_LITERALS version: 3 updated: 2023/12/03 10:02:17
dnl --------------------
dnl Test if the compiler supports 'U' and 'L' suffixes. Only old compilers
dnl won't, but they're still there.
[
AC_MSG_CHECKING([if unsigned literals are legal])
AC_CACHE_VAL(cf_cv_unsigned_literals,[
- AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1],
+ AC_TRY_COMPILE([],[long x = 1L + 1UL + 1U + 1; (void)x],
[cf_cv_unsigned_literals=yes],
[cf_cv_unsigned_literals=no])
])
])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WCHAR_TYPE version: 4 updated: 2012/10/06 16:39:58
+dnl CF_WCHAR_TYPE version: 5 updated: 2023/12/03 09:21:34
dnl -------------
dnl Check if type wide-character type $1 is declared, and if so, which header
dnl file is needed. The second parameter is used to set a shell variable when
#ifdef HAVE_LIBUTF8_H
#include <libutf8.h>
#endif],
- [$1 state],
+ [$1 state; (void)state],
[cf_cv_$1=no],
[AC_TRY_COMPILE([
#include <stdlib.h>
#ifdef HAVE_LIBUTF8_H
#include <libutf8.h>
#endif],
- [$1 value],
+ [$1 value; (void) value],
[cf_cv_$1=yes],
[cf_cv_$1=unknown])])])
[USE_VALGRIND])
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_WITH_VERSIONED_SYMS version: 12 updated: 2023/11/22 20:48:30
+dnl CF_WITH_VERSIONED_SYMS version: 13 updated: 2023/12/03 09:24:04
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
EOF
cat >conftest.$ac_ext <<EOF
#line __oline__ "configure"
-int _ismissing(void) { return 1; }
-int _localf1(void) { return 1; }
-int _localf2(void) { return 2; }
-int globalf1(void) { return 1; }
-int globalf2(void) { return 2; }
-int _sublocalf1(void) { return 1; }
-int _sublocalf2(void) { return 2; }
-int subglobalf1(void) { return 1; }
-int subglobalf2(void) { return 2; }
+extern int _ismissing(void); int _ismissing(void) { return 1; }
+extern int _localf1(void); int _localf1(void) { return 1; }
+extern int _localf2(void); int _localf2(void) { return 2; }
+extern int globalf1(void); int globalf1(void) { return 1; }
+extern int globalf2(void); int globalf2(void) { return 2; }
+extern int _sublocalf1(void); int _sublocalf1(void) { return 1; }
+extern int _sublocalf2(void); int _sublocalf2(void) { return 2; }
+extern int subglobalf1(void); int subglobalf1(void) { return 1; }
+extern int subglobalf2(void); int subglobalf2(void) { return 2; }
EOF
cat >conftest.mk <<EOF
CC=${CC}
projects / ncurses.git / blobdiff