diff --git a/buddy/configure.ac b/buddy/configure.ac
index b0a59560a..681ba4885 100644
--- a/buddy/configure.ac
+++ b/buddy/configure.ac
@@ -20,7 +20,7 @@ AC_PROG_CXX
 
 # Option to activate C++20
 AC_ARG_ENABLE([c++20],
-              [AC_HELP_STRING([--enable-c++20],
+              [AS_HELP_STRING([--enable-c++20],
                               [Compile in C++20 mode.])],
               [enable_20=yes], [enable_20=no])
 
@@ -89,7 +89,7 @@ if test x"${enable_20}" = xyes; then
     ${stdpass-false} && break
   done
   if ! "${stdpass-false}"; then
-    AC_ERROR([unable to turn on C++20 mode with this compiler])
+    AC_MSG_ERROR([unable to turn on C++20 mode with this compiler])
   fi
 else
   for f in -std=c++17 '-std=c++17 -stdlib=libc++' -std=c++1z
@@ -99,7 +99,7 @@ else
     ${stdpass-false} && break
   done
   if ! "${stdpass-false}"; then
-    AC_ERROR([unable to turn on C++17 mode with this compiler])
+    AC_MSG_ERROR([unable to turn on C++17 mode with this compiler])
   fi
 fi
 
diff --git a/buddy/m4/bdebug.m4 b/buddy/m4/bdebug.m4
index 65da9b457..fc0d10f1b 100644
--- a/buddy/m4/bdebug.m4
+++ b/buddy/m4/bdebug.m4
@@ -1,6 +1,6 @@
 AC_DEFUN([buddy_DEBUG_FLAGS],
 [AC_ARG_ENABLE([swap-count],
-  [AC_HELP_STRING([--enable-swap-count],
+  [AS_HELP_STRING([--enable-swap-count],
      [Count number of fundamental variable swaps (for debugging)])])
 case $enable_swap_count in
   yes)
@@ -11,7 +11,7 @@ case $enable_swap_count in
 esac
 
 AC_ARG_ENABLE([cache-stats],
-  [AC_HELP_STRING([--enable-cache-stats],
+  [AS_HELP_STRING([--enable-cache-stats],
      [Gather statistical information about operator and unique node caching (for debugging)])])
 case $enable_cache_stats in
   yes)