diff --git a/cf/aix.m4 b/cf/aix.m4
index db4b982ea..0a00cc4bf 100644
--- a/cf/aix.m4
+++ b/cf/aix.m4
@@ -19,7 +19,7 @@ AM_CONDITIONAL(AIX4, test "$aix" = 4)
 
 
 AC_ARG_ENABLE(dynamic-afs,
-	AC_HELP_STRING([--disable-dynamic-afs],
+	AS_HELP_STRING([--disable-dynamic-afs],
 		[do not use loaded AFS library with AIX]))
 
 if test "$aix" != no; then
diff --git a/cf/db.m4 b/cf/db.m4
index b63373ada..d62a2e160 100644
--- a/cf/db.m4
+++ b/cf/db.m4
@@ -4,7 +4,7 @@ dnl tests for various db libraries
 dnl
 AC_DEFUN([rk_DB],[
 AC_ARG_ENABLE(berkeley-db,
-                       AC_HELP_STRING([--disable-berkeley-db],
+                       AS_HELP_STRING([--disable-berkeley-db],
                                       [if you don't want berkeley db]),[
 ])
 
diff --git a/cf/krb-bigendian.m4 b/cf/krb-bigendian.m4
index 914fb52c8..780274efb 100644
--- a/cf/krb-bigendian.m4
+++ b/cf/krb-bigendian.m4
@@ -9,10 +9,10 @@ dnl it when cross-compiling
 
 AC_DEFUN([KRB_C_BIGENDIAN], [
 AC_ARG_ENABLE(bigendian,
-	AC_HELP_STRING([--enable-bigendian],[the target is big endian]),
+	AS_HELP_STRING([--enable-bigendian],[the target is big endian]),
 krb_cv_c_bigendian=yes)
 AC_ARG_ENABLE(littleendian,
-	AC_HELP_STRING([--enable-littleendian],[the target is little endian]),
+	AS_HELP_STRING([--enable-littleendian],[the target is little endian]),
 krb_cv_c_bigendian=no)
 AC_CACHE_CHECK(whether byte order is known at compile time,
 krb_cv_c_bigendian_compile,
diff --git a/cf/krb-ipv6.m4 b/cf/krb-ipv6.m4
index 2acea3118..bc8901511 100644
--- a/cf/krb-ipv6.m4
+++ b/cf/krb-ipv6.m4
@@ -4,7 +4,7 @@ dnl test for IPv6
 dnl
 AC_DEFUN([AC_KRB_IPV6], [
 AC_ARG_WITH(ipv6,
-	AC_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
+	AS_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
 if test "$withval" = "no"; then
 	ac_cv_lib_ipv6=no
 fi])
diff --git a/cf/mips-abi.m4 b/cf/mips-abi.m4
index af2089799..441748983 100644
--- a/cf/mips-abi.m4
+++ b/cf/mips-abi.m4
@@ -6,7 +6,7 @@ dnl value.
 
 AC_DEFUN([AC_MIPS_ABI], [
 AC_ARG_WITH(mips_abi,
-	AC_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
+	AS_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
 
 case "$host_os" in
 irix*)
diff --git a/cf/osfc2.m4 b/cf/osfc2.m4
index 5f933388e..cb8768a0c 100644
--- a/cf/osfc2.m4
+++ b/cf/osfc2.m4
@@ -4,7 +4,7 @@ dnl enable OSF C2 stuff
 
 AC_DEFUN([AC_CHECK_OSFC2],[
 AC_ARG_ENABLE(osfc2,
-	AC_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
+	AS_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
 LIB_security=
 if test "$enable_osfc2" = yes; then
 	AC_DEFINE(HAVE_OSFC2, 1, [Define to enable basic OSF C2 support.])
diff --git a/cf/otp.m4 b/cf/otp.m4
index 581ff88d4..d354515dc 100644
--- a/cf/otp.m4
+++ b/cf/otp.m4
@@ -5,7 +5,7 @@ dnl
 AC_DEFUN([rk_OTP],[
 AC_REQUIRE([rk_DB])dnl
 AC_ARG_ENABLE(otp,
-	AC_HELP_STRING([--disable-otp],[if you don't want OTP support]))
+	AS_HELP_STRING([--disable-otp],[if you don't want OTP support]))
 if test "$enable_otp" = yes -a "$db_type" = unknown; then
 	AC_MSG_ERROR([OTP requires a NDBM/DB compatible library])
 fi
diff --git a/cf/pthreads.m4 b/cf/pthreads.m4
index dc8df41b1..897f594de 100644
--- a/cf/pthreads.m4
+++ b/cf/pthreads.m4
@@ -8,7 +8,7 @@ if test "$PTHREADS_LIBS" = "" ; then
 fi
 
 AC_ARG_ENABLE(pthread-support,
-	AC_HELP_STRING([--enable-pthread-support],
+	AS_HELP_STRING([--enable-pthread-support],
 			[if you want thread safe libraries]),
 	[],[enable_pthread_support=maybe])
 if test "$enable_pthread_support" = maybe; then
diff --git a/cf/roken.m4 b/cf/roken.m4
index 3f645bc02..7c02e3453 100644
--- a/cf/roken.m4
+++ b/cf/roken.m4
@@ -10,7 +10,7 @@ dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppfla
 AC_DEFUN([AC_ROKEN], [
 
 AC_ARG_WITH(roken,
-	AC_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
+	AS_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
 [if test "$withval" = "no"; then
   AC_MSG_ERROR(roken is required)
 fi])
diff --git a/cf/test-package.m4 b/cf/test-package.m4
index 363d4ec54..6855328f1 100644
--- a/cf/test-package.m4
+++ b/cf/test-package.m4
@@ -5,23 +5,23 @@ dnl			default locations, conditional, config-program)
 
 AC_DEFUN([rk_TEST_PACKAGE],[
 AC_ARG_WITH($1,
-	AC_HELP_STRING([--with-$1=dir],[use $1 in dir]))
+	AS_HELP_STRING([--with-$1=dir],[use $1 in dir]))
 AC_ARG_WITH($1-lib,
-	AC_HELP_STRING([--with-$1-lib=dir],[use $1 libraries in dir]),
+	AS_HELP_STRING([--with-$1-lib=dir],[use $1 libraries in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-lib])
 elif test "X$with_$1" = "X"; then
   with_$1=yes
 fi])
 AC_ARG_WITH($1-include,
-	AC_HELP_STRING([--with-$1-include=dir],[use $1 headers in dir]),
+	AS_HELP_STRING([--with-$1-include=dir],[use $1 headers in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-include])
 elif test "X$with_$1" = "X"; then
   with_$1=yes
 fi])
 AC_ARG_WITH($1-config,
-	AC_HELP_STRING([--with-$1-config=path],[config program for $1]))
+	AS_HELP_STRING([--with-$1-config=path],[config program for $1]))
 
 m4_ifval([$6],
 	m4_define([rk_pkgname], $6),
diff --git a/cf/with-all.m4 b/cf/with-all.m4
index 6f4b4cef4..adfde1f32 100644
--- a/cf/with-all.m4
+++ b/cf/with-all.m4
@@ -6,11 +6,11 @@ dnl AC_WITH_ALL(name)
 
 AC_DEFUN([AC_WITH_ALL], [
 AC_ARG_WITH($1,
-	AC_HELP_STRING([--with-$1=dir],
+	AS_HELP_STRING([--with-$1=dir],
 		[use $1 in dir]))
 
 AC_ARG_WITH($1-lib,
-	AC_HELP_STRING([--with-$1-lib=dir],
+	AS_HELP_STRING([--with-$1-lib=dir],
 		[use $1 libraries in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-lib])
@@ -19,7 +19,7 @@ elif test "X$with_$1" = "X"; then
 fi])
 
 AC_ARG_WITH($1-include,
-	AC_HELP_STRING([--with-$1-include=dir],
+	AS_HELP_STRING([--with-$1-include=dir],
 		[use $1 headers in dir]),
 [if test "$withval" = "yes" -o "$withval" = "no"; then
   AC_MSG_ERROR([No argument for --with-$1-include])
diff --git a/configure.in b/configure.in
index 37a453768..be673cbf1 100644
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,7 @@ rk_TEST_PACKAGE(openldap,
 [-lldap -llber],,,OPENLDAP)
 
 AC_ARG_ENABLE(hdb-openldap-module, 
-	AC_HELP_STRING([--enable-hdb-openldap-module],
+	AS_HELP_STRING([--enable-hdb-openldap-module],
 		[if you want support to build openldap hdb as shared object]))
 if test "$enable_hdb_openldap_module" = yes -a "$with_openldap" = yes; then
     AC_DEFINE(OPENLDAP_MODULE, 1, [Define if you want support for hdb ldap module])
@@ -171,7 +171,7 @@ AC_DEFINE(ENABLE_AES, 1, [Define if you want support AES])
 KRB_PTHREADS
 
 AC_ARG_ENABLE(dce, 
-	AC_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
+	AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
 if test "$enable_dce" = yes; then
     AC_DEFINE(DCE, 1, [Define if you want support for DCE/DFS PAG's.])
 fi
@@ -203,7 +203,7 @@ rk_OTP
 AC_CHECK_OSFC2
 
 AC_ARG_ENABLE(mmap,
-	AC_HELP_STRING([--disable-mmap],[disable use of mmap]))
+	AS_HELP_STRING([--disable-mmap],[disable use of mmap]))
 if test "$enable_mmap" = "no"; then
 	AC_DEFINE(NO_MMAP, 1, [Define if you don't want to use mmap.])
 fi
@@ -313,7 +313,7 @@ AC_CHECK_HEADERS(security/pam_modules.h, , , [AC_INCLUDES_DEFAULT
 ])
 
 AC_ARG_ENABLE(netinfo,
-	AC_HELP_STRING([--enable-netinfo],[enable netinfo for configuration lookup]))
+	AS_HELP_STRING([--enable-netinfo],[enable netinfo for configuration lookup]))
 
 if test "$ac_cv_header_netinfo_ni_h" = yes -a "$enable_netinfo" = yes; then
        AC_DEFINE(HAVE_NETINFO, 1,