autoupdate: replace obsolete macros AC_HELP_STRING

- AC_HELP_STRING by AS_HELP_STRING
  https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fHELP_005fSTRING-1
Except for the ifdef in lib-prefix.m4, make the defun of AC_LIB_ARG_WITH
unconditional.

7 files changed, 13 insertions, 16 deletions

diff --git a/binutils/configure.ac b/binutils/configure.ac
index ac3e418..19c5d7d 100644
--- a/binutils/configure.ac
+++ b/binutils/configure.ac
@@ -292,7 +292,7 @@ BFD_BINARY_FOPEN
 
 # Support for the msgpack C library.
 AC_ARG_WITH([msgpack],
-	    AC_HELP_STRING([--with-msgpack], [Enable msgpack support (auto/yes/no)]),
+	    AS_HELP_STRING([--with-msgpack], [Enable msgpack support (auto/yes/no)]),
 	    [],
 	    [with_msgpack=auto])
 
diff --git a/config/debuginfod.m4 b/config/debuginfod.m4
index c5077ac..a32cf2c 100644
--- a/config/debuginfod.m4
+++ b/config/debuginfod.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AC_DEBUGINFOD],
 # Define HAVE_LIBDEBUGINFOD_FIND_SECTION if libdebuginfod is found with
 # version >= 0.188.
 AC_ARG_WITH([debuginfod],
-  AC_HELP_STRING([--with-debuginfod], [Enable debuginfo lookups with debuginfod (auto/yes/no)]),
+  AS_HELP_STRING([--with-debuginfod], [Enable debuginfo lookups with debuginfod (auto/yes/no)]),
   [], [with_debuginfod=auto])
 AC_MSG_CHECKING([whether to use debuginfod])
 AC_MSG_RESULT([$with_debuginfod])
diff --git a/config/enable.m4 b/config/enable.m4
index 88b29b8..119c370 100644
--- a/config/enable.m4
+++ b/config/enable.m4
@@ -11,7 +11,7 @@ dnl See docs/html/17_intro/configury.html#enable for documentation.
 dnl
 AC_DEFUN([GCC_ENABLE],[dnl
 m4_define([_g_switch],[--enable-$1])dnl
-m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
+m4_define([_g_help],[AS_HELP_STRING([_g_switch$3],[$4 @<:@default=$2@:>@])])dnl
  AC_ARG_ENABLE($1,_g_help,
   m4_bmatch([$5],
    [^permit ],
diff --git a/config/lib-prefix.m4 b/config/lib-prefix.m4
index c719bc8..0c6ce02 100644
--- a/config/lib-prefix.m4
+++ b/config/lib-prefix.m4
@@ -8,12 +8,9 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl AC_LIB_ARG_WITH is similar to AC_ARG_WITH except that it doesn't
 dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])
 
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that
diff --git a/ld/configure.ac b/ld/configure.ac
index 0d4aa4c..84f4044 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -197,7 +197,7 @@ esac])dnl
 # Decide if DT_TEXTREL check should be enabled in ELF linker.
 ac_default_ld_textrel_check=unset
 AC_ARG_ENABLE([textrel-check],
-	      AC_HELP_STRING([--enable-textrel-check=@<:@yes|no|warning|error@:>@],
+	      AS_HELP_STRING([--enable-textrel-check=@<:@yes|no|warning|error@:>@],
 			     [enable DT_TEXTREL check in ELF linker]),
 [case "${enableval}" in
   yes|no|warning|error) ac_default_ld_textrel_check=${enableval} ;;
diff --git a/readline/readline/configure.ac b/readline/readline/configure.ac
index 912c99b..c800f1c 100644
--- a/readline/readline/configure.ac
+++ b/readline/readline/configure.ac
@@ -45,7 +45,7 @@ dnl configure defaults
 opt_curses=no
 
 dnl arguments to configure
-AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
+AC_ARG_WITH(curses, AS_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
 
 if test "$opt_curses" = "yes"; then
 	prefer_curses=yes
@@ -58,12 +58,12 @@ opt_shared_libs=no
 opt_install_examples=no
 opt_bracketed_paste_default=yes
 
-AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval)
-dnl AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
-AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval)
-AC_ARG_ENABLE(install-examples, AC_HELP_STRING([--disable-install-examples], [don't install examples [[default=install]]]), opt_install_examples=$enableval)
+AC_ARG_ENABLE(multibyte, AS_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval)
+dnl AC_ARG_ENABLE(shared, AS_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval)
+AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval)
+AC_ARG_ENABLE(install-examples, AS_HELP_STRING([--disable-install-examples], [don't install examples [[default=install]]]), opt_install_examples=$enableval)
 
-AC_ARG_ENABLE(bracketed-paste-default, AC_HELP_STRING([--disable-bracketed-paste-default], [disable bracketed paste by default [[default=enable]]]), opt_bracketed_paste_default=$enableval)
+AC_ARG_ENABLE(bracketed-paste-default, AS_HELP_STRING([--disable-bracketed-paste-default], [disable bracketed paste by default [[default=enable]]]), opt_bracketed_paste_default=$enableval)
 
 if test $opt_multibyte = no; then
 AC_DEFINE(NO_MULTIBYTE_SUPPORT)
diff --git a/sim/configure.ac b/sim/configure.ac
index 125eaa5..fad5b71 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -37,7 +37,7 @@ yes | no) ;;
 esac])
 
 AC_ARG_ENABLE([example-sims],
-	      [AC_HELP_STRING([--enable-example-sims],
+	      [AS_HELP_STRING([--enable-example-sims],
 			      [enable example GNU simulators])])
 
 AC_ARG_ENABLE(targets,