[gcc(refs/users/egallager/heads/autotools-tinkering)] regenerate some more files

[gcc(refs/users/egallager/heads/autotools-tinkering)] regenerate some more files

[Eric Gallager]

https://gcc.gnu.org/g:6e6be6e3816be579733f766641a4df48b3ec5ee5

commit 6e6be6e3816be579733f766641a4df48b3ec5ee5
Author: Eric Gallager <egallager@gcc.gnu.org>
Date:   Sun Jun 12 01:14:06 2022 -0400

    regenerate some more files
    
    ones that configuring with --enable-maintainer-mode revealed still needed to be regenerated
    This reverts the part of 6b44b2c that touched config/gettext.m4, since that led to output like:
    configure.ac:7: warning: AC_CHECK_INCLUDES_DEFAULT is m4_require'd but not m4_defun'd
    ../config/gettext.m4:357: AM_INTL_SUBDIR is expanded from...
    ../config/gettext.m4:59: AM_GNU_GETTEXT is expanded from...
    configure.ac:7: the top level
    configure.ac:35: error: possibly undefined macro: dnl
          If this token and others are legitimate, please use m4_pattern_allow.
          See the Autoconf documentation.
    configure:4098: error: possibly undefined macro: AC_CHECK_INCLUDES_DEFAULT
    configure:8235: error: possibly undefined macro: _AC_FINALIZE

Diff:
---
 c++tools/config.h.in   | 10 ++++++----
 config/gettext.m4      | 44 ++++++++++++++++++++++++++------------------
 fixincludes/aclocal.m4 |  4 ++--
 intl/aclocal.m4        |  4 ++--
 libiberty/aclocal.m4   |  4 ++--
 5 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/c++tools/config.h.in b/c++tools/config.h.in
index 410b2f7dab8..8d75ca1b327 100644
--- a/c++tools/config.h.in
+++ b/c++tools/config.h.in
@@ -21,9 +21,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
 /* Define if pselect provided. */
 #undef HAVE_PSELECT
 
@@ -33,6 +30,9 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -75,5 +75,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
diff --git a/config/gettext.m4 b/config/gettext.m4
index 493a8d907e1..5b42bb16523 100644
--- a/config/gettext.m4
+++ b/config/gettext.m4
@@ -127,7 +127,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
         define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libintl.h>
+         [AC_TRY_LINK([#include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
@@ -135,15 +135,18 @@ extern int *_nl_domain_bindings;
 #else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif
-ifelse($2, need-formatstring-macros,
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 changequote([,])dnl
-, )]], [[bindtextdomain ("", "");
-return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0), ) + __GNU_GETTEXT_SYMBOL_EXPRESSION]])],[gt_cv_func_gnugettext_libc=yes],[gt_cv_func_gnugettext_libc=no])])
+], []),
+            [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + __GNU_GETTEXT_SYMBOL_EXPRESSION],
+            gt_cv_func_gnugettext_libc=yes,
+            gt_cv_func_gnugettext_libc=no)])
 
         if test "$gt_cv_func_gnugettext_libc" != "yes"; then
           dnl Sometimes libintl requires libiconv, so first search for libiconv.
@@ -162,7 +165,7 @@ return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0)
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libintl.h>
+            AC_TRY_LINK([#include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
@@ -174,19 +177,22 @@ const char *_nl_expand_alias ();
 #else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif
-ifelse($2, need-formatstring-macros,
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 changequote([,])dnl
-, )]], [[bindtextdomain ("", "");
-return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0), ) + __GNU_GETTEXT_SYMBOL_EXPRESSION]])],[gt_cv_func_gnugettext_libintl=yes],[gt_cv_func_gnugettext_libintl=no])
+], []),
+              [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + __GNU_GETTEXT_SYMBOL_EXPRESSION],
+              gt_cv_func_gnugettext_libintl=yes,
+              gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
             if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <libintl.h>
+              AC_TRY_LINK([#include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
@@ -198,18 +204,20 @@ const char *_nl_expand_alias ();
 #else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif
-ifelse($2, need-formatstring-macros,
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 changequote([,])dnl
-, )]], [[bindtextdomain ("", "");
-return (int) gettext ("")ifelse($2, need-ngettext,  + (int) ngettext ("", "", 0), ) + __GNU_GETTEXT_SYMBOL_EXPRESSION]])],[LIBINTL="$LIBINTL $LIBICONV"
+], []),
+                [bindtextdomain ("", "");
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + __GNU_GETTEXT_SYMBOL_EXPRESSION],
+               [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
-               ],[])
+               ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"])
@@ -361,8 +369,8 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AC_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_CHECK_INCLUDES_DEFAULT])dnl
-  AC_REQUIRE([AC_PROG_EGREP])dnl
+  AC_REQUIRE([AC_ISC_POSIX])dnl
+  AC_REQUIRE([AC_HEADER_STDC])dnl
   AC_REQUIRE([AC_C_CONST])dnl
   AC_REQUIRE([AC_C_INLINE])dnl
   AC_REQUIRE([AC_TYPE_OFF_T])dnl
diff --git a/fixincludes/aclocal.m4 b/fixincludes/aclocal.m4
index 20b7f4d9a8d..0a20e4bfd00 100644
--- a/fixincludes/aclocal.m4
+++ b/fixincludes/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/intl/aclocal.m4 b/intl/aclocal.m4
index 473ec622323..7180ce891ba 100644
--- a/intl/aclocal.m4
+++ b/intl/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/libiberty/aclocal.m4 b/libiberty/aclocal.m4
index 3378316dced..ec3d692c6d0 100644
--- a/libiberty/aclocal.m4
+++ b/libiberty/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,