diff options
Diffstat (limited to 'm4')
| -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 |
4 files changed, 20 insertions, 14 deletions
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" |