diff options
| -rw-r--r-- | extension/ChangeLog | 7 | ||||
| -rw-r--r-- | extension/configh.in | 4 | ||||
| -rwxr-xr-x | extension/configure | 7 | ||||
| -rw-r--r-- | extension/configure.ac | 8 | ||||
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/mpfr.m4 | 4 | ||||
| -rw-r--r-- | m4/readline.m4 | 21 | ||||
| -rw-r--r-- | m4/threadlib.m4 | 4 |
8 files changed, 29 insertions, 31 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index 197b56bd..1fa16efa 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,8 +1,13 @@ +2021-09-10 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac: Updated for Autoconf 2.71. Removes various warnings. + * configh.in, configure: Regenerated. + 2021-09-09 Arnold D. Robbins <arnold@skeeve.com> Move to Autoconf 2.71 (finally!) - * aclocal.m4, configh.in configure: Regenerated. + * aclocal.m4, configh.in, configure: Regenerated. 2021-05-05 Arnold D. Robbins <arnold@skeeve.com> diff --git a/extension/configh.in b/extension/configh.in index d816e990..c0e0e2c8 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -182,10 +182,6 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This - macro is obsolete. */ -#undef TIME_WITH_SYS_TIME - /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE diff --git a/extension/configure b/extension/configure index e21c077d..5e746cae 100755 --- a/extension/configure +++ b/extension/configure @@ -16841,13 +16841,6 @@ fi -# Obsolete code to be removed. -if test $ac_cv_header_sys_time_h = yes; then - -printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi -# End of obsolete code. case `uname -m` in diff --git a/extension/configure.ac b/extension/configure.ac index 9073c0ab..32c02a95 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -25,7 +25,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([GNU Awk Bundled Extensions],[5.1.0],[bug-gawk@gnu.org],[gawk-extensions]) -AC_PREREQ([2.69]) +AC_PREREQ([2.71]) AC_CONFIG_MACRO_DIR([../m4]) AC_CONFIG_AUX_DIR([../build-aux]) @@ -94,10 +94,8 @@ AC_CHECK_HEADERS(fnmatch.h limits.h sys/mkdev.h sys/param.h sys/select.h \ sys/statvfs.h sys/sysmacros.h sys/time.h) AC_HEADER_DIRENT -dnl 12/2017: AC_HEADER_MAJOR no longer works on recent Fedora / GLIBC. -dnl Instead we just check for the headers in the call above. -dnl AC_HEADER_MAJOR -AC_HEADER_TIME +AC_CHECK_HEADERS_ONCE([sys/time.h]) + dnl check for mpfr support case `uname -m` in diff --git a/m4/ChangeLog b/m4/ChangeLog index 0db8bf30..37329b6b 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2021-09-10 Arnold D. Robbins <arnold@skeeve.com> + + * mpfr.m4, readline.m4, threadlib.m4: Update for Autoconf 2.71. + Removes various warnings when Autoconf runs. + 2020-07-22 Arnold D. Robbins <arnold@skeeve.com> * fcntl-o.m4, glibc2.m4, glibc21.m4, intdiv0.m4, intldir.m4, @@ -13,7 +13,7 @@ dnl found, and sets @LIBMPFR@ to the necessary libraries. AC_DEFUN([GNUPG_CHECK_MPFR], [ AC_ARG_WITH([mpfr], - AC_HELP_STRING([--with-mpfr=DIR], + AS_HELP_STRING([--with-mpfr=DIR], [look for the mpfr and gmp libraries in DIR]), [_do_mpfr=$withval],[_do_mpfr=yes]) @@ -27,7 +27,7 @@ AC_DEFUN([GNUPG_CHECK_MPFR], _combo="-lmpfr -lgmp" LIBS="$LIBS $_combo" - AC_MSG_CHECKING([whether mpfr via \"$_combo\" is present and usable]) + AC_MSG_CHECKING([whether mpfr via "$_combo" is present and usable]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([ diff --git a/m4/readline.m4 b/m4/readline.m4 index 12f389bf..25adb6f2 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -19,7 +19,7 @@ dnl problem is only discovered at run time. Isn't that special? AC_DEFUN([GAWK_CHECK_READLINE], [ AC_ARG_WITH([readline], - AC_HELP_STRING([--with-readline=DIR], + AS_HELP_STRING([--with-readline=DIR], [look for the readline library in DIR]), [_do_readline=$withval],[_do_readline=yes]) @@ -34,11 +34,11 @@ AC_DEFUN([GAWK_CHECK_READLINE], _combo="-lreadline${_termcap:+ $_termcap}" LIBS="$LIBS $_combo" - AC_MSG_CHECKING([whether readline via \"$_combo\" is present and sane]) + AC_MSG_CHECKING([whether readline via "$_combo" is present and sane]) - AC_TRY_RUN( + AC_RUN_IFELSE( dnl source program: -AC_LANG_SOURCE([[#include <stdio.h> +[AC_LANG_SOURCE([[#include <stdio.h> #include <fcntl.h> #include <unistd.h> #include <readline/readline.h> @@ -58,17 +58,18 @@ int main(int argc, char **argv) /* some printfs don't handle NULL for %s */ printf("got <%s>\n", line ? line : "(NULL)"); return 0; -}]]), +}]])], dnl action if true: [_found_readline=yes], dnl action if false: [_found_readline=no], dnl action if cross compiling: - AC_TRY_LINK([#include <stdio.h> + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[#include <stdio.h> #include <readline/readline.h> -#include <readline/history.h>], dnl includes +#include <readline/history.h>]], dnl includes dnl function body - [ + [[ int fd; char *line; @@ -80,12 +81,12 @@ dnl action if cross compiling: /* some printfs don't handle NULL for %s */ printf("got <%s>\n", line ? line : "(NULL)"); -], +]])], dnl action if found: [_found_readline=yes], dnl action if not found: [_found_readline=no] - ) + )] ) AC_MSG_RESULT([$_found_readline]) diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 8615ac94..f1cc15dd 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -53,8 +53,8 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY], [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])], [m4_divert_text([DEFAULTS], [gl_use_threads_default=])]) AC_ARG_ENABLE([threads], -AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ -AC_HELP_STRING([--disable-threads], [build without multithread safety])]), +AS_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [ +AS_HELP_STRING([--disable-threads], [build without multithread safety])]), [gl_use_threads=$enableval], [if test -n "$gl_use_threads_default"; then gl_use_threads="$gl_use_threads_default" |