Convert AC_HELP_STRING to AS_HELP_STRING

This is a straightforward replacement prompted by a
warning from newer versions of Autoconf.

IWBN to upstream some of these changes.

* m4/as-auto-alt.m4 (--with-autoconf)
(--with-autoheader, --with-automake, --with-aclocal): ...here.
* m4/libcurl.m4 (--with-libcurl): Likewise.
* m4/libgcrypt.m4 (--with-libgcrypt-prefix): Likewise.
* m4/libgnurl.m4 (--with-libgnurl): Likewise.
* m4/threadlib.m4 (--enable-threads, --disable-threads): Likewise.

5 files changed, 9 insertions, 9 deletions

diff --git a/m4/as-auto-alt.m4 b/m4/as-auto-alt.m4
index 3f7920dd2..07c550b38 100644
--- a/m4/as-auto-alt.m4
+++ b/m4/as-auto-alt.m4
@@ -10,7 +10,7 @@ AC_DEFUN([AS_AUTOTOOLS_ALTERNATE],
 [
   dnl allow for different autoconf version
   AC_ARG_WITH(autoconf,
-    AC_HELP_STRING([--with-autoconf],
+    AS_HELP_STRING([--with-autoconf],
                    [use a different autoconf for regeneration of Makefiles]),
     [
       unset AUTOCONF
@@ -20,7 +20,7 @@ AC_DEFUN([AS_AUTOTOOLS_ALTERNATE],
 
   dnl allow for different autoheader version
   AC_ARG_WITH(autoheader,
-    AC_HELP_STRING([--with-autoheader],
+    AS_HELP_STRING([--with-autoheader],
                    [use a different autoheader for regeneration of Makefiles]),
     [
       unset AUTOHEADER
@@ -30,7 +30,7 @@ AC_DEFUN([AS_AUTOTOOLS_ALTERNATE],
 
   dnl allow for different automake version
   AC_ARG_WITH(automake,
-    AC_HELP_STRING([--with-automake],
+    AS_HELP_STRING([--with-automake],
                    [use a different automake for regeneration of Makefiles]),
     [
       unset AUTOMAKE
@@ -40,7 +40,7 @@ AC_DEFUN([AS_AUTOTOOLS_ALTERNATE],
 
   dnl allow for different aclocal version
   AC_ARG_WITH(aclocal,
-    AC_HELP_STRING([--with-aclocal],
+    AS_HELP_STRING([--with-aclocal],
                    [use a different aclocal for regeneration of Makefiles]),
     [
       unset ACLOCAL
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index a84077a5e..047260bae 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -61,7 +61,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
   AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
 
   AC_ARG_WITH(libcurl,
-     AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
+     AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
      [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
 
   if test "$_libcurl_with" != "no" ; then
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 6cf482fcb..9a29eb5ba 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -23,7 +23,7 @@ dnl
 AC_DEFUN([AM_PATH_LIBGCRYPT],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(libgcrypt-prefix,
-            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+            AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
                            [prefix where LIBGCRYPT is installed (optional)]),
      libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
   if test x$libgcrypt_config_prefix != x ; then
diff --git a/m4/libgnurl.m4 b/m4/libgnurl.m4
index da72e5e87..412709373 100644
--- a/m4/libgnurl.m4
+++ b/m4/libgnurl.m4
@@ -61,7 +61,7 @@ AC_DEFUN([LIBGNURL_CHECK_CONFIG],
   AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP])
 
   AC_ARG_WITH(libgnurl,
-     AC_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]),
+     AS_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]),
      [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])])
 
   if test "$_libgnurl_with" != "no" ; then
diff --git a/m4/threadlib.m4 b/m4/threadlib.m4
index dc9a3d8e8..80af285bf 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"