diff --git a/gnuscripts/ax_cc_maxopt.m4 b/gnuscripts/ax_cc_maxopt.m4
index c6fdff998acd326699d394a23f1299755291a16f..8fb4c8be8ac96b33aef2b292bf0841bd6fc40b8c 100644
--- a/gnuscripts/ax_cc_maxopt.m4
+++ b/gnuscripts/ax_cc_maxopt.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#          http://www.nongnu.org/autoconf-archive/ax_cc_maxopt.html
+#       http://www.gnu.org/software/autoconf-archive/ax_cc_maxopt.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -55,7 +55,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 6
+#serial 8
 
 AC_DEFUN([AX_CC_MAXOPT],
 [
@@ -63,7 +63,7 @@ AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AX_COMPILER_VENDOR])
 AC_REQUIRE([AC_CANONICAL_HOST])
 
-AC_ARG_ENABLE(portable-binary, [AC_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])],
+AC_ARG_ENABLE(portable-binary, [AS_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])],
 	acx_maxopt_portable=$withval, acx_maxopt_portable=no)
 
 # Try to determine "good" native compiler flags if none specified via CFLAGS
diff --git a/gnuscripts/ax_cflags_warn_all.m4 b/gnuscripts/ax_cflags_warn_all.m4
index f922961cd8f76adbcc9ee7e0c363e5d5273044e1..64fb29769e5f5259db4c615451c20d5e675537ef 100644
--- a/gnuscripts/ax_cflags_warn_all.m4
+++ b/gnuscripts/ax_cflags_warn_all.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#       http://www.nongnu.org/autoconf-archive/ax_cflags_warn_all.html
+#    http://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -53,7 +53,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 7
+#serial 8
 
 AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl
 AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl
diff --git a/gnuscripts/ax_check_compiler_flags.m4 b/gnuscripts/ax_check_compiler_flags.m4
index 5bb9048c78251dfed92af1a6035256790ffaee1f..35bfd2a5a27405d140712bc060a6a5e6d57469c7 100644
--- a/gnuscripts/ax_check_compiler_flags.m4
+++ b/gnuscripts/ax_check_compiler_flags.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#     http://www.nongnu.org/autoconf-archive/ax_check_compiler_flags.html
+#  http://www.gnu.org/software/autoconf-archive/ax_check_compiler_flags.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -46,7 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 8
+#serial 9
 
 AC_DEFUN([AX_CHECK_COMPILER_FLAGS],
 [AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
diff --git a/gnuscripts/ax_compiler_vendor.m4 b/gnuscripts/ax_compiler_vendor.m4
index bbfc3bb5099df4ce50c708b11871469fc8c0ba1b..7692ed350891ba5084a141f129d72db564ee844a 100644
--- a/gnuscripts/ax_compiler_vendor.m4
+++ b/gnuscripts/ax_compiler_vendor.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#       http://www.nongnu.org/autoconf-archive/ax_compiler_vendor.html
+#    http://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -44,7 +44,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 7
+#serial 8
 
 AC_DEFUN([AX_COMPILER_VENDOR],
 [
diff --git a/gnuscripts/ax_gcc_archflag.m4 b/gnuscripts/ax_gcc_archflag.m4
index 400a2a2040343ed2a9452bf68359f77c60182fdf..d37a9134c23aa984d9a3281591224ec898701f48 100644
--- a/gnuscripts/ax_gcc_archflag.m4
+++ b/gnuscripts/ax_gcc_archflag.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#         http://www.nongnu.org/autoconf-archive/ax_gcc_archflag.html
+#      http://www.gnu.org/software/autoconf-archive/ax_gcc_archflag.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -63,13 +63,13 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 6
+#serial 8
 
 AC_DEFUN([AX_GCC_ARCHFLAG],
 [AC_REQUIRE([AC_PROG_CC])
 AC_REQUIRE([AC_CANONICAL_HOST])
 
-AC_ARG_WITH(gcc-arch, [AC_HELP_STRING([--with-gcc-arch=<arch>], [use architecture <arch> for gcc -march/-mtune, instead of guessing])],
+AC_ARG_WITH(gcc-arch, [AS_HELP_STRING([--with-gcc-arch=<arch>], [use architecture <arch> for gcc -march/-mtune, instead of guessing])],
 	ax_gcc_arch=$withval, ax_gcc_arch=yes)
 
 AC_MSG_CHECKING([for gcc architecture flag])
diff --git a/gnuscripts/ax_gcc_x86_cpuid.m4 b/gnuscripts/ax_gcc_x86_cpuid.m4
index 950137a9ae24893615374f571d55e95ba064954d..7d46fee0219e970f98e960a5b0717a9ec061ee95 100644
--- a/gnuscripts/ax_gcc_x86_cpuid.m4
+++ b/gnuscripts/ax_gcc_x86_cpuid.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#        http://www.nongnu.org/autoconf-archive/ax_gcc_x86_cpuid.html
+#     http://www.gnu.org/software/autoconf-archive/ax_gcc_x86_cpuid.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -55,7 +55,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 6
+#serial 7
 
 AC_DEFUN([AX_GCC_X86_CPUID],
 [AC_REQUIRE([AC_PROG_CC])
diff --git a/gnuscripts/ax_python_devel.m4 b/gnuscripts/ax_python_devel.m4
index 2705e8f29ddceed2ad90880fa1ee5a43ff4996f1..8dfa5e17dff72ed8f8a36b2a9efead874f4f6d80 100644
--- a/gnuscripts/ax_python_devel.m4
+++ b/gnuscripts/ax_python_devel.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#         http://www.nongnu.org/autoconf-archive/ax_python_devel.html
+#      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -66,7 +66,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 3
+#serial 4
 
 AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
 AC_DEFUN([AX_PYTHON_DEVEL],[
diff --git a/gnuscripts/ax_python_module.m4 b/gnuscripts/ax_python_module.m4
index 9032ca880af5eb9f59fad0f92438830c251f9ff6..bd70a06b4f04095a8c39f4a1fbab8c11069546f2 100644
--- a/gnuscripts/ax_python_module.m4
+++ b/gnuscripts/ax_python_module.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-#        http://www.nongnu.org/autoconf-archive/ax_python_module.html
+#     http://www.gnu.org/software/autoconf-archive/ax_python_module.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -21,7 +21,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 4
+#serial 5
 
 AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
 AC_DEFUN([AX_PYTHON_MODULE],[