diff --git a/gcc/configure b/gcc/configure
index 2225a844a53..61b3cedbe69 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -8969,10 +8969,10 @@ $as_echo "$gcc_cv_prog_python3_modern" >&6; }
 if test $gcc_cv_prog_python3_modern = no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
 *** Python3 is missing.
-*** Documentation for modula-2 will not include the library modules." >&5
+*** Documentation for modula-2 will not include the target SYSTEM module." >&5
 $as_echo "$as_me: WARNING:
 *** Python3 is missing.
-*** Documentation for modula-2 will not include the library modules." >&2;}
+*** Documentation for modula-2 will not include the target SYSTEM module." >&2;}
   HAVE_PYTHON=no
 else
   HAVE_PYTHON=yes
diff --git a/gcc/m2/gm2config.h.in b/gcc/m2/gm2config.h.in
index ced7f4586dc..fe2f81400ed 100644
--- a/gcc/m2/gm2config.h.in
+++ b/gcc/m2/gm2config.h.in
@@ -1,56 +1,70 @@
-/* gm2config.h.in template file for values required by gm2spec.c.
+/* gm2config.h.in.  Generated from configure.ac by autoheader.  */
 
-Copyright (C) 2006-2022 Free Software Foundation, Inc.
-Contributed by Gaius Mulley <gaius.mulley@southwales.ac.uk>.
-
-This file is part of GNU Modula-2.
-
-GNU Modula-2 is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GNU Modula-2 is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Modula-2; see the file COPYING3.  If not see
-<http://www.gnu.org/licenses/>.  */
-
-#ifndef PACKAGE_BUGREPORT
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-#endif
-
-#ifndef PACKAGE_NAME
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-#endif
-
-#ifndef PACKAGE_STRING
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-#endif
-
-/* Define to 1 if you have the `stpcmp' function. */
-#undef HAVE_STPCMP
-
-/* Define to 1 if you have the dirent.h header. */
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
 #undef HAVE_DIRENT_H
 
-/* Define to 1 if you have the sys/ndir.h header. */
-#undef HAVE_SYS_NDIR_H
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the sys/dir.h header. */
-#undef HAVE_SYS_DIR_H
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
 
-/* Define to 1 if you have the ndir.h header. */
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
-/* Define to 1 if you have the sys/types.h header. */
+/* found opendir */
+#undef HAVE_OPENDIR
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `stpcpy' function. */
+#undef HAVE_STPCPY
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the opendir function.  */
-#undef HAVE_OPENDIR
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS