-dnl Copyright © 2011-2013, 2020-2023 Nick Bowler
+dnl Copyright © 2011-2013, 2020-2024 Nick Bowler
dnl
dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
dnl This is free software: you are free to do what the fuck you want to.
DX_PATCH_GNULIB
AC_PREREQ([2.68])
-AC_INIT([cdecl99], [1.2a], [nbowler@draconx.ca])
+AC_INIT([cdecl99], [1.3], [nbowler@draconx.ca])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects])
AM_SILENT_RULES([yes])
DX_AUTOMAKE_COMPAT
gl_EARLY
AC_HEADER_ASSERT
+AC_TYPE_UNSIGNED_LONG_LONG_INT
+AC_CHECK_TYPES([unsigned __int64], [], [],
+ [unsigned __int64 foo = -1; /* avoid false positive result on VAX C */])
AC_C_FLEXIBLE_ARRAY_MEMBER
AC_C_INLINE
DX_C_FOR_DECLARATIONS
+DX_C_ALIGNAS
+AM_PROG_AR
LT_INIT
gl_INIT
# no need for multithreaded mbrtowc (all programs are single threaded).
AC_DEFINE([GNULIB_MBRTOWC_SINGLE_THREAD], [1], [Define to 1.])
+# As the wcwidth replacement module is not used by the library, there is
+# no need to support varying locales (programs set locale once at startup).
+AC_DEFINE([GNULIB_WCHAR_SINGLE_LOCALE], [1], [Define to 1.])
+
AS_IF([test x"$gl_cv_lib_readline" = x"no"],
[AS_IF([test x"$with_readline" = x"yes"],
[AC_MSG_FAILURE([--with-readline requested but readline was not found])],
[AS_VAR_APPEND([BISON_COMPAT], ["${BISON_COMPAT:+ }-Wno-deprecated"])])
AC_SUBST([BISON_COMPAT])
-AS_IF([test x"$dx_cv_bison_define_cmdline" != x"yes"],
- [dx_cv_bison_api_token_raw=no])
-AC_CACHE_CHECK([whether $BISON supports api.token.raw],
+AS_CASE([$dx_cv_bison_define_cmdline], [yes],
+[AC_CACHE_CHECK([whether $BISON supports api.token.raw],
[dx_cv_bison_api_token_raw], [dx_cv_bison_api_token_raw=no
cat >conftest.y <<'EOF'
%token T_TEST
[AC_COMPUTE_INT([testval], [T_TEST], [#include "conftest.tab.c"
])
AS_IF([test "$testval" -lt 256], [dx_cv_bison_api_token_raw=yes])])])
-AS_IF([test x"$dx_cv_bison_api_token_raw" = x"yes"],
- [AS_VAR_APPEND([BISON_COMPAT], [" --define api.token.raw"])])
+AS_CASE([$dx_cv_bison_api_token_raw], [yes],
+ [AS_VAR_APPEND([BISON_COMPAT], [" --define api.token.raw"])])])
AH_TOP([#include <conf_pre.h>])
AH_BOTTOM([#include <conf_post.h>])
AC_CONFIG_TESTDIR([.], [t:.])
-DX_PROG_AUTOTEST
-AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])
-AC_CHECK_FUNCS_ONCE([strtoumax strtoull __strtoull])
-
-AC_CONFIG_FILES([
- Makefile
-])
+DX_PROG_AUTOTEST_AM
+
+AC_CACHE_CHECK([for getline], [dx_cv_have_getline],
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdio.h>
+], [ssize_t (*x)() = getline;
+char *p = 0;
+size_t n = 0;
+return getline(&p, &n, stdin);
+])], [dx_cv_have_getline=yes], [dx_cv_have_getline=no])])
+AS_CASE([$dx_cv_have_getline], [yes],
+ [AC_DEFINE([HAVE_GETLINE], [1],
+ [Define to 1 if the getline function is available.])])
+
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT