.......... [DEV-2241] replaced AC_HELP_STRING macro with AS_HELP_STRING

21 files changed, 35 insertions, 35 deletions

diff --git a/m4/ax_lib_mysql.m4 b/m4/ax_lib_mysql.m4
index 4be72e8eec9..68555933fdc 100644
--- a/m4/ax_lib_mysql.m4
+++ b/m4/ax_lib_mysql.m4
@@ -160,7 +160,7 @@ AC_DEFUN([AX_LIB_MYSQL],
     MYSQL_CONFIG="no"
 
     AC_ARG_WITH([mysql],
-        AC_HELP_STRING([--with-mysql@<:@=ARG@:>@],
+        AS_HELP_STRING([--with-mysql@<:@=ARG@:>@],
             [use MySQL client library @<:@default=no@:>@, optionally specify path to mysql_config]
         ),
         [
diff --git a/m4/ax_lib_oracle_oci.m4 b/m4/ax_lib_oracle_oci.m4
index a167fe8b483..bb20833bfcb 100644
--- a/m4/ax_lib_oracle_oci.m4
+++ b/m4/ax_lib_oracle_oci.m4
@@ -55,7 +55,7 @@
 AC_DEFUN([AX_LIB_ORACLE_OCI],
 [
     AC_ARG_WITH([oracle],
-        AC_HELP_STRING([--with-oracle@<:@=ARG@:>@],
+        AS_HELP_STRING([--with-oracle@<:@=ARG@:>@],
             [use Oracle OCI API from given Oracle home (ARG=path); use existing ORACLE_HOME (ARG=yes); disable Oracle OCI support (ARG=no)]
         ),
         [
@@ -76,7 +76,7 @@ AC_DEFUN([AX_LIB_ORACLE_OCI],
     )
 
     AC_ARG_WITH([oracle-include],
-        AC_HELP_STRING([--with-oracle-include@<:@=DIR@:>@],
+        AS_HELP_STRING([--with-oracle-include@<:@=DIR@:>@],
             [use Oracle OCI API headers from given path]
         ),
         [
@@ -88,7 +88,7 @@ AC_DEFUN([AX_LIB_ORACLE_OCI],
         [oracle_home_include_dir=""]
     )
     AC_ARG_WITH([oracle-lib],
-        AC_HELP_STRING([--with-oracle-lib@<:@=DIR@:>@],
+        AS_HELP_STRING([--with-oracle-lib@<:@=DIR@:>@],
             [use Oracle OCI API libraries from given path]
         ),
         [
diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4
index 6c37dad494c..005021a14ed 100644
--- a/m4/ax_lib_postgresql.m4
+++ b/m4/ax_lib_postgresql.m4
@@ -52,7 +52,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL],
     PG_CONFIG="no"
 
     AC_ARG_WITH([postgresql],
-        AC_HELP_STRING([--with-postgresql@<:@=ARG@:>@],
+        AS_HELP_STRING([--with-postgresql@<:@=ARG@:>@],
             [use PostgreSQL library @<:@default=no@:>@, optionally specify path to pg_config]
         ),
         [
diff --git a/m4/ax_lib_sqlite3.m4 b/m4/ax_lib_sqlite3.m4
index fa1fe5c0dc9..233484ffcf7 100644
--- a/m4/ax_lib_sqlite3.m4
+++ b/m4/ax_lib_sqlite3.m4
@@ -41,7 +41,7 @@
 AC_DEFUN([AX_LIB_SQLITE3],
 [
     AC_ARG_WITH([sqlite3],
-        AC_HELP_STRING(
+        AS_HELP_STRING(
             [--with-sqlite3@<:@=ARG@:>@],
             [use SQLite 3 library @<:@default=no@:>@, optionally specify the prefix for sqlite3 library]
         ),
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index b2b1bca3bd2..af6de97156b 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -33,7 +33,7 @@ AC_DEFUN([LIBICONV_CHECK_CONFIG],
 [
 	AC_ARG_WITH([iconv],[
 If you want to specify iconv installation directories:
-AC_HELP_STRING([--with-iconv@<:@=DIR@:>@], [use iconv from given base install directory (DIR), default is to search through a number of common places for the iconv files.])],
+AS_HELP_STRING([--with-iconv@<:@=DIR@:>@], [use iconv from given base install directory (DIR), default is to search through a number of common places for the iconv files.])],
 		[
 			if test "$withval" = "yes"; then
 				ICONV_CFLAGS="-I/usr/include"
@@ -49,7 +49,7 @@ AC_HELP_STRING([--with-iconv@<:@=DIR@:>@], [use iconv from given base install di
 	)
 
 	AC_ARG_WITH([iconv-include],
-		AC_HELP_STRING([--with-iconv-include@<:@=DIR@:>@],
+		AS_HELP_STRING([--with-iconv-include@<:@=DIR@:>@],
 			[use iconv include headers from given path.]
 		),
 		[
@@ -59,7 +59,7 @@ AC_HELP_STRING([--with-iconv@<:@=DIR@:>@], [use iconv from given base install di
 	)
 
 	AC_ARG_WITH([iconv-lib],
-		AC_HELP_STRING([--with-iconv-lib@<:@=DIR@:>@],
+		AS_HELP_STRING([--with-iconv-lib@<:@=DIR@:>@],
 			[use iconv libraries from given path.]
 		),
 		[
diff --git a/m4/ldap.m4 b/m4/ldap.m4
index 19b32aa1eb4..a4752809e46 100644
--- a/m4/ldap.m4
+++ b/m4/ldap.m4
@@ -59,7 +59,7 @@ AC_DEFUN([LIBLDAP_CHECK_CONFIG],
 [
   AC_ARG_WITH(ldap,[
 If you want to check LDAP servers:
-AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:>@. DIR is the LDAP base install directory, default is to search through a number of common places for the LDAP files.])],
+AS_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:>@. DIR is the LDAP base install directory, default is to search through a number of common places for the LDAP files.])],
      [ if test "$withval" = "no"; then
             want_ldap="no"
             _libldap_with="no"
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
index 576e5a15041..a55775ac3af 100644
--- a/m4/libcurl.m4
+++ b/m4/libcurl.m4
@@ -61,7 +61,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
   AC_ARG_WITH(libcurl,
      [
 If you want to use cURL library:
-AC_HELP_STRING([--with-libcurl@<:@=DIR@:>@],[use cURL package @<:@default=no@:>@, optionally specify path to curl-config])],
+AS_HELP_STRING([--with-libcurl@<:@=DIR@:>@],[use cURL package @<:@default=no@:>@, optionally specify path to curl-config])],
         [
         if test "x$withval" = "xno"; then
             want_curl="no"
diff --git a/m4/libevent.m4 b/m4/libevent.m4
index 1e59d7ad313..b81b9d37efd 100644
--- a/m4/libevent.m4
+++ b/m4/libevent.m4
@@ -30,7 +30,7 @@ AC_DEFUN([LIBEVENT_CHECK_CONFIG],
 [
 	AC_ARG_WITH([libevent],[
 If you want to specify libevent installation directories:
-AC_HELP_STRING([--with-libevent@<:@=DIR@:>@], [use libevent from given base install directory (DIR), default is to search through a number of common places for the libevent files.])],
+AS_HELP_STRING([--with-libevent@<:@=DIR@:>@], [use libevent from given base install directory (DIR), default is to search through a number of common places for the libevent files.])],
 		[
 			if test "x$withval" = "xyes"; then
 				if test -f /usr/local/include/event.h; then withval=/usr/local; else withval=/usr; fi
@@ -43,7 +43,7 @@ AC_HELP_STRING([--with-libevent@<:@=DIR@:>@], [use libevent from given base inst
 	)
 
 	AC_ARG_WITH([libevent-include],
-		AC_HELP_STRING([--with-libevent-include@<:@=DIR@:>@],
+		AS_HELP_STRING([--with-libevent-include@<:@=DIR@:>@],
 			[use libevent include headers from given path.]
 		),
 		[
@@ -53,7 +53,7 @@ AC_HELP_STRING([--with-libevent@<:@=DIR@:>@], [use libevent from given base inst
 	)
 
 	AC_ARG_WITH([libevent-lib],
-		AC_HELP_STRING([--with-libevent-lib@<:@=DIR@:>@],
+		AS_HELP_STRING([--with-libevent-lib@<:@=DIR@:>@],
 			[use libevent libraries from given path.]
 		),
 		[
diff --git a/m4/libgnutls.m4 b/m4/libgnutls.m4
index ed7eb947f17..12442327fea 100644
--- a/m4/libgnutls.m4
+++ b/m4/libgnutls.m4
@@ -60,7 +60,7 @@ AC_DEFUN([LIBGNUTLS_CHECK_CONFIG],
 [
   AC_ARG_WITH(gnutls,[
 If you want to use encryption provided by GnuTLS library:
-AC_HELP_STRING([--with-gnutls@<:@=DIR@:>@],[use GnuTLS package @<:@default=no@:>@, DIR is the libgnutls install directory.])],
+AS_HELP_STRING([--with-gnutls@<:@=DIR@:>@],[use GnuTLS package @<:@default=no@:>@, DIR is the libgnutls install directory.])],
     [
 	if test "$withval" = "no"; then
 	    want_gnutls="no"
diff --git a/m4/libmodbus.m4 b/m4/libmodbus.m4
index 7700f71813b..295717e300c 100644
--- a/m4/libmodbus.m4
+++ b/m4/libmodbus.m4
@@ -71,7 +71,7 @@ AC_DEFUN([LIBMODBUS_CHECK_CONFIG],
 [
   AC_ARG_WITH(libmodbus,[
 If you want to use MODBUS based checks:
-AC_HELP_STRING([--with-libmodbus@<:@=DIR@:>@],[use MODBUS package @<:@default=no@:>@, DIR is the MODBUS library install directory.])],
+AS_HELP_STRING([--with-libmodbus@<:@=DIR@:>@],[use MODBUS package @<:@default=no@:>@, DIR is the MODBUS library install directory.])],
     [
       if test "$withval" = "no"; then
         want_libmodbus="no"
diff --git a/m4/libopenssl.m4 b/m4/libopenssl.m4
index d2ab7939d4c..8d9add9414f 100644
--- a/m4/libopenssl.m4
+++ b/m4/libopenssl.m4
@@ -86,7 +86,7 @@ AC_DEFUN([LIBOPENSSL_CHECK_CONFIG],
 [
   AC_ARG_WITH(openssl,[
 If you want to use encryption provided by OpenSSL library:
-AC_HELP_STRING([--with-openssl@<:@=DIR@:>@],[use OpenSSL package @<:@default=no@:>@, DIR is the libssl and libcrypto install directory.])],
+AS_HELP_STRING([--with-openssl@<:@=DIR@:>@],[use OpenSSL package @<:@default=no@:>@, DIR is the libssl and libcrypto install directory.])],
     [
 	if test "$withval" = "no"; then
 	    want_openssl="no"
diff --git a/m4/libssh.m4 b/m4/libssh.m4
index 58b4df654dd..c07015edefb 100644
--- a/m4/libssh.m4
+++ b/m4/libssh.m4
@@ -56,7 +56,7 @@ AC_DEFUN([LIBSSH_CHECK_CONFIG],
 [
   AC_ARG_WITH(ssh,[
 If you want to use SSH based checks:
-AC_HELP_STRING([--with-ssh@<:@=DIR@:>@],[use SSH package @<:@default=no@:>@, DIR is the SSH library install directory.])],
+AS_HELP_STRING([--with-ssh@<:@=DIR@:>@],[use SSH package @<:@default=no@:>@, DIR is the SSH library install directory.])],
     [
 	if test "$withval" = "no"; then
 	    want_ssh="no"
diff --git a/m4/libssh2.m4 b/m4/libssh2.m4
index ea16ec26572..7fda01b1802 100644
--- a/m4/libssh2.m4
+++ b/m4/libssh2.m4
@@ -49,7 +49,7 @@ AC_DEFUN([LIBSSH2_ACCEPT_VERSION],
 AC_DEFUN([LIBSSH2_CHECK_CONFIG],
 [
   AC_ARG_WITH(ssh2,[If you want to use SSH2 based checks:
-AC_HELP_STRING([--with-ssh2@<:@=DIR@:>@],[use SSH2 package @<:@default=no@:>@, DIR is the SSH2 library install directory.])],
+AS_HELP_STRING([--with-ssh2@<:@=DIR@:>@],[use SSH2 package @<:@default=no@:>@, DIR is the SSH2 library install directory.])],
     [
 	if test "$withval" = "no"; then
 	    want_ssh2="no"
diff --git a/m4/libunixodbc.m4 b/m4/libunixodbc.m4
index ec924aeb176..9bd9c93a8fd 100644
--- a/m4/libunixodbc.m4
+++ b/m4/libunixodbc.m4
@@ -21,7 +21,7 @@ AC_DEFUN([LIBUNIXODBC_CHECK_CONFIG],
   AC_ARG_WITH(unixodbc,
      [
 If you want to use unixODBC library:
-AC_HELP_STRING([--with-unixodbc@<:@=ARG@:>@],
+AS_HELP_STRING([--with-unixodbc@<:@=ARG@:>@],
 		[use ODBC driver against unixODBC package @<:@default=no@:>@, optionally specify full path to odbc_config binary.])
     ],[ if test "x$withval" = "xno"; then
             want_unixodbc="no"
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
index 6e3714a31a6..d32bd432ecc 100644
--- a/m4/libxml2.m4
+++ b/m4/libxml2.m4
@@ -24,7 +24,7 @@ AC_DEFUN([LIBXML2_CHECK_CONFIG],
     AC_ARG_WITH(libxml2,
         [
 If you want to use XML library:
-AC_HELP_STRING([--with-libxml2@<:@=ARG@:>@],
+AS_HELP_STRING([--with-libxml2@<:@=ARG@:>@],
     [use libxml2 client library @<:@default=no@:>@, see PKG_CONFIG_PATH environment variable to specify .pc file location]
         )],
         [
diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4
index 5e84d84303a..38b3f2c8bc6 100644
--- a/m4/netsnmp.m4
+++ b/m4/netsnmp.m4
@@ -22,7 +22,7 @@ AC_DEFUN([LIBNETSNMP_CHECK_CONFIG],
 
   AC_ARG_WITH(net-snmp,
 [If you want to use Net-SNMP library:
-AC_HELP_STRING([--with-net-snmp@<:@=ARG@:>@],
+AS_HELP_STRING([--with-net-snmp@<:@=ARG@:>@],
 		[use Net-SNMP package @<:@default=no@:>@, optionally specify path to net-snmp-config])
 	],[ if test "$withval" = "no"; then
             want_netsnmp="no"
diff --git a/m4/openipmi.m4 b/m4/openipmi.m4
index 7fe253a8eca..5ffab03d172 100644
--- a/m4/openipmi.m4
+++ b/m4/openipmi.m4
@@ -20,7 +20,7 @@ AC_DEFUN([LIBOPENIPMI_CHECK_CONFIG],
 [
   AC_ARG_WITH(openipmi,[
 If you want to check IPMI devices:
-AC_HELP_STRING([--with-openipmi@<:@=DIR@:>@],[Include OPENIPMI support @<:@default=no@:>@. DIR is the OPENIPMI base install directory, default is to search through a number of common places for the OPENIPMI files.])],
+AS_HELP_STRING([--with-openipmi@<:@=DIR@:>@],[Include OPENIPMI support @<:@default=no@:>@. DIR is the OPENIPMI base install directory, default is to search through a number of common places for the OPENIPMI files.])],
      [ if test "$withval" = "no"; then
             want_openipmi="no"
             _libopenipmi_with="no"
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index f387a227b73..1df2c43713a 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -40,7 +40,7 @@ AC_DEFUN([LIBPCRE_CHECK_CONFIG],
 
 	AC_ARG_WITH([libpcre],[
 If you want to specify libpcre installation directories:
-AC_HELP_STRING([--with-libpcre@<:@=DIR@:>@], [use libpcre from given base install directory (DIR), default is to search through a number of common places for the libpcre files.])],
+AS_HELP_STRING([--with-libpcre@<:@=DIR@:>@], [use libpcre from given base install directory (DIR), default is to search through a number of common places for the libpcre files.])],
 	[
 		if test "$withval" != "no"; then
 			want_libpcre=yes
@@ -50,7 +50,7 @@ AC_HELP_STRING([--with-libpcre@<:@=DIR@:>@], [use libpcre from given base instal
 		fi
 	])
 
-	AC_ARG_WITH([libpcre-include], AC_HELP_STRING([--with-libpcre-include@<:@=DIR@:>@], [use libpcre include headers from given path.]), [
+	AC_ARG_WITH([libpcre-include], AS_HELP_STRING([--with-libpcre-include@<:@=DIR@:>@], [use libpcre include headers from given path.]), [
 		want_libpcre="yes"
 		libpcre_include_dir="$withval"
 		if ! test -d "$libpcre_include_dir"; then
@@ -61,7 +61,7 @@ AC_HELP_STRING([--with-libpcre@<:@=DIR@:>@], [use libpcre from given base instal
 		fi
 	])
 
-	AC_ARG_WITH([libpcre-lib], AC_HELP_STRING([--with-libpcre-lib@<:@=DIR@:>@], [use libpcre libraries from given path.]), [
+	AC_ARG_WITH([libpcre-lib], AS_HELP_STRING([--with-libpcre-lib@<:@=DIR@:>@], [use libpcre libraries from given path.]), [
 		want_libpcre="yes"
 		libpcre_lib_dir="$withval"
 		if ! test -d "$libpcre_lib_dir"; then
diff --git a/m4/pcre2.m4 b/m4/pcre2.m4
index 3b85f475eb5..4f3aa51a0a1 100644
--- a/m4/pcre2.m4
+++ b/m4/pcre2.m4
@@ -41,7 +41,7 @@ AC_DEFUN([LIBPCRE2_CHECK_CONFIG],
 
 	AC_ARG_WITH([libpcre2],[
 If you want to specify libpcre2 installation directories:
-AC_HELP_STRING([--with-libpcre2@<:@=DIR@:>@], [use libpcre2 from given base install directory (DIR), default is to search through a number of common places for the libpcre2 files.])],
+AS_HELP_STRING([--with-libpcre2@<:@=DIR@:>@], [use libpcre2 from given base install directory (DIR), default is to search through a number of common places for the libpcre2 files.])],
 	[
 		if test "$withval" != "no"; then
 			want_libpcre2=yes
@@ -51,7 +51,7 @@ AC_HELP_STRING([--with-libpcre2@<:@=DIR@:>@], [use libpcre2 from given base inst
 		fi
 	])
 
-	AC_ARG_WITH([libpcre2-include], AC_HELP_STRING([--with-libpcre2-include@<:@=DIR@:>@], [use libpcre2 include headers from given path.]), [
+	AC_ARG_WITH([libpcre2-include], AS_HELP_STRING([--with-libpcre2-include@<:@=DIR@:>@], [use libpcre2 include headers from given path.]), [
 		want_libpcre2="yes"
 		libpcre2_include_dir="$withval"
 		if ! test -d "$libpcre2_include_dir"; then
@@ -62,7 +62,7 @@ AC_HELP_STRING([--with-libpcre2@<:@=DIR@:>@], [use libpcre2 from given base inst
 		fi
 	])
 
-	AC_ARG_WITH([libpcre2-lib], AC_HELP_STRING([--with-libpcre2-lib@<:@=DIR@:>@], [use libpcre2 libraries from given path.]), [
+	AC_ARG_WITH([libpcre2-lib], AS_HELP_STRING([--with-libpcre2-lib@<:@=DIR@:>@], [use libpcre2 libraries from given path.]), [
 		want_libpcre2="yes"
 		libpcre2_lib_dir="$withval"
 		if ! test -d "$libpcre2_lib_dir"; then
diff --git a/m4/pthread.m4 b/m4/pthread.m4
index 142e19deb1d..fce049c0c05 100644
--- a/m4/pthread.m4
+++ b/m4/pthread.m4
@@ -73,7 +73,7 @@ AC_DEFUN([LIBPTHREAD_CHECK_CONFIG],
 [
 	AC_ARG_WITH([libpthread],[
 If you want to specify pthread installation directories:
-AC_HELP_STRING([--with-libpthread@<:@=DIR@:>@], [use libpthread from given base install directory (DIR), default is to search through a number of common places for the libpthread files.])],
+AS_HELP_STRING([--with-libpthread@<:@=DIR@:>@], [use libpthread from given base install directory (DIR), default is to search through a number of common places for the libpthread files.])],
 		[
 			test "x$withval" = "xyes" && withval=/usr
 			LIBPTHREAD_CFLAGS="-I$withval/include"
@@ -83,7 +83,7 @@ AC_HELP_STRING([--with-libpthread@<:@=DIR@:>@], [use libpthread from given base
 	)
 
 	AC_ARG_WITH([libpthread-include],
-		AC_HELP_STRING([--with-libpthread-include@<:@=DIR@:>@],
+		AS_HELP_STRING([--with-libpthread-include@<:@=DIR@:>@],
 			[use libpthread include headers from given path.]
 		),
 		[
@@ -93,7 +93,7 @@ AC_HELP_STRING([--with-libpthread@<:@=DIR@:>@], [use libpthread from given base
 	)
 
 	AC_ARG_WITH([libpthread-lib],
-		AC_HELP_STRING([--with-libpthread-lib@<:@=DIR@:>@],
+		AS_HELP_STRING([--with-libpthread-lib@<:@=DIR@:>@],
 			[use libpthread libraries from given path.]
 		),
 		[
diff --git a/m4/zlib.m4 b/m4/zlib.m4
index 13ae89cdf83..e37ea82a435 100644
--- a/m4/zlib.m4
+++ b/m4/zlib.m4
@@ -29,7 +29,7 @@ AC_DEFUN([ZLIB_CHECK_CONFIG],
 [
 	AC_ARG_WITH([zlib],[
 If you want to specify zlib installation directories:
-AC_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib from given base install directory (DIR), default is to search through a number of common places for the zlib files.])],
+AS_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib from given base install directory (DIR), default is to search through a number of common places for the zlib files.])],
 		[
 			test "x$withval" = "xyes" && withval=/usr
 			ZLIB_CFLAGS="-I$withval/include"
@@ -39,7 +39,7 @@ AC_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib from given base install dire
 	)
 
 	AC_ARG_WITH([zlib-include],
-		AC_HELP_STRING([--with-zlib-include=DIR],
+		AS_HELP_STRING([--with-zlib-include=DIR],
 			[use zlib include headers from given path.]
 		),
 		[
@@ -49,7 +49,7 @@ AC_HELP_STRING([--with-zlib@<:@=DIR@:>@], [use zlib from given base install dire
 	)
 
 	AC_ARG_WITH([zlib-lib],
-		AC_HELP_STRING([--with-zlib-lib=DIR],
+		AS_HELP_STRING([--with-zlib-lib=DIR],
 			[use zlib libraries from given path.]
 		),
 		[