X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/4ef59e97312cf3e8f537643c65bc2fef057b786b..HEAD:/configure.ac diff --git a/configure.ac b/configure.ac index 435eaf9..d292fcd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,15 @@ -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. -dnl There is NO WARRANTY, to the extent permitted by law. +AC_COPYRIGHT([Copyright (C) 2011-2013, 2020-2024 Nick Bowler +License GPLv3+: GNU General Public License version 3 or any later version. +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law.]) DX_PATCH_GNULIB AC_PREREQ([2.68]) -AC_INIT([cdecl99], [1.2a], [nbowler@draconx.ca]) +AC_INIT([cdecl99], [1.3a], [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 @@ -28,9 +27,14 @@ AM_PROG_CC_C_O 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 @@ -39,6 +43,10 @@ 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])], @@ -110,16 +118,7 @@ AH_BOTTOM([#include ]) AC_CONFIG_TESTDIR([.], [t:.]) DX_PROG_AUTOTEST_AM -AC_CACHE_CHECK([for getline], [dx_cv_have_getline], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include -], [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.])]) +DX_CHECK_GETLINE AC_CONFIG_FILES([Makefile]) AC_OUTPUT