Add AU_ALIAS calls to new files for all recently renamed macros.

author: Reuben Thomas <rrt@sc3d.org> 2009-08-13 12:51:11 +0100
committer: Reuben Thomas <rrt@sc3d.org> 2009-08-13 12:51:11 +0100
commit: d722dcd17c95e0eb178fdd34dc14ce79f2f14103 (patch)
tree: c8297c839796480fc2c04bbe4d2b9751ee3e6917 /m4
parent: 58f1084c58874f22d412a810030d0fdae4896443 (diff)
download: autoconf-archive-d722dcd17c95e0eb178fdd34dc14ce79f2f14103.tar.gz
215 files changed, 215 insertions, 0 deletions
diff --git a/m4/ax_absolute_header.m4 b/m4/ax_absolute_header.m4
index 8bfaf6d..3b157d8 100644
--- a/m4/ax_absolute_header.m4
+++ b/m4/ax_absolute_header.m4
@@ -34,6 +34,7 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Derek Price.
 dnl Modified by Rhys Ulerich to use AC_CHECK_HEADERS instead of _ONCE
 
+AU_ALIAS([GL_TRILINOS_ABSOLUTE_HEADER], [AX_ABSOLUTE_HEADER])
 AC_DEFUN([AX_ABSOLUTE_HEADER],
 [AC_LANG_PREPROC_REQUIRE()dnl
 AC_FOREACH([gl_HEADER_NAME], [$1],
diff --git a/m4/ax_afs.m4 b/m4/ax_afs.m4
index bd04c61..ccebefb 100644
--- a/m4/ax_afs.m4
+++ b/m4/ax_afs.m4
@@ -33,6 +33,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([SG_AFS], [AX_AFS])
 AC_DEFUN([AX_AFS],
 [AC_ARG_WITH(afsdir, AC_HELP_STRING([--with-afsdir=DIR],
                                       [Directory holding AFS includes/libs]),
diff --git a/m4/ax_arg_with_path_style.m4 b/m4/ax_arg_with_path_style.m4
index 8142c06..7441b6e 100644
--- a/m4/ax_arg_with_path_style.m4
+++ b/m4/ax_arg_with_path_style.m4
@@ -63,6 +63,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_ARG_WITH_PATH_STYLE], [AX_ARG_WITH_PATH_STYLE])
 AC_DEFUN([AX_ARG_WITH_PATH_STYLE],
 [
  AC_ARG_WITH(path-style,
diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
index c8d66d7..50cfdd7 100644
--- a/m4/ax_blas.m4
+++ b/m4/ax_blas.m4
@@ -63,6 +63,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_BLAS], [AX_BLAS])
 AC_DEFUN([AX_BLAS], [
 AC_PREREQ(2.50)
 AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])
diff --git a/m4/ax_blas_f77_func.m4 b/m4/ax_blas_f77_func.m4
index 79ee884..8fa592e 100644
--- a/m4/ax_blas_f77_func.m4
+++ b/m4/ax_blas_f77_func.m4
@@ -52,6 +52,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_BLAS_F77_FUNC], [AX_BLAS_F77_FUNC])
 AC_DEFUN([AX_BLAS_F77_FUNC], [
 AC_PREREQ(2.50)
 AC_REQUIRE([AX_BLAS])
diff --git a/m4/ax_c_bigendian_cross.m4 b/m4/ax_c_bigendian_cross.m4
index df65108..b352b32 100644
--- a/m4/ax_c_bigendian_cross.m4
+++ b/m4/ax_c_bigendian_cross.m4
@@ -48,6 +48,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_C_BIGENDIAN_CROSS], [AX_C_BIGENDIAN_CROSS])
 AC_DEFUN([AX_C_BIGENDIAN_CROSS],
 [AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
 [ac_cv_c_bigendian=unknown
diff --git a/m4/ax_c_ifdef.m4 b/m4/ax_c_ifdef.m4
index 1fa4fa1..4cd82d0 100644
--- a/m4/ax_c_ifdef.m4
+++ b/m4/ax_c_ifdef.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([_AC_C_IFDEF], [AX_C_IFDEF])
 AC_DEFUN([AX_C_IFDEF],
   [AC_COMPILE_IFELSE([#ifndef $1
                       # error "Macro $1 is undefined!"
diff --git a/m4/ax_c_long_long.m4 b/m4/ax_c_long_long.m4
index a93eaf6..36a151f 100644
--- a/m4/ax_c_long_long.m4
+++ b/m4/ax_c_long_long.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_C_LONG_LONG], [AX_C_LONG_LONG])
 AC_DEFUN([AX_C_LONG_LONG],
 [AC_CACHE_CHECK(for long long int, ac_cv_c_long_long,
 [if test "$GCC" = yes; then
diff --git a/m4/ax_c_printf_thsep.m4 b/m4/ax_c_printf_thsep.m4
index ad535df..799bbc6 100644
--- a/m4/ax_c_printf_thsep.m4
+++ b/m4/ax_c_printf_thsep.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_C_PRINTF_THSEP], [AX_C_PRINTF_THSEP])
 AC_DEFUN([AX_C_PRINTF_THSEP],
 [AC_TRY_COMPILE(,[printf("%'2d",101);],ac_cv_c_printf_thsep=yes,ac_cv_c_printf_thsep=no)
  if test $ac_cv_c_printf_thsep = yes; then
diff --git a/m4/ax_c_var_func.m4 b/m4/ax_c_var_func.m4
index 88003a3..5fd18f4 100644
--- a/m4/ax_c_var_func.m4
+++ b/m4/ax_c_var_func.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_C_VAR_FUNC], [AX_C_VAR_FUNC])
 AC_DEFUN([AX_C_VAR_FUNC],
 [AC_REQUIRE([AC_PROG_CC])
 AC_CACHE_CHECK(whether $CC recognizes __func__, ac_cv_c_var_func,
diff --git a/m4/ax_cf_ebcdic.m4 b/m4/ax_cf_ebcdic.m4
index a10a4e2..b03b3bc 100644
--- a/m4/ax_cf_ebcdic.m4
+++ b/m4/ax_cf_ebcdic.m4
@@ -45,6 +45,7 @@
 #   exception to the GPL to apply to your modified version as well.
 
 dnl Check whether character set is EBCDIC.
+AU_ALIAS([CF_EBCDIC], [AX_CF_EBCDIC])
 AC_DEFUN([AX_CF_EBCDIC],[
 AC_MSG_CHECKING(if character set is EBCDIC)
 AC_CACHE_VAL(cf_cv_ebcdic,[
diff --git a/m4/ax_check_allocated_ctime.m4 b/m4/ax_check_allocated_ctime.m4
index 7cd040d..5995d1c 100644
--- a/m4/ax_check_allocated_ctime.m4
+++ b/m4/ax_check_allocated_ctime.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_ALLOCATED_CTIME], [AX_CHECK_ALLOCATED_CTIME])
 AC_DEFUN([AX_CHECK_ALLOCATED_CTIME],[
   AC_MSG_CHECKING([whether ctime() allocates memory for its result])
   AC_CACHE_VAL([ax_cv_allocated_ctime],[
diff --git a/m4/ax_check_class.m4 b/m4/ax_check_class.m4
index 180415c..3cda150 100644
--- a/m4/ax_check_class.m4
+++ b/m4/ax_check_class.m4
@@ -51,6 +51,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_CLASS], [AX_CHECK_CLASS])
 AC_DEFUN([AX_CHECK_CLASS],[
 AC_REQUIRE([AX_PROG_JAVA])
 ac_var_name=`echo $1 | sed 's/\./_/g'`
diff --git a/m4/ax_check_classpath.m4 b/m4/ax_check_classpath.m4
index bf2c32f..bd9c98b 100644
--- a/m4/ax_check_classpath.m4
+++ b/m4/ax_check_classpath.m4
@@ -48,6 +48,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_CLASSPATH], [AX_CHECK_CLASSPATH])
 AC_DEFUN([AX_CHECK_CLASSPATH],[
 if test "x$CLASSPATH" = x; then
         echo "You have no CLASSPATH, I hope it is good"
diff --git a/m4/ax_check_docbook_dtd.m4 b/m4/ax_check_docbook_dtd.m4
index 4e48ad9..0e886eb 100644
--- a/m4/ax_check_docbook_dtd.m4
+++ b/m4/ax_check_docbook_dtd.m4
@@ -58,6 +58,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_DOCBOOK_DTD], [AX_CHECK_DOCBOOK_DTD])
 AC_DEFUN([AX_CHECK_DOCBOOK_DTD],
 [
     AC_REQUIRE([AX_PROG_XSLTPROC])
diff --git a/m4/ax_check_docbook_xslt.m4 b/m4/ax_check_docbook_xslt.m4
index 17dee42..9f24501 100644
--- a/m4/ax_check_docbook_xslt.m4
+++ b/m4/ax_check_docbook_xslt.m4
@@ -58,6 +58,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_DOCBOOK_XSLT], [AX_CHECK_DOCBOOK_XSLT])
 AC_DEFUN([AX_CHECK_DOCBOOK_XSLT],
 [
     AC_REQUIRE([AX_PROG_XSLTPROC])
diff --git a/m4/ax_check_docbook_xslt_min.m4 b/m4/ax_check_docbook_xslt_min.m4
index 6a6aa3c..d598d27 100644
--- a/m4/ax_check_docbook_xslt_min.m4
+++ b/m4/ax_check_docbook_xslt_min.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_DOCBOOK_XSLT_MIN], [AX_CHECK_DOCBOOK_XSLT_MIN])
 AC_DEFUN([AX_CHECK_DOCBOOK_XSLT_MIN],
 [
     AC_REQUIRE([AX_PROG_XSLTPROC])
diff --git a/m4/ax_check_dos_filesys.m4 b/m4/ax_check_dos_filesys.m4
index 1218f45..b743600 100644
--- a/m4/ax_check_dos_filesys.m4
+++ b/m4/ax_check_dos_filesys.m4
@@ -47,6 +47,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_CHECK_DOS_FILESYS], [AX_CHECK_DOS_FILESYS])
 AC_DEFUN([AX_CHECK_DOS_FILESYS_LIMITATIONS],
 [AC_MSG_CHECKING(for potential DOS filename limitations)
 AC_CACHE_VAL(ax_cv_dos_limitations,
diff --git a/m4/ax_check_func_in.m4 b/m4/ax_check_func_in.m4
index c33bc9f..c154cdd 100644
--- a/m4/ax_check_func_in.m4
+++ b/m4/ax_check_func_in.m4
@@ -41,6 +41,7 @@
 #   exception to the GPL to apply to your modified version as well.
 
 dnl AX_CHECK_FUNC_IN(HEADER, FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+AU_ALIAS([AC_CHECK_FUNC_IN], [AX_CHECK_FUNC_IN])
 AC_DEFUN([AX_CHECK_FUNC_IN],
 [AC_MSG_CHECKING([for $2 in $1])
 AC_CACHE_VAL(ac_cv_func_$2,
diff --git a/m4/ax_check_icu.m4 b/m4/ax_check_icu.m4
index 660af4b..dfca8c7 100644
--- a/m4/ax_check_icu.m4
+++ b/m4/ax_check_icu.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CHECK_ICU], [AX_CHECK_ICU])
 AC_DEFUN([AX_CHECK_ICU], [
   succeeded=no
 
diff --git a/m4/ax_check_java_home.m4 b/m4/ax_check_java_home.m4
index a106867..0f83db6 100644
--- a/m4/ax_check_java_home.m4
+++ b/m4/ax_check_java_home.m4
@@ -43,6 +43,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_JAVA_HOME], [AX_CHECK_JAVA_HOME])
 AC_DEFUN([AX_CHECK_JAVA_HOME],[
 AC_REQUIRE([AC_EXEEXT])dnl
 TRY_JAVA_HOME=`ls -dr /usr/java/* 2> /dev/null | head -n 1`
diff --git a/m4/ax_check_java_plugin.m4 b/m4/ax_check_java_plugin.m4
index 0a8c9e9..7c23e2e 100644
--- a/m4/ax_check_java_plugin.m4
+++ b/m4/ax_check_java_plugin.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([DPS_CHECK_PLUGIN], [AX_CHECK_JAVA_PLUGIN])
 AC_DEFUN([AX_CHECK_JAVA_PLUGIN],
 [AC_REQUIRE([AC_PROG_AWK])
 AC_REQUIRE([AC_PROG_FGREP])
diff --git a/m4/ax_check_junit.m4 b/m4/ax_check_junit.m4
index 334e786..81d123c 100644
--- a/m4/ax_check_junit.m4
+++ b/m4/ax_check_junit.m4
@@ -44,6 +44,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CHECK_JUNIT], [AX_CHECK_JUNIT])
 AC_DEFUN([AX_CHECK_JUNIT],[
 AC_CACHE_VAL(ac_cv_prog_JUNIT,[
 AC_CHECK_CLASS(junit.textui.TestRunner)
diff --git a/m4/ax_check_mysql_db.m4 b/m4/ax_check_mysql_db.m4
index ebe8898..dc843cb 100644
--- a/m4/ax_check_mysql_db.m4
+++ b/m4/ax_check_mysql_db.m4
@@ -51,6 +51,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_MYSQL_DB], [AX_CHECK_MYSQL_DB])
 AC_DEFUN([AX_CHECK_MYSQL_DB],[
 AC_REQUIRE([AX_PROG_MYSQLSHOW])dnl
 AC_MSG_CHECKING([for MySQL db $2])
diff --git a/m4/ax_check_mysqlr.m4 b/m4/ax_check_mysqlr.m4
index 50fac89..64cee20 100644
--- a/m4/ax_check_mysqlr.m4
+++ b/m4/ax_check_mysqlr.m4
@@ -26,6 +26,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CHECK_MYSQLR], [AX_CHECK_MYSQLR])
 AC_DEFUN([AX_CHECK_MYSQLR],[
 AC_PATH_PROG(mysqlconfig,mysql_config)
 if test [ -z "$mysqlconfig" ]
diff --git a/m4/ax_check_off64_t.m4 b/m4/ax_check_off64_t.m4
index cb94f01..49c6c8b 100644
--- a/m4/ax_check_off64_t.m4
+++ b/m4/ax_check_off64_t.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([RSSH_CHECK_OFF64_T], [AX_CHECK_OFF64_T])
 AC_DEFUN([AX_CHECK_OFF64_T], [
 AC_REQUIRE([AC_SYS_LARGEFILE])dnl
 AC_CHECK_HEADER(unistd.h)
diff --git a/m4/ax_check_openssl.m4 b/m4/ax_check_openssl.m4
index f4f107f..2278749 100644
--- a/m4/ax_check_openssl.m4
+++ b/m4/ax_check_openssl.m4
@@ -31,6 +31,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
 AC_DEFUN([AX_CHECK_OPENSSL], [
     found=false
     AC_ARG_WITH(openssl,
diff --git a/m4/ax_check_pathfind.m4 b/m4/ax_check_pathfind.m4
index 9381e9d..cdcf98b 100644
--- a/m4/ax_check_pathfind.m4
+++ b/m4/ax_check_pathfind.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_PATHFIND], [AX_CHECK_PATHFIND])
 AC_DEFUN([AX_CHECK_PATHFIND],[
   AC_MSG_CHECKING([whether pathfind(3) works])
   AC_CACHE_VAL([ax_cv_pathfind],[
diff --git a/m4/ax_check_pathname_style.m4 b/m4/ax_check_pathname_style.m4
index 30c442d..8ebf58e 100644
--- a/m4/ax_check_pathname_style.m4
+++ b/m4/ax_check_pathname_style.m4
@@ -48,6 +48,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_CHECK_PATHNAME_STYLE], [AX_CHECK_PATHNAME_STYLE])
 AC_DEFUN([AX_CHECK_PATHNAME_STYLE_DOS],
 [AC_MSG_CHECKING(for Windows and DOS and OS/2 style pathnames)
 AC_CACHE_VAL(ax_cv_pathname_style_dos,
diff --git a/m4/ax_check_pgsql_db.m4 b/m4/ax_check_pgsql_db.m4
index 07d7cee..0a4df25 100644
--- a/m4/ax_check_pgsql_db.m4
+++ b/m4/ax_check_pgsql_db.m4
@@ -73,6 +73,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([MS_CHECK_PGSQL_DB], [AX_CHECK_PGSQL_DB])
 AC_DEFUN([AX_CHECK_PGSQL_DB], [
 AC_REQUIRE([AX_PROG_PGCLIENT])
 AC_MSG_CHECKING([for PostgreSQL db $1 (user: $2, host: $3)])
diff --git a/m4/ax_check_posix_regcomp.m4 b/m4/ax_check_posix_regcomp.m4
index 5c959e7..ede2a2c 100644
--- a/m4/ax_check_posix_regcomp.m4
+++ b/m4/ax_check_posix_regcomp.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_POSIX_REGCOMP], [AX_CHECK_POSIX_REGCOMP])
 AC_DEFUN([AX_CHECK_POSIX_REGCOMP],[
   AC_MSG_CHECKING([whether POSIX compliant regcomp()/regexec()])
   AC_CACHE_VAL([ax_cv_posix_regcomp],[
diff --git a/m4/ax_check_posix_sysinfo.m4 b/m4/ax_check_posix_sysinfo.m4
index 17b3fde..776bb03 100644
--- a/m4/ax_check_posix_sysinfo.m4
+++ b/m4/ax_check_posix_sysinfo.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_POSIX_SYSINFO], [AX_CHECK_POSIX_SYSINFO])
 AC_DEFUN([AX_CHECK_POSIX_SYSINFO],[
   AC_MSG_CHECKING([whether sysinfo(2) is POSIX])
   AC_CACHE_VAL([ax_cv_posix_sysinfo],[
diff --git a/m4/ax_check_postgres_db.m4 b/m4/ax_check_postgres_db.m4
index 6232923..ef762ed 100644
--- a/m4/ax_check_postgres_db.m4
+++ b/m4/ax_check_postgres_db.m4
@@ -23,6 +23,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([CT_CHECK_POSTGRES_DB], [AX_CHECK_POSTGRES_DB])
 AC_DEFUN([AX_CHECK_POSTGRES_DB], [
 
 AC_ARG_WITH(pgsql,
diff --git a/m4/ax_check_rqrd_class.m4 b/m4/ax_check_rqrd_class.m4
index 6ad2ac2..346b363 100644
--- a/m4/ax_check_rqrd_class.m4
+++ b/m4/ax_check_rqrd_class.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_RQRD_CLASS], [AX_CHECK_RQRD_CLASS])
 AC_DEFUN([AX_CHECK_RQRD_CLASS],[
 CLASS=`echo $1|sed 's/\./_/g'`
 AC_CHECK_CLASS($1)
diff --git a/m4/ax_check_sign.m4 b/m4/ax_check_sign.m4
index 375ed40..f4dc07b 100644
--- a/m4/ax_check_sign.m4
+++ b/m4/ax_check_sign.m4
@@ -34,6 +34,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([VL_CHECK_SIGN], [AX_CHECK_SIGN])
 AC_DEFUN([AX_CHECK_SIGN], [
  typename=`echo $1 | sed "s/@<:@^a-zA-Z0-9_@:>@/_/g"`
  AC_CACHE_CHECK([whether $1 is signed], ax_cv_decl_${typename}_signed, [
diff --git a/m4/ax_check_strcspn.m4 b/m4/ax_check_strcspn.m4
index 8ca17ce..28bab10 100644
--- a/m4/ax_check_strcspn.m4
+++ b/m4/ax_check_strcspn.m4
@@ -31,6 +31,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_STRCSPN], [AX_CHECK_STRCSPN])
 AC_DEFUN([AX_CHECK_STRCSPN],[
   AC_MSG_CHECKING([whether strcspn matches prototype and works])
   AC_CACHE_VAL([ax_cv_strcspn],[
diff --git a/m4/ax_check_strftime.m4 b/m4/ax_check_strftime.m4
index 0c69973..61a9ca8 100644
--- a/m4/ax_check_strftime.m4
+++ b/m4/ax_check_strftime.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_STRFTIME], [AX_CHECK_STRFTIME])
 AC_DEFUN([AX_CHECK_STRFTIME],[
   AC_MSG_CHECKING([whether strftime() works])
   AC_CACHE_VAL([ax_cv_strftime],[
diff --git a/m4/ax_check_struct_for.m4 b/m4/ax_check_struct_for.m4
index eac4c81..9ae7a1b 100644
--- a/m4/ax_check_struct_for.m4
+++ b/m4/ax_check_struct_for.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CHECK_STRUCT_FOR], [AX_CHECK_STRUCT_FOR])
 AC_DEFUN([AX_CHECK_STRUCT_FOR],[
 ac_safe_struct=`echo "$2" | sed 'y%./+-%__p_%'`
 ac_safe_member=`echo "$3" | sed 'y%./+-%__p_%'`
diff --git a/m4/ax_check_sunpro_c.m4 b/m4/ax_check_sunpro_c.m4
index 21437f3..2e9f2f0 100644
--- a/m4/ax_check_sunpro_c.m4
+++ b/m4/ax_check_sunpro_c.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([RSSH_CHECK_SUNPRO_C], [AX_CHECK_SUNPRO_C])
 AC_DEFUN([AX_CHECK_SUNPRO_C],
 [AC_CACHE_CHECK([whether using Sun Worckshop C compiler],
                 [ax_cv_check_sunpro_c],
diff --git a/m4/ax_check_symbol.m4 b/m4/ax_check_symbol.m4
index e996bab..07d8e64 100644
--- a/m4/ax_check_symbol.m4
+++ b/m4/ax_check_symbol.m4
@@ -42,6 +42,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_SYMBOL], [AX_CHECK_SYMBOL])
 AC_DEFUN([AX_CHECK_SYMBOL],
 [AC_MSG_CHECKING([for $1 in $2])
 AC_CACHE_VAL(ac_cv_func_$1,
diff --git a/m4/ax_check_sys_siglist.m4 b/m4/ax_check_sys_siglist.m4
index 7881c23..02a9de1 100644
--- a/m4/ax_check_sys_siglist.m4
+++ b/m4/ax_check_sys_siglist.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_SYS_SIGLIST], [AX_CHECK_SYS_SIGLIST])
 AC_DEFUN([AX_CHECK_SYS_SIGLIST],[
   AC_MSG_CHECKING([whether there is a global text array sys_siglist])
   AC_CACHE_VAL([ax_cv_sys_siglist],[
diff --git a/m4/ax_check_typedef.m4 b/m4/ax_check_typedef.m4
index f455b1a..a87514a 100644
--- a/m4/ax_check_typedef.m4
+++ b/m4/ax_check_typedef.m4
@@ -47,6 +47,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_TYPEDEF], [AX_CHECK_TYPEDEF])
 AC_DEFUN([AX_CHECK_TYPEDEF_],
 [dnl
 ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
diff --git a/m4/ax_check_uname_syscall.m4 b/m4/ax_check_uname_syscall.m4
index 6d33b61..6b32381 100644
--- a/m4/ax_check_uname_syscall.m4
+++ b/m4/ax_check_uname_syscall.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AG_CHECK_UNAME_SYSCALL], [AX_CHECK_UNAME_SYSCALL])
 AC_DEFUN([AX_CHECK_UNAME_SYSCALL],[
   AC_MSG_CHECKING([whether uname(2) is POSIX])
   AC_CACHE_VAL([ax_cv_uname_syscall],[
diff --git a/m4/ax_check_user.m4 b/m4/ax_check_user.m4
index 0a2910a..d4eed07 100644
--- a/m4/ax_check_user.m4
+++ b/m4/ax_check_user.m4
@@ -55,6 +55,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CHECK_USER], [AX_CHECK_USER])
 AC_DEFUN([AX_CHECK_USER],[
 AC_MSG_CHECKING([for user $2])
 if grep ^$2: /etc/passwd > /dev/null; then
diff --git a/m4/ax_check_zlib.m4 b/m4/ax_check_zlib.m4
index 488e1b2..f794716 100644
--- a/m4/ax_check_zlib.m4
+++ b/m4/ax_check_zlib.m4
@@ -56,6 +56,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB])
 AC_DEFUN([AX_CHECK_ZLIB],
 #
 # Handle user hints
diff --git a/m4/ax_compile_check_sizeof.m4 b/m4/ax_compile_check_sizeof.m4
index bf33a3c..8961076 100644
--- a/m4/ax_compile_check_sizeof.m4
+++ b/m4/ax_compile_check_sizeof.m4
@@ -84,6 +84,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_COMPILE_CHECK_SIZEOF], [AX_COMPILE_CHECK_SIZEOF])
 AC_DEFUN([AX_COMPILE_CHECK_SIZEOF],
 [changequote(<<, >>)dnl
 dnl The name to #define.
diff --git a/m4/ax_compute_relative_paths.m4 b/m4/ax_compute_relative_paths.m4
index 7c4e191..0ef49c9 100644
--- a/m4/ax_compute_relative_paths.m4
+++ b/m4/ax_compute_relative_paths.m4
@@ -65,6 +65,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ADL_COMPUTE_RELATIVE_PATHS], [AX_COMPUTE_RELATIVE_PATHS])
 AC_DEFUN([AX_COMPUTE_RELATIVE_PATHS],
 [for _lcl_i in $1; do
   _lcl_from=\[$]`echo "[$]_lcl_i" | sed 's,:.*$,,'`
diff --git a/m4/ax_compute_standard_relative_paths.m4 b/m4/ax_compute_standard_relative_paths.m4
index eddb3f8..3dc194e 100644
--- a/m4/ax_compute_standard_relative_paths.m4
+++ b/m4/ax_compute_standard_relative_paths.m4
@@ -71,6 +71,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ADL_COMPUTE_STANDARD_RELATIVE_PATHS], [AX_COMPUTE_STANDARD_RELATIVE_PATHS])
 AC_DEFUN([AX_COMPUTE_STANDARD_RELATIVE_PATHS],
 ## These calls need to be on separate lines for aclocal to work!
 [AX_COMPUTE_RELATIVE_PATHS(dnl
diff --git a/m4/ax_cond_with_level.m4 b/m4/ax_cond_with_level.m4
index 0da2368..0cb89aa 100644
--- a/m4/ax_cond_with_level.m4
+++ b/m4/ax_cond_with_level.m4
@@ -63,6 +63,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_COND_WITH_LEVEL], [AX_COND_WITH_LEVEL])
 AC_DEFUN([AX_COND_WITH_LEVEL],
 [dnl the names to be defined...
 pushdef([WITH_VAR],    patsubst(with_$1, -, _))dnl
diff --git a/m4/ax_create_generic_config.m4 b/m4/ax_create_generic_config.m4
index 9768997..883c0cb 100644
--- a/m4/ax_create_generic_config.m4
+++ b/m4/ax_create_generic_config.m4
@@ -59,6 +59,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CREATE_GENERIC_CONFIG], [AX_CREATE_GENERIC_CONFIG])
 AC_DEFUN([AX_CREATE_GENERIC_CONFIG],[# create a generic PACKAGE-config file
 L=`echo ifelse($1, , $PACKAGE $LIBS, $1)`
 P=`echo $L | sed -e 's/ -.*//'`
diff --git a/m4/ax_create_target_h.m4 b/m4/ax_create_target_h.m4
index 38e8935..3d53496 100644
--- a/m4/ax_create_target_h.m4
+++ b/m4/ax_create_target_h.m4
@@ -108,6 +108,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CREATE_TARGET_H], [AX_CREATE_TARGET_H])
 AC_DEFUN([AX_CREATE_TARGET_H],
 [AC_REQUIRE([AC_CANONICAL_CPU_ARCH])
 AX_CREATE_TARGET_H_UPPER($1,$2)
diff --git a/m4/ax_cxx_bool.m4 b/m4/ax_cxx_bool.m4
index 2bf2123..1708f45 100644
--- a/m4/ax_cxx_bool.m4
+++ b/m4/ax_cxx_bool.m4
@@ -22,6 +22,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_BOOL], [AX_CXX_BOOL])
 AC_DEFUN([AX_CXX_BOOL],
 [AC_CACHE_CHECK(whether the compiler recognizes bool as a built-in type,
 ax_cv_cxx_bool,
diff --git a/m4/ax_cxx_compile_stdcxx_0x.m4 b/m4/ax_cxx_compile_stdcxx_0x.m4
index 43b84cf..379b7e7 100644
--- a/m4/ax_cxx_compile_stdcxx_0x.m4
+++ b/m4/ax_cxx_compile_stdcxx_0x.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_COMPILE_STDCXX_0X], [AX_CXX_COMPILE_STDCXX_0X])
 AC_DEFUN([AX_CXX_COMPILE_STDCXX_0X], [
   AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
   ax_cv_cxx_compile_cxx0x_native,
diff --git a/m4/ax_cxx_compiler_vendor.m4 b/m4/ax_cxx_compiler_vendor.m4
index 0cd3ca9..99a2b58 100644
--- a/m4/ax_cxx_compiler_vendor.m4
+++ b/m4/ax_cxx_compiler_vendor.m4
@@ -22,6 +22,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_COMPILER_VENDOR], [AX_CXX_COMPILER_VENDOR])
 AC_DEFUN([AX_CXX_COMPILER_VENDOR],
   [AC_REQUIRE([AC_PROG_CXX])
    AC_REQUIRE([AC_PROG_CXXCPP])
diff --git a/m4/ax_cxx_complex_math_in_namespace_std.m4 b/m4/ax_cxx_complex_math_in_namespace_std.m4
index 121abd3..d981231 100644
--- a/m4/ax_cxx_complex_math_in_namespace_std.m4
+++ b/m4/ax_cxx_complex_math_in_namespace_std.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_COMPLEX_MATH_IN_NAMESPACE_STD], [AX_CXX_COMPLEX_MATH_IN_NAMESPACE_STD])
 AC_DEFUN([AX_CXX_COMPLEX_MATH_IN_NAMESPACE_STD],
 [AC_CACHE_CHECK(whether complex math functions are in std::,
 ac_cx_cxx_complex_math_in_namespace_std,
diff --git a/m4/ax_cxx_const_cast.m4 b/m4/ax_cxx_const_cast.m4
index 8359b27..eebb041 100644
--- a/m4/ax_cxx_const_cast.m4
+++ b/m4/ax_cxx_const_cast.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_CONST_CAST], [AX_CXX_CONST_CAST])
 AC_DEFUN([AX_CXX_CONST_CAST],
 [AC_CACHE_CHECK(whether the compiler supports const_cast<>,
 ax_cv_cxx_const_cast,
diff --git a/m4/ax_cxx_cppflags_std_lang.m4 b/m4/ax_cxx_cppflags_std_lang.m4
index 485cf05..44672f8 100644
--- a/m4/ax_cxx_cppflags_std_lang.m4
+++ b/m4/ax_cxx_cppflags_std_lang.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_CPPFLAGS_STD_LANG], [AX_CXX_CPPFLAGS_STD_LANG])
 AC_DEFUN([AX_CXX_CPPFLAGS_STD_LANG],
   [AC_REQUIRE([AX_CXX_COMPILER_VENDOR])
    case "$ax_cv_cxx_compiler_vendor" in
diff --git a/m4/ax_cxx_cxxflags_std_lang.m4 b/m4/ax_cxx_cxxflags_std_lang.m4
index 2ba8008..3084ad3 100644
--- a/m4/ax_cxx_cxxflags_std_lang.m4
+++ b/m4/ax_cxx_cxxflags_std_lang.m4
@@ -23,6 +23,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_CXXFLAGS_STD_LANG], [AX_CXX_CXXFLAGS_STD_LANG])
 AC_DEFUN([AX_CXX_CXXFLAGS_STD_LANG],
   [AC_REQUIRE([AX_CXX_COMPILER_VENDOR])
    case "$ax_cv_cxx_compiler_vendor" in
diff --git a/m4/ax_cxx_default_template_parameters.m4 b/m4/ax_cxx_default_template_parameters.m4
index 03ff938..353c1db 100644
--- a/m4/ax_cxx_default_template_parameters.m4
+++ b/m4/ax_cxx_default_template_parameters.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_DEFAULT_TEMPLATE_PARAMETERS], [AX_CXX_DEFAULT_TEMPLATE_PARAMETERS])
 AC_DEFUN([AX_CXX_DEFAULT_TEMPLATE_PARAMETERS],
 [AC_CACHE_CHECK(whether the compiler supports default template parameters,
 ax_cv_cxx_default_template_parameters,
diff --git a/m4/ax_cxx_dtor_after_atexit.m4 b/m4/ax_cxx_dtor_after_atexit.m4
index 3bf719d..ab3a2fc 100644
--- a/m4/ax_cxx_dtor_after_atexit.m4
+++ b/m4/ax_cxx_dtor_after_atexit.m4
@@ -22,6 +22,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_DTOR_AFTER_ATEXIT], [AX_CXX_DTOR_AFTER_ATEXIT])
 AC_DEFUN([AX_CXX_DTOR_AFTER_ATEXIT],
 [AC_CACHE_CHECK(whether the compiler calls global destructors after functions registered through atexit,
 ax_cv_cxx_dtor_after_atexit,
diff --git a/m4/ax_cxx_dynamic_cast.m4 b/m4/ax_cxx_dynamic_cast.m4
index faf5af5..528a4b1 100644
--- a/m4/ax_cxx_dynamic_cast.m4
+++ b/m4/ax_cxx_dynamic_cast.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_DYNAMIC_CAST], [AX_CXX_DYNAMIC_CAST])
 AC_DEFUN([AX_CXX_DYNAMIC_CAST],
 [AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>,
 ax_cv_cxx_dynamic_cast,
diff --git a/m4/ax_cxx_enum_computations.m4 b/m4/ax_cxx_enum_computations.m4
index 935314e..3920ae0 100644
--- a/m4/ax_cxx_enum_computations.m4
+++ b/m4/ax_cxx_enum_computations.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_ENUM_COMPUTATIONS], [AX_CXX_ENUM_COMPUTATIONS])
 AC_DEFUN([AX_CXX_ENUM_COMPUTATIONS],
 [AC_CACHE_CHECK(whether the compiler handle computations inside an enum,
 ax_cv_cxx_enum_computations,
diff --git a/m4/ax_cxx_enum_computations_with_cast.m4 b/m4/ax_cxx_enum_computations_with_cast.m4
index c6e2053..4f65877 100644
--- a/m4/ax_cxx_enum_computations_with_cast.m4
+++ b/m4/ax_cxx_enum_computations_with_cast.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_ENUM_COMPUTATIONS_WITH_CAST], [AX_CXX_ENUM_COMPUTATIONS_WITH_CAST])
 AC_DEFUN([AX_CXX_ENUM_COMPUTATIONS_WITH_CAST],
 [AC_CACHE_CHECK(whether the compiler handles (int) casts in enum computations,
 ax_cv_cxx_enum_computations_with_cast,
diff --git a/m4/ax_cxx_exceptions.m4 b/m4/ax_cxx_exceptions.m4
index d3ff685..150ca83 100644
--- a/m4/ax_cxx_exceptions.m4
+++ b/m4/ax_cxx_exceptions.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_EXCEPTIONS], [AX_CXX_EXCEPTIONS])
 AC_DEFUN([AX_CXX_EXCEPTIONS],
 [AC_CACHE_CHECK(whether the compiler supports exceptions,
 ax_cv_cxx_exceptions,
diff --git a/m4/ax_cxx_explicit.m4 b/m4/ax_cxx_explicit.m4
index 8a42c00..940e3fe 100644
--- a/m4/ax_cxx_explicit.m4
+++ b/m4/ax_cxx_explicit.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_EXPLICIT], [AX_CXX_EXPLICIT])
 AC_DEFUN([AX_CXX_EXPLICIT],
 [AC_CACHE_CHECK(whether the compiler supports the explicit keyword,
 ax_cv_cxx_explicit,
diff --git a/m4/ax_cxx_explicit_instantiations.m4 b/m4/ax_cxx_explicit_instantiations.m4
index adaf252..9b92db8 100644
--- a/m4/ax_cxx_explicit_instantiations.m4
+++ b/m4/ax_cxx_explicit_instantiations.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_EXPLICIT_INSTANTIATIONS], [AX_CXX_EXPLICIT_INSTANTIATIONS])
 AC_DEFUN([AX_CXX_EXPLICIT_INSTANTIATIONS],
 [AC_CACHE_CHECK(whether the compiler supports explicit instantiations,
 ax_cv_cxx_explinst,
diff --git a/m4/ax_cxx_explicit_template_function_qualification.m4 b/m4/ax_cxx_explicit_template_function_qualification.m4
index 5807e80..ab063b4 100644
--- a/m4/ax_cxx_explicit_template_function_qualification.m4
+++ b/m4/ax_cxx_explicit_template_function_qualification.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION], [AX_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION])
 AC_DEFUN([AX_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION],
 [AC_CACHE_CHECK(whether the compiler supports explicit template function qualification,
 ax_cv_cxx_explicit_template_function_qualification,
diff --git a/m4/ax_cxx_extern_template.m4 b/m4/ax_cxx_extern_template.m4
index f9710c4..54aff01 100644
--- a/m4/ax_cxx_extern_template.m4
+++ b/m4/ax_cxx_extern_template.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_EXTERN_TEMPLATE], [AX_CXX_EXTERN_TEMPLATE])
 AC_DEFUN([AX_CXX_EXTERN_TEMPLATE],[
 AC_CACHE_CHECK(whether the compiler supports extern template,
 ax_cv_cxx_extern_template,
diff --git a/m4/ax_cxx_full_specialization_syntax.m4 b/m4/ax_cxx_full_specialization_syntax.m4
index dea53f0..dbca17e 100644
--- a/m4/ax_cxx_full_specialization_syntax.m4
+++ b/m4/ax_cxx_full_specialization_syntax.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_FULL_SPECIALIZATION_SYNTAX], [AX_CXX_FULL_SPECIALIZATION_SYNTAX])
 AC_DEFUN([AX_CXX_FULL_SPECIALIZATION_SYNTAX],
 [AC_CACHE_CHECK(whether the compiler recognizes the full specialization syntax,
 ax_cv_cxx_full_specialization_syntax,
diff --git a/m4/ax_cxx_function_nontype_parameters.m4 b/m4/ax_cxx_function_nontype_parameters.m4
index 4892ccc..a3609cd 100644
--- a/m4/ax_cxx_function_nontype_parameters.m4
+++ b/m4/ax_cxx_function_nontype_parameters.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_FUNCTION_NONTYPE_PARAMETERS], [AX_CXX_FUNCTION_NONTYPE_PARAMETERS])
 AC_DEFUN([AX_CXX_FUNCTION_NONTYPE_PARAMETERS],
 [AC_CACHE_CHECK(whether the compiler supports function templates with non-type parameters,
 ax_cv_cxx_function_nontype_parameters,
diff --git a/m4/ax_cxx_function_try_blocks.m4 b/m4/ax_cxx_function_try_blocks.m4
index 325493a..2b98097 100644
--- a/m4/ax_cxx_function_try_blocks.m4
+++ b/m4/ax_cxx_function_try_blocks.m4
@@ -41,6 +41,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([MDL_CXX_FUNCTION_TRY_BLOCKS], [AX_CXX_FUNCTION_TRY_BLOCKS])
 AC_DEFUN([AX_CXX_FUNCTION_TRY_BLOCKS],
 [
 AC_REQUIRE([AC_PROG_CXX])
diff --git a/m4/ax_cxx_gnucxx_hashmap.m4 b/m4/ax_cxx_gnucxx_hashmap.m4
index ffff2e9..c947aa8 100644
--- a/m4/ax_cxx_gnucxx_hashmap.m4
+++ b/m4/ax_cxx_gnucxx_hashmap.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_GNUCXX_HASHMAP], [AX_CXX_GNUCXX_HASHMAP])
 AC_DEFUN([AX_CXX_GNUCXX_HASHMAP],[
 AC_CACHE_CHECK(whether the compiler supports __gnu_cxx::hash_map,
 ax_cv_cxx_gnucxx_hashmap,
diff --git a/m4/ax_cxx_have_complex.m4 b/m4/ax_cxx_have_complex.m4
index e0d08b8..17fc5ec 100644
--- a/m4/ax_cxx_have_complex.m4
+++ b/m4/ax_cxx_have_complex.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_COMPLEX], [AX_CXX_HAVE_COMPLEX])
 AC_DEFUN([AX_CXX_HAVE_COMPLEX],
 [AC_CACHE_CHECK(whether the compiler has complex<T>,
 ax_cv_cxx_have_complex,
diff --git a/m4/ax_cxx_have_complex_math1.m4 b/m4/ax_cxx_have_complex_math1.m4
index b72c6a7..04c7fc6 100644
--- a/m4/ax_cxx_have_complex_math1.m4
+++ b/m4/ax_cxx_have_complex_math1.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_COMPLEX_MATH1], [AX_CXX_HAVE_COMPLEX_MATH1])
 AC_DEFUN([AX_CXX_HAVE_COMPLEX_MATH1],
 [AC_CACHE_CHECK(whether the compiler has complex math functions,
 ax_cv_cxx_have_complex_math1,
diff --git a/m4/ax_cxx_have_complex_math2.m4 b/m4/ax_cxx_have_complex_math2.m4
index fc00bec..90b7fd6 100644
--- a/m4/ax_cxx_have_complex_math2.m4
+++ b/m4/ax_cxx_have_complex_math2.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_COMPLEX_MATH2], [AX_CXX_HAVE_COMPLEX_MATH2])
 AC_DEFUN([AX_CXX_HAVE_COMPLEX_MATH2],
 [AC_CACHE_CHECK(whether the compiler has more complex math functions,
 ax_cv_cxx_have_complex_math2,
diff --git a/m4/ax_cxx_have_empty_iostream.m4 b/m4/ax_cxx_have_empty_iostream.m4
index 1ade1fe..ae05d28 100644
--- a/m4/ax_cxx_have_empty_iostream.m4
+++ b/m4/ax_cxx_have_empty_iostream.m4
@@ -41,6 +41,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CXX_HAVE_EMPTY_IOSTREAM], [AX_CXX_HAVE_EMPTY_IOSTREAM])
 AC_DEFUN([AX_CXX_HAVE_EMPTY_IOSTREAM],
 [AC_CACHE_CHECK(whether the compiler allow empty iostream,
 ax_cv_cxx_have_empty_iostream,
diff --git a/m4/ax_cxx_have_ext_hash_map.m4 b/m4/ax_cxx_have_ext_hash_map.m4
index 6542191..77bfc17 100644
--- a/m4/ax_cxx_have_ext_hash_map.m4
+++ b/m4/ax_cxx_have_ext_hash_map.m4
@@ -53,6 +53,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CXX_HAVE_EXT_HASH_MAP], [AX_CXX_HAVE_EXT_HASH_MAP])
 AC_DEFUN([AX_CXX_HAVE_EXT_HASH_MAP],
 [AC_CACHE_CHECK(whether the compiler has ext/hash_map,
 ax_cv_cxx_have_ext_hash_map,
diff --git a/m4/ax_cxx_have_ext_hash_set.m4 b/m4/ax_cxx_have_ext_hash_set.m4
index 3e56962..fb0b91f 100644
--- a/m4/ax_cxx_have_ext_hash_set.m4
+++ b/m4/ax_cxx_have_ext_hash_set.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CXX_HAVE_EXT_HASH_SET], [AX_CXX_HAVE_EXT_HASH_SET])
 AC_DEFUN([AX_CXX_HAVE_EXT_HASH_SET],
 [AC_CACHE_CHECK(whether the compiler has ext/hash_set,
 ax_cv_cxx_have_ext_hash_set,
diff --git a/m4/ax_cxx_have_ext_slist.m4 b/m4/ax_cxx_have_ext_slist.m4
index f5ed413..cc8d218 100644
--- a/m4/ax_cxx_have_ext_slist.m4
+++ b/m4/ax_cxx_have_ext_slist.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CXX_HAVE_EXT_SLIST], [AX_CXX_HAVE_EXT_SLIST])
 AC_DEFUN([AX_CXX_HAVE_EXT_SLIST],
 [AC_CACHE_CHECK(whether the compiler has ext/slist,
 ax_cv_cxx_have_ext_slist,
diff --git a/m4/ax_cxx_have_freeze_sstream.m4 b/m4/ax_cxx_have_freeze_sstream.m4
index b030703..880ef3d 100644
--- a/m4/ax_cxx_have_freeze_sstream.m4
+++ b/m4/ax_cxx_have_freeze_sstream.m4
@@ -57,6 +57,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CXX_HAVE_FREEZE_SSTREAM], [AX_CXX_HAVE_FREEZE_SSTREAM])
 AC_DEFUN([AX_CXX_HAVE_FREEZE_SSTREAM],
 [AC_CACHE_CHECK(whether the compiler has freeze in stringstream,
 ax_cv_cxx_have_freeze_sstream,
diff --git a/m4/ax_cxx_have_ieee_math.m4 b/m4/ax_cxx_have_ieee_math.m4
index a623c1f..d8b7d45 100644
--- a/m4/ax_cxx_have_ieee_math.m4
+++ b/m4/ax_cxx_have_ieee_math.m4
@@ -22,6 +22,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_IEEE_MATH], [AX_CXX_HAVE_IEEE_MATH])
 AC_DEFUN([AX_CXX_HAVE_IEEE_MATH],
 [AC_CACHE_CHECK(whether the compiler supports IEEE math library,
 ax_cv_cxx_have_ieee_math,
diff --git a/m4/ax_cxx_have_koenig_lookup.m4 b/m4/ax_cxx_have_koenig_lookup.m4
index 0960578..3127341 100644
--- a/m4/ax_cxx_have_koenig_lookup.m4
+++ b/m4/ax_cxx_have_koenig_lookup.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([MNI_CXX_HAVE_KOENIG_LOOKUP], [AX_CXX_HAVE_KOENIG_LOOKUP])
 AC_DEFUN([AX_CXX_HAVE_KOENIG_LOOKUP],
     [AC_CACHE_CHECK(whether the compiler implements Koenig lookup,
                     ax_cv_cxx_have_koenig_lookup,
diff --git a/m4/ax_cxx_have_long_long_for_iostream.m4 b/m4/ax_cxx_have_long_long_for_iostream.m4
index 2e27617..3b802eb 100644
--- a/m4/ax_cxx_have_long_long_for_iostream.m4
+++ b/m4/ax_cxx_have_long_long_for_iostream.m4
@@ -60,6 +60,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_CXX_HAVE_LONG_LONG_FOR_IOSTREAM], [AX_CXX_HAVE_LONG_LONG_FOR_IOSTREAM])
 AC_DEFUN([AX_CXX_HAVE_LONG_LONG_FOR_IOSTREAM],
 [AC_CACHE_CHECK(whether the compiler allow long long for [i|o]stream,
 ax_cv_cxx_have_ll_for_iostream,
diff --git a/m4/ax_cxx_have_numeric_limits.m4 b/m4/ax_cxx_have_numeric_limits.m4
index 58c40f1..d32357a 100644
--- a/m4/ax_cxx_have_numeric_limits.m4
+++ b/m4/ax_cxx_have_numeric_limits.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_NUMERIC_LIMITS], [AX_CXX_HAVE_NUMERIC_LIMITS])
 AC_DEFUN([AX_CXX_HAVE_NUMERIC_LIMITS],
 [AC_CACHE_CHECK(whether the compiler has numeric_limits<T>,
 ax_cv_cxx_have_numeric_limits,
diff --git a/m4/ax_cxx_have_sstream.m4 b/m4/ax_cxx_have_sstream.m4
index 5bbc68e..8cc9750 100644
--- a/m4/ax_cxx_have_sstream.m4
+++ b/m4/ax_cxx_have_sstream.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_SSTREAM], [AX_CXX_HAVE_SSTREAM])
 AC_DEFUN([AX_CXX_HAVE_SSTREAM],
 [AC_CACHE_CHECK(whether the compiler has stringstream,
 ax_cv_cxx_have_sstream,
diff --git a/m4/ax_cxx_have_std.m4 b/m4/ax_cxx_have_std.m4
index 6b30962..70d9f97 100644
--- a/m4/ax_cxx_have_std.m4
+++ b/m4/ax_cxx_have_std.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_STD], [AX_CXX_HAVE_STD])
 AC_DEFUN([AX_CXX_HAVE_STD],
 [AC_CACHE_CHECK(whether the compiler supports ISO C++ standard library,
 ax_cv_cxx_have_std,
diff --git a/m4/ax_cxx_have_stl.m4 b/m4/ax_cxx_have_stl.m4
index 488aacb..d4e5f6e 100644
--- a/m4/ax_cxx_have_stl.m4
+++ b/m4/ax_cxx_have_stl.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_STL], [AX_CXX_HAVE_STL])
 AC_DEFUN([AX_CXX_HAVE_STL],
 [AC_CACHE_CHECK(whether the compiler supports Standard Template Library,
 ax_cv_cxx_have_stl,
diff --git a/m4/ax_cxx_have_string_push_back.m4 b/m4/ax_cxx_have_string_push_back.m4
index e64ac1b..a6ace21 100644
--- a/m4/ax_cxx_have_string_push_back.m4
+++ b/m4/ax_cxx_have_string_push_back.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_STRING_PUSH_BACK], [AX_CXX_HAVE_STRING_PUSH_BACK])
 AC_DEFUN([AX_CXX_HAVE_STRING_PUSH_BACK],
 [AC_CACHE_CHECK(whether the compiler has std::string::push_back (char),
 ax_cv_cxx_have_string_push_back,
diff --git a/m4/ax_cxx_have_system_v_math.m4 b/m4/ax_cxx_have_system_v_math.m4
index 308b001..b315cf1 100644
--- a/m4/ax_cxx_have_system_v_math.m4
+++ b/m4/ax_cxx_have_system_v_math.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_SYSTEM_V_MATH], [AX_CXX_HAVE_SYSTEM_V_MATH])
 AC_DEFUN([AX_CXX_HAVE_SYSTEM_V_MATH],
 [AC_CACHE_CHECK(whether the compiler supports System V math library,
 ax_cv_cxx_have_system_v_math,
diff --git a/m4/ax_cxx_have_valarray.m4 b/m4/ax_cxx_have_valarray.m4
index 7153d7a..55077ce 100644
--- a/m4/ax_cxx_have_valarray.m4
+++ b/m4/ax_cxx_have_valarray.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_VALARRAY], [AX_CXX_HAVE_VALARRAY])
 AC_DEFUN([AX_CXX_HAVE_VALARRAY],
 [AC_CACHE_CHECK(whether the compiler has valarray<T>,
 ax_cv_cxx_have_valarray,
diff --git a/m4/ax_cxx_have_vector_at.m4 b/m4/ax_cxx_have_vector_at.m4
index 14f1900..6cc8870 100644
--- a/m4/ax_cxx_have_vector_at.m4
+++ b/m4/ax_cxx_have_vector_at.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HAVE_VECTOR_AT], [AX_CXX_HAVE_VECTOR_AT])
 AC_DEFUN([AX_CXX_HAVE_VECTOR_AT],
 [AC_CACHE_CHECK(whether the compiler has std::vector::at (std::size_t),
 ax_cv_cxx_have_vector_at,
diff --git a/m4/ax_cxx_header_pre_stdcxx.m4 b/m4/ax_cxx_header_pre_stdcxx.m4
index 8311286..1ce73a0 100644
--- a/m4/ax_cxx_header_pre_stdcxx.m4
+++ b/m4/ax_cxx_header_pre_stdcxx.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_PRE_STDCXX], [AX_CXX_HEADER_PRE_STDCXX])
 AC_DEFUN([AX_CXX_HEADER_PRE_STDCXX], [
   AC_CACHE_CHECK(for pre-ISO C++ include files,
   ax_cv_cxx_pre_stdcxx,
diff --git a/m4/ax_cxx_header_stdcxx_0x.m4 b/m4/ax_cxx_header_stdcxx_0x.m4
index 73f4657..51e52f8 100644
--- a/m4/ax_cxx_header_stdcxx_0x.m4
+++ b/m4/ax_cxx_header_stdcxx_0x.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_STDCXX_0X], [AX_CXX_HEADER_STDCXX_0X])
 AC_DEFUN([AX_CXX_HEADER_STDCXX_0X], [
   AC_CACHE_CHECK(for ISO C++ 0x include files,
   ax_cv_cxx_stdcxx_0x,
diff --git a/m4/ax_cxx_header_stdcxx_98.m4 b/m4/ax_cxx_header_stdcxx_98.m4
index 5e55c85..122fe1b 100644
--- a/m4/ax_cxx_header_stdcxx_98.m4
+++ b/m4/ax_cxx_header_stdcxx_98.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_STDCXX_98], [AX_CXX_HEADER_STDCXX_98])
 AC_DEFUN([AX_CXX_HEADER_STDCXX_98], [
   AC_CACHE_CHECK(for ISO C++ 98 include files,
   ax_cv_cxx_stdcxx_98,
diff --git a/m4/ax_cxx_header_stdcxx_tr1.m4 b/m4/ax_cxx_header_stdcxx_tr1.m4
index 9291f63..0064997 100644
--- a/m4/ax_cxx_header_stdcxx_tr1.m4
+++ b/m4/ax_cxx_header_stdcxx_tr1.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_STDCXX_TR1], [AX_CXX_HEADER_STDCXX_TR1])
 AC_DEFUN([AX_CXX_HEADER_STDCXX_TR1], [
   AC_CACHE_CHECK(for ISO C++ TR1 include files,
   ax_cv_cxx_stdcxx_tr1,
diff --git a/m4/ax_cxx_header_tr1_unordered_map.m4 b/m4/ax_cxx_header_tr1_unordered_map.m4
index 5c6e048..6449f2a 100644
--- a/m4/ax_cxx_header_tr1_unordered_map.m4
+++ b/m4/ax_cxx_header_tr1_unordered_map.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_TR1_UNORDERED_MAP], [AX_CXX_HEADER_TR1_UNORDERED_MAP])
 AC_DEFUN([AX_CXX_HEADER_TR1_UNORDERED_MAP], [
   AC_CACHE_CHECK(for tr1/unordered_map,
   ax_cv_cxx_tr1_unordered_map,
diff --git a/m4/ax_cxx_header_tr1_unordered_set.m4 b/m4/ax_cxx_header_tr1_unordered_set.m4
index 158c446..b3b1f78 100644
--- a/m4/ax_cxx_header_tr1_unordered_set.m4
+++ b/m4/ax_cxx_header_tr1_unordered_set.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_TR1_UNORDERED_SET], [AX_CXX_HEADER_TR1_UNORDERED_SET])
 AC_DEFUN([AX_CXX_HEADER_TR1_UNORDERED_SET], [
   AC_CACHE_CHECK(for tr1/unordered_set,
   ax_cv_cxx_tr1_unordered_set,
diff --git a/m4/ax_cxx_header_unordered_map.m4 b/m4/ax_cxx_header_unordered_map.m4
index 27d7625..c28c62d 100644
--- a/m4/ax_cxx_header_unordered_map.m4
+++ b/m4/ax_cxx_header_unordered_map.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_UNORDERED_MAP], [AX_CXX_HEADER_UNORDERED_MAP])
 AC_DEFUN([AX_CXX_HEADER_UNORDERED_MAP], [
   AC_CACHE_CHECK(for unordered_map,
   ax_cv_cxx_unordered_map,
diff --git a/m4/ax_cxx_header_unordered_set.m4 b/m4/ax_cxx_header_unordered_set.m4
index 9a46af6..26c1dea 100644
--- a/m4/ax_cxx_header_unordered_set.m4
+++ b/m4/ax_cxx_header_unordered_set.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_HEADER_UNORDERED_SET], [AX_CXX_HEADER_UNORDERED_SET])
 AC_DEFUN([AX_CXX_HEADER_UNORDERED_SET], [
   AC_CACHE_CHECK(for unordered_set,
   ax_cv_cxx_unordered_set,
diff --git a/m4/ax_cxx_ldflags_std_lang.m4 b/m4/ax_cxx_ldflags_std_lang.m4
index 657ab3e..6791b3e 100644
--- a/m4/ax_cxx_ldflags_std_lang.m4
+++ b/m4/ax_cxx_ldflags_std_lang.m4
@@ -23,6 +23,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_LDFLAGS_STD_LANG], [AX_CXX_LDFLAGS_STD_LANG])
 AC_DEFUN([AX_CXX_LDFLAGS_STD_LANG],
   [AC_REQUIRE([AX_CXX_COMPILER_VENDOR])
    case "$ax_cv_cxx_compiler_vendor" in
diff --git a/m4/ax_cxx_member_constants.m4 b/m4/ax_cxx_member_constants.m4
index f0f0dd1..1d9d4a1 100644
--- a/m4/ax_cxx_member_constants.m4
+++ b/m4/ax_cxx_member_constants.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_MEMBER_CONSTANTS], [AX_CXX_MEMBER_CONSTANTS])
 AC_DEFUN([AX_CXX_MEMBER_CONSTANTS],
 [AC_CACHE_CHECK(whether the compiler supports member constants,
 ax_cv_cxx_member_constants,
diff --git a/m4/ax_cxx_member_templates.m4 b/m4/ax_cxx_member_templates.m4
index 63a2f2f..d7bcaeb 100644
--- a/m4/ax_cxx_member_templates.m4
+++ b/m4/ax_cxx_member_templates.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_MEMBER_TEMPLATES], [AX_CXX_MEMBER_TEMPLATES])
 AC_DEFUN([AX_CXX_MEMBER_TEMPLATES],
 [AC_CACHE_CHECK(whether the compiler supports member templates,
 ax_cv_cxx_member_templates,
diff --git a/m4/ax_cxx_member_templates_outside_class.m4 b/m4/ax_cxx_member_templates_outside_class.m4
index be045cc..3cd091c 100644
--- a/m4/ax_cxx_member_templates_outside_class.m4
+++ b/m4/ax_cxx_member_templates_outside_class.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS], [AX_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS])
 AC_DEFUN([AX_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS],
 [AC_CACHE_CHECK(whether the compiler supports member templates outside the class declaration,
 ax_cv_cxx_member_templates_outside_class,
diff --git a/m4/ax_cxx_mutable.m4 b/m4/ax_cxx_mutable.m4
index 2fa4fc2..1d92b8c 100644
--- a/m4/ax_cxx_mutable.m4
+++ b/m4/ax_cxx_mutable.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_MUTABLE], [AX_CXX_MUTABLE])
 AC_DEFUN([AX_CXX_MUTABLE],
 [AC_CACHE_CHECK(whether the compiler supports the mutable keyword,
 ax_cv_cxx_mutable,
diff --git a/m4/ax_cxx_namespace_std.m4 b/m4/ax_cxx_namespace_std.m4
index f35fbca..e70d5a1 100644
--- a/m4/ax_cxx_namespace_std.m4
+++ b/m4/ax_cxx_namespace_std.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_NAMESPACE_STD], [AX_CXX_NAMESPACE_STD])
 AC_DEFUN([AX_CXX_NAMESPACE_STD], [
   AC_CACHE_CHECK(if g++ supports namespace std,
   ax_cv_cxx_have_std_namespace,
diff --git a/m4/ax_cxx_namespaces.m4 b/m4/ax_cxx_namespaces.m4
index 2b7e482..8276aab 100644
--- a/m4/ax_cxx_namespaces.m4
+++ b/m4/ax_cxx_namespaces.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_NAMESPACES], [AX_CXX_NAMESPACES])
 AC_DEFUN([AX_CXX_NAMESPACES],
 [AC_CACHE_CHECK(whether the compiler implements namespaces,
 ax_cv_cxx_namespaces,
diff --git a/m4/ax_cxx_new_for_scoping.m4 b/m4/ax_cxx_new_for_scoping.m4
index d370720..f1d659f 100644
--- a/m4/ax_cxx_new_for_scoping.m4
+++ b/m4/ax_cxx_new_for_scoping.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_NEW_FOR_SCOPING], [AX_CXX_NEW_FOR_SCOPING])
 AC_DEFUN([AX_CXX_NEW_FOR_SCOPING],
 [AC_CACHE_CHECK(whether the compiler accepts the new for scoping rules,
 ax_cv_cxx_new_for_scoping,
diff --git a/m4/ax_cxx_old_for_scoping.m4 b/m4/ax_cxx_old_for_scoping.m4
index 0386ec7..91d0e1c 100644
--- a/m4/ax_cxx_old_for_scoping.m4
+++ b/m4/ax_cxx_old_for_scoping.m4
@@ -23,6 +23,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_OLD_FOR_SCOPING], [AX_CXX_OLD_FOR_SCOPING])
 AC_DEFUN([AX_CXX_OLD_FOR_SCOPING],
 [AC_CACHE_CHECK(whether the compiler accepts the old for scoping rules,
 ax_cv_cxx_old_for_scoping,
diff --git a/m4/ax_cxx_partial_ordering.m4 b/m4/ax_cxx_partial_ordering.m4
index dbe66c4..a704a82 100644
--- a/m4/ax_cxx_partial_ordering.m4
+++ b/m4/ax_cxx_partial_ordering.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_PARTIAL_ORDERING], [AX_CXX_PARTIAL_ORDERING])
 AC_DEFUN([AX_CXX_PARTIAL_ORDERING],
 [AC_CACHE_CHECK(whether the compiler supports partial ordering,
 ax_cv_cxx_partial_ordering,
diff --git a/m4/ax_cxx_partial_specialization.m4 b/m4/ax_cxx_partial_specialization.m4
index d335250..9210dcd 100644
--- a/m4/ax_cxx_partial_specialization.m4
+++ b/m4/ax_cxx_partial_specialization.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_PARTIAL_SPECIALIZATION], [AX_CXX_PARTIAL_SPECIALIZATION])
 AC_DEFUN([AX_CXX_PARTIAL_SPECIALIZATION],
 [AC_CACHE_CHECK(whether the compiler supports partial specialization,
 ax_cv_cxx_partial_specialization,
diff --git a/m4/ax_cxx_reinterpret_cast.m4 b/m4/ax_cxx_reinterpret_cast.m4
index 534775e..11a780c 100644
--- a/m4/ax_cxx_reinterpret_cast.m4
+++ b/m4/ax_cxx_reinterpret_cast.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_REINTERPRET_CAST], [AX_CXX_REINTERPRET_CAST])
 AC_DEFUN([AX_CXX_REINTERPRET_CAST],
 [AC_CACHE_CHECK(whether the compiler supports reinterpret_cast<>,
 ax_cv_cxx_reinterpret_cast,
diff --git a/m4/ax_cxx_rtti.m4 b/m4/ax_cxx_rtti.m4
index 99f8518..91aa9e0 100644
--- a/m4/ax_cxx_rtti.m4
+++ b/m4/ax_cxx_rtti.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_RTTI], [AX_CXX_RTTI])
 AC_DEFUN([AX_CXX_RTTI],
 [AC_CACHE_CHECK(whether the compiler supports Run-Time Type Identification,
 ax_cv_cxx_rtti,
diff --git a/m4/ax_cxx_static_cast.m4 b/m4/ax_cxx_static_cast.m4
index f911444..7e2af6c 100644
--- a/m4/ax_cxx_static_cast.m4
+++ b/m4/ax_cxx_static_cast.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_STATIC_CAST], [AX_CXX_STATIC_CAST])
 AC_DEFUN([AX_CXX_STATIC_CAST],
 [AC_CACHE_CHECK(whether the compiler supports static_cast<>,
 ax_cv_cxx_static_cast,
diff --git a/m4/ax_cxx_stlport_hashmap.m4 b/m4/ax_cxx_stlport_hashmap.m4
index f6a8079..e9ec48e 100644
--- a/m4/ax_cxx_stlport_hashmap.m4
+++ b/m4/ax_cxx_stlport_hashmap.m4
@@ -18,6 +18,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_STLPORT_HASHMAP], [AX_CXX_STLPORT_HASHMAP])
 AC_DEFUN([AX_CXX_STLPORT_HASHMAP],[
 AC_CACHE_CHECK(whether the compiler supports std::hash_map,
 ax_cv_cxx_stlport_hashmap,
diff --git a/m4/ax_cxx_template_keyword_qualifier.m4 b/m4/ax_cxx_template_keyword_qualifier.m4
index e4afc18..6d0cb85 100644
--- a/m4/ax_cxx_template_keyword_qualifier.m4
+++ b/m4/ax_cxx_template_keyword_qualifier.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TEMPLATE_KEYWORD_QUALIFIER], [AX_CXX_TEMPLATE_KEYWORD_QUALIFIER])
 AC_DEFUN([AX_CXX_TEMPLATE_KEYWORD_QUALIFIER],
 [AC_CACHE_CHECK(whether the compiler supports use of the template keyword as a qualifier,
 ax_cv_cxx_template_keyword_qualifier,
diff --git a/m4/ax_cxx_template_qualified_base_class.m4 b/m4/ax_cxx_template_qualified_base_class.m4
index 62e609e..1b90020 100644
--- a/m4/ax_cxx_template_qualified_base_class.m4
+++ b/m4/ax_cxx_template_qualified_base_class.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TEMPLATE_QUALIFIED_BASE_CLASS], [AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS])
 AC_DEFUN([AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS],
 [AC_CACHE_CHECK(whether the compiler supports template-qualified base class specifiers,
 ax_cv_cxx_template_qualified_base_class,
diff --git a/m4/ax_cxx_template_qualified_return_type.m4 b/m4/ax_cxx_template_qualified_return_type.m4
index e1faeed..840f9a8 100644
--- a/m4/ax_cxx_template_qualified_return_type.m4
+++ b/m4/ax_cxx_template_qualified_return_type.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE], [AX_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE])
 AC_DEFUN([AX_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE],
 [AC_CACHE_CHECK(whether the compiler supports template-qualified return types,
 ax_cv_cxx_template_qualified_return_type,
diff --git a/m4/ax_cxx_template_scoped_argument_matching.m4 b/m4/ax_cxx_template_scoped_argument_matching.m4
index 6ec87bf..52fed58 100644
--- a/m4/ax_cxx_template_scoped_argument_matching.m4
+++ b/m4/ax_cxx_template_scoped_argument_matching.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING], [AX_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING])
 AC_DEFUN([AX_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING],
 [AC_CACHE_CHECK(whether the compiler supports function matching with argument types which are template scope-qualified,
 ax_cv_cxx_template_scoped_argument_matching,
diff --git a/m4/ax_cxx_templates.m4 b/m4/ax_cxx_templates.m4
index 5669f72..375cdd2 100644
--- a/m4/ax_cxx_templates.m4
+++ b/m4/ax_cxx_templates.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TEMPLATES], [AX_CXX_TEMPLATES])
 AC_DEFUN([AX_CXX_TEMPLATES],
 [AC_CACHE_CHECK(whether the compiler supports basic templates,
 ax_cv_cxx_templates,
diff --git a/m4/ax_cxx_templates_as_template_arguments.m4 b/m4/ax_cxx_templates_as_template_arguments.m4
index 5531981..2f83ee5 100644
--- a/m4/ax_cxx_templates_as_template_arguments.m4
+++ b/m4/ax_cxx_templates_as_template_arguments.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS], [AX_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS])
 AC_DEFUN([AX_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS],
 [AC_CACHE_CHECK(whether the compiler supports templates as template arguments,
 ax_cv_cxx_templates_as_template_arguments,
diff --git a/m4/ax_cxx_typename.m4 b/m4/ax_cxx_typename.m4
index ee2ba19..4440cbe 100644
--- a/m4/ax_cxx_typename.m4
+++ b/m4/ax_cxx_typename.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_TYPENAME], [AX_CXX_TYPENAME])
 AC_DEFUN([AX_CXX_TYPENAME],
 [AC_CACHE_CHECK(whether the compiler recognizes typename,
 ax_cv_cxx_typename,
diff --git a/m4/ax_cxx_use_numtrait.m4 b/m4/ax_cxx_use_numtrait.m4
index e06a94d..ad153ab 100644
--- a/m4/ax_cxx_use_numtrait.m4
+++ b/m4/ax_cxx_use_numtrait.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_USE_NUMTRAIT], [AX_CXX_USE_NUMTRAIT])
 AC_DEFUN([AX_CXX_USE_NUMTRAIT],
 [AC_CACHE_CHECK(whether the compiler supports numeric traits promotions,
 ax_cv_cxx_use_numtrait,
diff --git a/m4/ax_cxx_verbose_terminate_handler.m4 b/m4/ax_cxx_verbose_terminate_handler.m4
index d44fef0..9cdf350 100644
--- a/m4/ax_cxx_verbose_terminate_handler.m4
+++ b/m4/ax_cxx_verbose_terminate_handler.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CXX_VERBOSE_TERMINATE_HANDLER], [AX_CXX_VERBOSE_TERMINATE_HANDLER])
 AC_DEFUN([AX_CXX_VERBOSE_TERMINATE_HANDLER],
 [AC_CACHE_CHECK(whether the compiler has __gnu_cxx::__verbose_terminate_handler,
 ax_cv_verbose_terminate_handler,
diff --git a/m4/ax_decl_wchar_max.m4 b/m4/ax_decl_wchar_max.m4
index 7fb6f76..4af5215 100644
--- a/m4/ax_decl_wchar_max.m4
+++ b/m4/ax_decl_wchar_max.m4
@@ -21,6 +21,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([VL_DECL_WCHAR_MAX], [AX_DECL_WCHAR_MAX])
 AC_DEFUN([AX_DECL_WCHAR_MAX], [
   AC_CACHE_CHECK([whether WCHAR_MAX is defined], ax_cv_decl_wchar_max, [
     AC_TRY_COMPILE([
diff --git a/m4/ax_define_dir.m4 b/m4/ax_define_dir.m4
index cce73e8..b7501e8 100644
--- a/m4/ax_define_dir.m4
+++ b/m4/ax_define_dir.m4
@@ -29,6 +29,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
 AC_DEFUN([AX_DEFINE_DIR], [
   prefix_NONE=
   exec_prefix_NONE=
diff --git a/m4/ax_define_integer_bits.m4 b/m4/ax_define_integer_bits.m4
index 2b030fa..02e9c42 100644
--- a/m4/ax_define_integer_bits.m4
+++ b/m4/ax_define_integer_bits.m4
@@ -43,6 +43,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_DEFINE_INTEGER_BITS], [AX_DEFINE_INTEGER_BITS])
 AC_DEFUN([AX_DEFINE_INTEGER_BITS],
 [m4_define([ac_datatype_bits], [m4_translit($1, [a-zA-Z_])])
 m4_define([ac_datatype_bytes], [m4_eval(ac_datatype_bits/8)])
diff --git a/m4/ax_define_sub_path.m4 b/m4/ax_define_sub_path.m4
index 92576c3..9291cb9 100644
--- a/m4/ax_define_sub_path.m4
+++ b/m4/ax_define_sub_path.m4
@@ -79,6 +79,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_DEFINE_SUB_PATH], [AX_DEFINE_SUB_PATH])
 AC_DEFUN([AX_DEFINE_SUB_PATH],
 [dnl
   test "_$prefix" = _NONE && prefix="$ac_default_prefix"
diff --git a/m4/ax_f77_cmain_fflags.m4 b/m4/ax_f77_cmain_fflags.m4
index 46ad8db..f319295 100644
--- a/m4/ax_f77_cmain_fflags.m4
+++ b/m4/ax_f77_cmain_fflags.m4
@@ -53,6 +53,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_F77_CMAIN_FFLAGS], [AX_F77_CMAIN_FFLAGS])
 AC_DEFUN([AX_F77_CMAIN_FFLAGS],
 [AC_CACHE_CHECK([for f77 flags to use C main function], ax_cv_f77_cmain_fflags,
 [ax_cv_f77_cmain_fflags="unknown"
diff --git a/m4/ax_func_accept_argtypes.m4 b/m4/ax_func_accept_argtypes.m4
index fef7ef6..2bdb633 100644
--- a/m4/ax_func_accept_argtypes.m4
+++ b/m4/ax_func_accept_argtypes.m4
@@ -52,6 +52,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_FUNC_ACCEPT_ARGTYPES], [AX_FUNC_ACCEPT_ARGTYPES])
 AC_DEFUN([AX_FUNC_ACCEPT_ARGTYPES],
 [AC_MSG_CHECKING([types of arguments for accept()])
  AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl
diff --git a/m4/ax_func_fork.m4 b/m4/ax_func_fork.m4
index 668555a..80272e7 100644
--- a/m4/ax_func_fork.m4
+++ b/m4/ax_func_fork.m4
@@ -44,6 +44,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_FUNC_FORK], [AX_FUNC_FORK])
 AC_DEFUN([AX_FUNC_FORK],
 [AC_MSG_CHECKING(for a working fork)
 AC_CACHE_VAL(ax_cv_func_fork_works,
diff --git a/m4/ax_func_getopt_long.m4 b/m4/ax_func_getopt_long.m4
index 79c11b8..c4803b7 100644
--- a/m4/ax_func_getopt_long.m4
+++ b/m4/ax_func_getopt_long.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ADL_FUNC_GETOPT_LONG], [AX_FUNC_GETOPT_LONG])
 AC_DEFUN([AX_FUNC_GETOPT_LONG],
  [AC_PREREQ(2.49)dnl
   # clean out junk possibly left behind by a previous configuration
diff --git a/m4/ax_func_memmove.m4 b/m4/ax_func_memmove.m4
index 9334c6c..96e917c 100644
--- a/m4/ax_func_memmove.m4
+++ b/m4/ax_func_memmove.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_FUNC_MEMMOVE], [AX_FUNC_MEMMOVE])
 AC_DEFUN([AX_FUNC_MEMMOVE],
 [AC_CHECK_FUNCS(memmove)
 AC_MSG_CHECKING(for working memmove)
diff --git a/m4/ax_func_mkdir.m4 b/m4/ax_func_mkdir.m4
index ead484b..ee046c4 100644
--- a/m4/ax_func_mkdir.m4
+++ b/m4/ax_func_mkdir.m4
@@ -58,6 +58,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_FUNC_MKDIR], [AX_FUNC_MKDIR])
 AC_DEFUN([AX_FUNC_MKDIR],
 [AC_CHECK_FUNCS([mkdir _mkdir])
 AC_CACHE_CHECK([whether mkdir takes one argument],
diff --git a/m4/ax_func_snprintf.m4 b/m4/ax_func_snprintf.m4
index 286fe22..fd98dde 100644
--- a/m4/ax_func_snprintf.m4
+++ b/m4/ax_func_snprintf.m4
@@ -23,6 +23,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF])
 AC_DEFUN([AX_FUNC_SNPRINTF],
 [AC_CHECK_FUNCS(snprintf vsnprintf)
 AC_MSG_CHECKING(for working snprintf)
diff --git a/m4/ax_func_which_getservbyname_r.m4 b/m4/ax_func_which_getservbyname_r.m4
index eb4330d..f2c4023 100644
--- a/m4/ax_func_which_getservbyname_r.m4
+++ b/m4/ax_func_which_getservbyname_r.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_RAF_FUNC_WHICH_GETSERVBYNAME_R], [AX_FUNC_WHICH_GETSERVBYNAME_R])
 AC_DEFUN([AX_FUNC_WHICH_GETSERVBYNAME_R],
 [AC_CACHE_CHECK(for getservbyname_r, ax_cv_func_which_getservbyname_r, [
 AC_CHECK_FUNC(getservbyname_r, [
diff --git a/m4/ax_have_opengl.m4 b/m4/ax_have_opengl.m4
index 3121412..ee34f5e 100644
--- a/m4/ax_have_opengl.m4
+++ b/m4/ax_have_opengl.m4
@@ -65,6 +65,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([MDL_HAVE_OPENGL], [AX_HAVE_OPENGL])
 AC_DEFUN([AX_HAVE_OPENGL],
 [
   AC_REQUIRE([AC_PROG_CC])
diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4
index 58caeaa..296c60a 100644
--- a/m4/ax_have_qt.m4
+++ b/m4/ax_have_qt.m4
@@ -88,6 +88,7 @@
 #   and this notice are preserved.
 
 dnl Calls AX_PATH_QT_DIRECT (contained in this file) as a subroutine.
+AU_ALIAS([BNV_HAVE_QT], [AX_HAVE_QT])
 AC_DEFUN([AX_HAVE_QT],
 [
   AC_REQUIRE([AC_PROG_CXX])
diff --git a/m4/ax_java_check_class.m4 b/m4/ax_java_check_class.m4
index 1835432..c5e46f4 100644
--- a/m4/ax_java_check_class.m4
+++ b/m4/ax_java_check_class.m4
@@ -49,6 +49,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([DPS_JAVA_CHECK_CLASS], [AX_JAVA_CHECK_CLASS])
 AC_DEFUN([AX_JAVA_CHECK_CLASS],[
 m4_define([cache_val],[m4_translit(ax_cv_have_java_class_$1, " ." ,"__")])
 if test "x$CLASSPATH" != "x"; then
diff --git a/m4/ax_java_options.m4 b/m4/ax_java_options.m4
index a4d7d0b..db672eb 100644
--- a/m4/ax_java_options.m4
+++ b/m4/ax_java_options.m4
@@ -26,6 +26,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_JAVA_OPTIONS], [AX_JAVA_OPTIONS])
 AC_DEFUN([AX_JAVA_OPTIONS],[
 AC_ARG_WITH(java-prefix,
                         [  --with-java-prefix=PFX  prefix where Java runtime is installed (optional)])
diff --git a/m4/ax_jni_include_dir.m4 b/m4/ax_jni_include_dir.m4
index 167bb84..4f1a882 100644
--- a/m4/ax_jni_include_dir.m4
+++ b/m4/ax_jni_include_dir.m4
@@ -42,6 +42,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR])
 AC_DEFUN([AX_JNI_INCLUDE_DIR],[
 
 JNI_INCLUDE_DIRS=""
diff --git a/m4/ax_lapack.m4 b/m4/ax_lapack.m4
index 09a433d..fb8a7b4 100644
--- a/m4/ax_lapack.m4
+++ b/m4/ax_lapack.m4
@@ -64,6 +64,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_LAPACK], [AX_LAPACK])
 AC_DEFUN([AX_LAPACK], [
 AC_REQUIRE([AX_BLAS])
 ax_lapack_ok=no
diff --git a/m4/ax_lib_curl.m4 b/m4/ax_lib_curl.m4
index d4bb861..20ac0d8 100644
--- a/m4/ax_lib_curl.m4
+++ b/m4/ax_lib_curl.m4
@@ -29,6 +29,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CHECK_CURL], [AX_LIB_CURL])
 AC_DEFUN([AX_LIB_CURL], [
   AX_PATH_GENERIC([curl],[$1],'s/^libcurl\ \+//',[$2],[$3])
 ])
diff --git a/m4/ax_lib_id3.m4 b/m4/ax_lib_id3.m4
index 59b612d..1a92fe5 100644
--- a/m4/ax_lib_id3.m4
+++ b/m4/ax_lib_id3.m4
@@ -35,6 +35,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_LIB_ID3], [AX_LIB_ID3])
 AC_DEFUN([AX_LIB_ID3], [
   AH_TEMPLATE([HAVE_ID3LIB], [Define if id3lib is available])
   AC_ARG_WITH(id3lib, [  --with-id3lib=DIR       prefix for id3 library files and headers], [
diff --git a/m4/ax_lib_metis.m4 b/m4/ax_lib_metis.m4
index 8c9c4b0..a10ae6e 100644
--- a/m4/ax_lib_metis.m4
+++ b/m4/ax_lib_metis.m4
@@ -31,6 +31,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([IMMDX_LIB_METIS], [AX_LIB_METIS])
 AC_DEFUN([AX_LIB_METIS], [
 	AC_MSG_CHECKING(for METIS library)
 	AC_REQUIRE([AC_PROG_CC])
diff --git a/m4/ax_lib_readline.m4 b/m4/ax_lib_readline.m4
index d6931d7..d6aeff6 100644
--- a/m4/ax_lib_readline.m4
+++ b/m4/ax_lib_readline.m4
@@ -57,6 +57,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
 AC_DEFUN([AX_LIB_READLINE], [
   AC_CACHE_CHECK([for a readline compatible library],
                  ax_cv_lib_readline, [
diff --git a/m4/ax_lib_socket_nsl.m4 b/m4/ax_lib_socket_nsl.m4
index 19d5cbf..864f971 100644
--- a/m4/ax_lib_socket_nsl.m4
+++ b/m4/ax_lib_socket_nsl.m4
@@ -27,6 +27,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL])
 AC_DEFUN([AX_LIB_SOCKET_NSL],
 [
 	AC_SEARCH_LIBS([gethostbyname], [nsl])
diff --git a/m4/ax_lib_taglib.m4 b/m4/ax_lib_taglib.m4
index 5d02638..0000803 100644
--- a/m4/ax_lib_taglib.m4
+++ b/m4/ax_lib_taglib.m4
@@ -29,6 +29,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_CHECK_TAGLIB], [AX_LIB_TAGLIB])
 AC_DEFUN([AX_LIB_TAGLIB], [
   AX_PATH_GENERIC([taglib],[$1],,[$2],[$3])
 ])
diff --git a/m4/ax_lib_upnp.m4 b/m4/ax_lib_upnp.m4
index b1cf327..cda1f96 100644
--- a/m4/ax_lib_upnp.m4
+++ b/m4/ax_lib_upnp.m4
@@ -34,6 +34,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_LIB_UPNP], [AX_LIB_UPNP])
 AC_DEFUN([AX_LIB_UPNP], [
   AH_TEMPLATE([HAVE_LIBUPNP], [Define if libupnp is available])
   AC_ARG_WITH(libupnp, [  --with-libupnp=DIR      prefix for upnp library files and headers], [
diff --git a/m4/ax_lib_wad.m4 b/m4/ax_lib_wad.m4
index 3bf6e7d..3f70b42 100644
--- a/m4/ax_lib_wad.m4
+++ b/m4/ax_lib_wad.m4
@@ -43,6 +43,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_LIB_WAD], [AX_LIB_WAD])
 AC_DEFUN([AX_LIB_WAD],
 [
         AC_REQUIRE([AX_PYTHON_DEVEL])
diff --git a/m4/ax_libgcj_jar.m4 b/m4/ax_libgcj_jar.m4
index e2f64fd..0d65f04 100644
--- a/m4/ax_libgcj_jar.m4
+++ b/m4/ax_libgcj_jar.m4
@@ -41,6 +41,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([DPS_LIBGCJ_JAR], [AX_LIBGCJ_JAR])
 AC_DEFUN([AX_LIBGCJ_JAR],
 [
 AC_REQUIRE([AC_EXEEXT])
diff --git a/m4/ax_libtoolize_cflags.m4 b/m4/ax_libtoolize_cflags.m4
index 74a04d3..93d07d2 100644
--- a/m4/ax_libtoolize_cflags.m4
+++ b/m4/ax_libtoolize_cflags.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_LIBTOOLIZE_CFLAGS], [AX_LIBTOOLIZE_CFLAGS])
 AC_DEFUN([AX_LIBTOOLIZE_CFLAGS],
   [ac_libtoolize_ldflags_temp=""
    for i in $$1
diff --git a/m4/ax_mpi.m4 b/m4/ax_mpi.m4
index e0bce19..e636e79 100644
--- a/m4/ax_mpi.m4
+++ b/m4/ax_mpi.m4
@@ -67,6 +67,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_MPI], [AX_MPI])
 AC_DEFUN([AX_MPI], [
 AC_PREREQ(2.50) dnl for AC_LANG_CASE
 
diff --git a/m4/ax_normalize_path.m4 b/m4/ax_normalize_path.m4
index 1a418df..0f25075 100644
--- a/m4/ax_normalize_path.m4
+++ b/m4/ax_normalize_path.m4
@@ -95,6 +95,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ADL_NORMALIZE_PATH], [AX_NORMALIZE_PATH])
 AC_DEFUN([AX_NORMALIZE_PATH],
 [case ":[$]$1:" in
 # change empty paths to '.'
diff --git a/m4/ax_numeric_namedlevel.m4 b/m4/ax_numeric_namedlevel.m4
index cc41a8f..7a311fa 100644
--- a/m4/ax_numeric_namedlevel.m4
+++ b/m4/ax_numeric_namedlevel.m4
@@ -77,6 +77,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_NUMERIC_NAMEDLEVEL], [AX_NUMERIC_NAMEDLEVEL])
 AC_DEFUN([AX_NUMERIC_NAMEDLEVEL],
 [dnl the names to be defined...
 $1="ifelse($1,,[$]$2,[$]$1)" ; $1="[$]$1"
diff --git a/m4/ax_patch_libtool_changing_cmds_ifs.m4 b/m4/ax_patch_libtool_changing_cmds_ifs.m4
index 63c26a4..84f131d 100644
--- a/m4/ax_patch_libtool_changing_cmds_ifs.m4
+++ b/m4/ax_patch_libtool_changing_cmds_ifs.m4
@@ -72,6 +72,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([PATCH_LIBTOOL_CHANGING_CMDS_IFS], [AX_PATCH_LIBTOOL_CHANGING_CMDS_IFS])
 AC_DEFUN([AX_PATCH_LIBTOOL_CHANGING_CMDS_IFS],
 [# patch libtool to change $_cmds IFS from ~ to ? character
 if grep "^[[_$as_cr_letters]]_cmds=.*[[?]]" libtool >/dev/null; then
diff --git a/m4/ax_path_generic.m4 b/m4/ax_path_generic.m4
index e3f0b9a..c56b7c2 100644
--- a/m4/ax_path_generic.m4
+++ b/m4/ax_path_generic.m4
@@ -54,6 +54,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PATH_GENERIC], [AX_PATH_GENERIC])
 AC_DEFUN([AX_PATH_GENERIC],[
   AC_REQUIRE([AC_PROG_SED])
 
diff --git a/m4/ax_perl_module_version.m4 b/m4/ax_perl_module_version.m4
index bbc06f5..3a44050 100644
--- a/m4/ax_perl_module_version.m4
+++ b/m4/ax_perl_module_version.m4
@@ -27,6 +27,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PERL_MODULE_VERSION], [AX_PERL_MODULE_VERSION])
 AC_DEFUN([AX_PERL_MODULE_VERSION],[dnl
 ac_perl_list_modules="$1"
 # Make sure we have perl
diff --git a/m4/ax_pkg_mico.m4 b/m4/ax_pkg_mico.m4
index 4f3eab8..d51f8cf 100644
--- a/m4/ax_pkg_mico.m4
+++ b/m4/ax_pkg_mico.m4
@@ -48,6 +48,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PKG_MICO], [AX_PKG_MICO])
 AC_DEFUN([AX_PKG_MICO],
 [
 #
diff --git a/m4/ax_prog_apache.m4 b/m4/ax_prog_apache.m4
index 64a744e..f9c32a1 100644
--- a/m4/ax_prog_apache.m4
+++ b/m4/ax_prog_apache.m4
@@ -69,6 +69,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_APACHE], [AX_PROG_APACHE])
 AC_DEFUN([AX_PROG_APACHE],
 #
 # Handle user hints
diff --git a/m4/ax_prog_cc_char_subscripts.m4 b/m4/ax_prog_cc_char_subscripts.m4
index eeffede..b35bcf9 100644
--- a/m4/ax_prog_cc_char_subscripts.m4
+++ b/m4/ax_prog_cc_char_subscripts.m4
@@ -47,6 +47,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_CC_CHAR_SUBSCRIPTS], [AX_PROG_CC_CHAR_SUBSCRIPTS])
 AC_DEFUN([AX_PROG_CC_CHAR_SUBSCRIPTS], [
   pushdef([CV],ac_cv_prog_cc_char_subscripts)dnl
   hard=$2
diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
index a4831ee..62f1175 100644
--- a/m4/ax_prog_cc_for_build.m4
+++ b/m4/ax_prog_cc_for_build.m4
@@ -31,6 +31,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
 AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_CPP])dnl
diff --git a/m4/ax_prog_cp_s.m4 b/m4/ax_prog_cp_s.m4
index e24c84a..54af38f 100644
--- a/m4/ax_prog_cp_s.m4
+++ b/m4/ax_prog_cp_s.m4
@@ -56,6 +56,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_CP_S], [AX_PROG_CP_S])
 AC_DEFUN([AX_PROG_CP_S],
 [AC_REQUIRE([AC_PROG_LN_S])dnl
 AC_MSG_CHECKING(whether cp -s works)
diff --git a/m4/ax_prog_crontab.m4 b/m4/ax_prog_crontab.m4
index 77b580c..3e27f52 100644
--- a/m4/ax_prog_crontab.m4
+++ b/m4/ax_prog_crontab.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_CRONTAB], [AX_PROG_CRONTAB])
 AC_DEFUN([AX_PROG_CRONTAB],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(CRONTAB, crontab$EXEEXT, nocommand)
diff --git a/m4/ax_prog_fig2dev.m4 b/m4/ax_prog_fig2dev.m4
index dfd5663..fa106a4 100644
--- a/m4/ax_prog_fig2dev.m4
+++ b/m4/ax_prog_fig2dev.m4
@@ -22,6 +22,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([VL_PROG_FIG2DEV], [AX_PROG_FIG2DEV])
 AC_DEFUN([AX_PROG_FIG2DEV], [
   AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev)
   if test "x$FIG2DEV" != "x"; then
diff --git a/m4/ax_prog_httpd.m4 b/m4/ax_prog_httpd.m4
index 0e8fe73..68c8742 100644
--- a/m4/ax_prog_httpd.m4
+++ b/m4/ax_prog_httpd.m4
@@ -55,6 +55,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_HTTPD], [AX_PROG_HTTPD])
 AC_DEFUN([AX_PROG_HTTPD],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(HTTPD, httpd$EXEEXT, nocommand)
diff --git a/m4/ax_prog_jar.m4 b/m4/ax_prog_jar.m4
index af53c1d..d2a4507 100644
--- a/m4/ax_prog_jar.m4
+++ b/m4/ax_prog_jar.m4
@@ -36,6 +36,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PROG_JAR], [AX_PROG_JAR])
 AC_DEFUN([AX_PROG_JAR],[
 AC_REQUIRE([AC_EXEEXT])dnl
 if test "x$JAVAPREFIX" = x; then
diff --git a/m4/ax_prog_java.m4 b/m4/ax_prog_java.m4
index 13af645..afa7757 100644
--- a/m4/ax_prog_java.m4
+++ b/m4/ax_prog_java.m4
@@ -100,6 +100,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA])
 AC_DEFUN([AX_PROG_JAVA],[
 AC_REQUIRE([AC_EXEEXT])dnl
 if test x$JAVAPREFIX = x; then
diff --git a/m4/ax_prog_java_cc.m4 b/m4/ax_prog_java_cc.m4
index b69110b..1478e65 100644
--- a/m4/ax_prog_java_cc.m4
+++ b/m4/ax_prog_java_cc.m4
@@ -76,6 +76,7 @@
 # COMPILER ... is a space separated list of java compilers to search for.
 # This just gives the user an opportunity to specify an alternative
 # search list for the java compiler.
+AU_ALIAS([AC_PROG_JAVA_CC], [AX_PROG_JAVA_CC])
 AC_DEFUN([AX_PROG_JAVA_CC],
 [AC_ARG_VAR([JAVA_CC],                [java compiler command])dnl
 AC_ARG_VAR([JAVA_CC_FLAGS],           [java compiler flags])dnl
diff --git a/m4/ax_prog_java_works.m4 b/m4/ax_prog_java_works.m4
index a21f6ca..2986b4c 100644
--- a/m4/ax_prog_java_works.m4
+++ b/m4/ax_prog_java_works.m4
@@ -47,6 +47,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS])
 AC_DEFUN([AX_PROG_JAVA_WORKS], [
 AC_CHECK_PROG(uudecode, uudecode$EXEEXT, yes)
 if test x$uudecode = xyes; then
diff --git a/m4/ax_prog_javac.m4 b/m4/ax_prog_javac.m4
index b2aee27..c17f8f9 100644
--- a/m4/ax_prog_javac.m4
+++ b/m4/ax_prog_javac.m4
@@ -64,6 +64,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_JAVAC], [AX_PROG_JAVAC])
 AC_DEFUN([AX_PROG_JAVAC],[
 AC_REQUIRE([AC_EXEEXT])dnl
 if test "x$JAVAPREFIX" = x; then
diff --git a/m4/ax_prog_javac_works.m4 b/m4/ax_prog_javac_works.m4
index bd4706e..98a54d8 100644
--- a/m4/ax_prog_javac_works.m4
+++ b/m4/ax_prog_javac_works.m4
@@ -47,6 +47,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_JAVAC_WORKS], [AX_PROG_JAVAC_WORKS])
 AC_DEFUN([AX_PROG_JAVAC_WORKS],[
 AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [
 JAVA_TEST=Test.java
diff --git a/m4/ax_prog_javadoc.m4 b/m4/ax_prog_javadoc.m4
index f689aa9..1b8bb72 100644
--- a/m4/ax_prog_javadoc.m4
+++ b/m4/ax_prog_javadoc.m4
@@ -37,6 +37,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PROG_JAVADOC], [AX_PROG_JAVADOC])
 AC_DEFUN([AX_PROG_JAVADOC],[
 AC_REQUIRE([AC_EXEEXT])dnl
 if test "x$JAVAPREFIX" = x; then
diff --git a/m4/ax_prog_javah.m4 b/m4/ax_prog_javah.m4
index 91c4fa2..df8d35e 100644
--- a/m4/ax_prog_javah.m4
+++ b/m4/ax_prog_javah.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PROG_JAVAH], [AX_PROG_JAVAH])
 AC_DEFUN([AX_PROG_JAVAH],[
 AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
 AC_REQUIRE([AC_PROG_CPP])dnl
diff --git a/m4/ax_prog_modprobe.m4 b/m4/ax_prog_modprobe.m4
index 5e52ad5..178992d 100644
--- a/m4/ax_prog_modprobe.m4
+++ b/m4/ax_prog_modprobe.m4
@@ -23,6 +23,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PROG_MODPROBE], [AX_PROG_MODPROBE])
 AC_DEFUN([AX_PROG_MODPROBE],[
 AC_PATH_PROG(MODPROBE, modprobe, , $PATH:/sbin)
 if test -z "$MODPROBE"; then
diff --git a/m4/ax_prog_mysql.m4 b/m4/ax_prog_mysql.m4
index b51358c..bdbc4d0 100644
--- a/m4/ax_prog_mysql.m4
+++ b/m4/ax_prog_mysql.m4
@@ -51,6 +51,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_MYSQL], [AX_PROG_MYSQL])
 AC_DEFUN([AX_PROG_MYSQL],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(MYSQL, mysql$EXEEXT, nocommand)
diff --git a/m4/ax_prog_mysqladmin.m4 b/m4/ax_prog_mysqladmin.m4
index ae09dc3..f372f92 100644
--- a/m4/ax_prog_mysqladmin.m4
+++ b/m4/ax_prog_mysqladmin.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_MYSQLADMIN], [AX_PROG_MYSQLADMIN])
 AC_DEFUN([AX_PROG_MYSQLADMIN],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(MYSQLADMIN, mysqladmin$EXEEXT, nocommand)
diff --git a/m4/ax_prog_mysqld.m4 b/m4/ax_prog_mysqld.m4
index 238a509..1c2daf4 100644
--- a/m4/ax_prog_mysqld.m4
+++ b/m4/ax_prog_mysqld.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_MYSQLD], [AX_PROG_MYSQLD])
 AC_DEFUN([AX_PROG_MYSQLD],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(MYSQLD, mysqld$EXEEXT, nocommand)
diff --git a/m4/ax_prog_mysqlimport.m4 b/m4/ax_prog_mysqlimport.m4
index 759d09c..6074e3b 100644
--- a/m4/ax_prog_mysqlimport.m4
+++ b/m4/ax_prog_mysqlimport.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_MYSQLIMPORT], [AX_PROG_MYSQLIMPORT])
 AC_DEFUN([AX_PROG_MYSQLIMPORT],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(MYSQLIMPORT, mysqlimport$EXEEXT, nocommand)
diff --git a/m4/ax_prog_mysqlshow.m4 b/m4/ax_prog_mysqlshow.m4
index 81cecb5..03e439d 100644
--- a/m4/ax_prog_mysqlshow.m4
+++ b/m4/ax_prog_mysqlshow.m4
@@ -50,6 +50,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_MYSQLSHOW], [AX_PROG_MYSQLSHOW])
 AC_DEFUN([AX_PROG_MYSQLSHOW],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(MYSQLSHOW, mysqlshow$EXEEXT, nocommand)
diff --git a/m4/ax_prog_perl_modules.m4 b/m4/ax_prog_perl_modules.m4
index f2bdcfd..057cc60 100644
--- a/m4/ax_prog_perl_modules.m4
+++ b/m4/ax_prog_perl_modules.m4
@@ -31,6 +31,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES])
 AC_DEFUN([AX_PROG_PERL_MODULES],[dnl
 
 m4_define([ax_perl_modules])
diff --git a/m4/ax_prog_pgclient.m4 b/m4/ax_prog_pgclient.m4
index 2a08a7e..b75be97 100644
--- a/m4/ax_prog_pgclient.m4
+++ b/m4/ax_prog_pgclient.m4
@@ -49,6 +49,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([MS_PROG_PGCLIENT], [AX_PROG_PGCLIENT])
 AC_DEFUN([AX_PROG_PGCLIENT], [
 AC_ARG_WITH(pgclient, [  --with-pgclient=DIR                    where to find pgclient (default: $PATH)], [pgclient_dir=$withval], [pgclient_dir=$PATH])
 AC_PATH_PROG([pgclient], [pgclient], [0], $pgclient_dir)
diff --git a/m4/ax_prog_scp.m4 b/m4/ax_prog_scp.m4
index 245b687..21c4f08 100644
--- a/m4/ax_prog_scp.m4
+++ b/m4/ax_prog_scp.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_SCP], [AX_PROG_SCP])
 AC_DEFUN([AX_PROG_SCP],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(SCP, scp$EXEEXT, nocommand)
diff --git a/m4/ax_prog_ssh.m4 b/m4/ax_prog_ssh.m4
index b67d380..61de893 100644
--- a/m4/ax_prog_ssh.m4
+++ b/m4/ax_prog_ssh.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_SSH], [AX_PROG_SSH])
 AC_DEFUN([AX_PROG_SSH],[
 AC_REQUIRE([AC_EXEEXT])dnl
 AC_PATH_PROG(SSH, ssh$EXEEXT, nocommand)
diff --git a/m4/ax_prog_xsltproc.m4 b/m4/ax_prog_xsltproc.m4
index d849c31..393bd57 100644
--- a/m4/ax_prog_xsltproc.m4
+++ b/m4/ax_prog_xsltproc.m4
@@ -52,6 +52,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROG_XSLTPROC], [AX_PROG_XSLTPROC])
 AC_DEFUN([AX_PROG_XSLTPROC],
 [
 XSLTPROC_FLAGS="$1"
diff --git a/m4/ax_prototype.m4 b/m4/ax_prototype.m4
index 81ea357..e8071b7 100644
--- a/m4/ax_prototype.m4
+++ b/m4/ax_prototype.m4
@@ -114,6 +114,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROTOTYPE], [AX_PROTOTYPE])
 AC_DEFUN([AX_PROTOTYPE],[
 dnl
 dnl Upper case function name
diff --git a/m4/ax_prototype_accept.m4 b/m4/ax_prototype_accept.m4
index e994fc4..6250ce7 100644
--- a/m4/ax_prototype_accept.m4
+++ b/m4/ax_prototype_accept.m4
@@ -49,6 +49,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROTOTYPE_ACCEPT], [AX_PROTOTYPE_ACCEPT])
 AC_DEFUN([AX_PROTOTYPE_ACCEPT],[
 AX_PROTOTYPE(accept,
  [
diff --git a/m4/ax_prototype_getsockname.m4 b/m4/ax_prototype_getsockname.m4
index 1fb91d0..e2cf265 100644
--- a/m4/ax_prototype_getsockname.m4
+++ b/m4/ax_prototype_getsockname.m4
@@ -49,6 +49,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROTOTYPE_GETSOCKNAME], [AX_PROTOTYPE_GETSOCKNAME])
 AC_DEFUN([AX_PROTOTYPE_GETSOCKNAME],[
 AX_PROTOTYPE(getsockname,
  [
diff --git a/m4/ax_prototype_setsockopt.m4 b/m4/ax_prototype_setsockopt.m4
index a040c32..e351b65 100644
--- a/m4/ax_prototype_setsockopt.m4
+++ b/m4/ax_prototype_setsockopt.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PROTOTYPE_SETSOCKOPT], [AX_PROTOTYPE_SETSOCKOPT])
 AC_DEFUN([AX_PROTOTYPE_SETSOCKOPT],[
 AX_PROTOTYPE(setsockopt,
  [
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4
index 0728190..83d8d1b 100644
--- a/m4/ax_pthread.m4
+++ b/m4/ax_pthread.m4
@@ -75,6 +75,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
 AC_DEFUN([AX_PTHREAD], [
 AC_REQUIRE([AC_CANONICAL_HOST])
 AC_LANG_SAVE
diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
index b87304b..0740c64 100644
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -66,6 +66,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
 AC_DEFUN([AX_PYTHON_DEVEL],[
 	#
 	# Allow the use of a (user set) custom python version
diff --git a/m4/ax_python_module.m4 b/m4/ax_python_module.m4
index 2f0ecbf..9d1ac15 100644
--- a/m4/ax_python_module.m4
+++ b/m4/ax_python_module.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE])
 AC_DEFUN([AX_PYTHON_MODULE],[
     if test -z $PYTHON;
     then
diff --git a/m4/ax_rpm_init.m4 b/m4/ax_rpm_init.m4
index f5cc3fa..9a87685 100644
--- a/m4/ax_rpm_init.m4
+++ b/m4/ax_rpm_init.m4
@@ -178,6 +178,7 @@ dnl AX_RPM_INIT
 dnl Figure out how to create rpms for this system and setup for an
 dnl automake target
 
+AU_ALIAS([AM_RPM_INIT], [AX_RPM_INIT])
 AC_DEFUN([AX_RPM_INIT],
 [dnl
 AC_REQUIRE([AC_CANONICAL_HOST])
diff --git a/m4/ax_set_default_paths_system.m4 b/m4/ax_set_default_paths_system.m4
index 3c5849b..92e30ab 100644
--- a/m4/ax_set_default_paths_system.m4
+++ b/m4/ax_set_default_paths_system.m4
@@ -46,6 +46,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_SET_DEFAULT_PATHS_SYSTEM], [AX_SET_DEFAULT_PATHS_SYSTEM])
 AC_DEFUN([AX_SET_DEFAULT_PATHS_SYSTEM],
 [AC_REQUIRE([AC_CANONICAL_HOST]) # --------------------------------------------
 case "$prefix:$ac_default_prefix" in
diff --git a/m4/ax_short_sleep.m4 b/m4/ax_short_sleep.m4
index 77ac302..65e04fd 100644
--- a/m4/ax_short_sleep.m4
+++ b/m4/ax_short_sleep.m4
@@ -22,6 +22,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([ETR_SHORT_SLEEP], [AX_SHORT_SLEEP])
 AC_DEFUN([AX_SHORT_SLEEP],
 [
         AC_MSG_CHECKING([for nap() in libc])
diff --git a/m4/ax_sip_devel.m4 b/m4/ax_sip_devel.m4
index 42e98cd..03a0047 100644
--- a/m4/ax_sip_devel.m4
+++ b/m4/ax_sip_devel.m4
@@ -36,6 +36,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([MERK_SIP_DEVEL], [AX_SIP_DEVEL])
 AC_DEFUN([AX_SIP_DEVEL],[
 #-- provice --with-sip=PATH command line argument
 AC_ARG_WITH([sip],
diff --git a/m4/ax_string_strcasecmp.m4 b/m4/ax_string_strcasecmp.m4
index d43c4c7..8430afc 100644
--- a/m4/ax_string_strcasecmp.m4
+++ b/m4/ax_string_strcasecmp.m4
@@ -30,6 +30,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([ETR_STRING_STRCASECMP], [AX_STRING_STRCASECMP])
 AC_DEFUN([AX_STRING_STRCASECMP],
 [
 AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [
diff --git a/m4/ax_strings_strcasecmp.m4 b/m4/ax_strings_strcasecmp.m4
index be16649..20e5c90 100644
--- a/m4/ax_strings_strcasecmp.m4
+++ b/m4/ax_strings_strcasecmp.m4
@@ -19,6 +19,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([ETR_STRINGS_STRCASECMP], [AX_STRINGS_STRCASECMP])
 AC_DEFUN([AX_STRINGS_STRCASECMP],
 [ AC_CACHE_CHECK([for strcasecmp() in strings.h], ac_cv_strings_strcasecmp, [
 
diff --git a/m4/ax_struct_semun.m4 b/m4/ax_struct_semun.m4
index 28db6df..6a6a7b0 100644
--- a/m4/ax_struct_semun.m4
+++ b/m4/ax_struct_semun.m4
@@ -25,6 +25,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([ETR_STRUCT_SEMUN], [AX_STRUCT_SEMUN])
 AC_DEFUN([AX_STRUCT_SEMUN],
 [
 AC_CACHE_CHECK([for struct semun], ac_cv_struct_semun, [
diff --git a/m4/ax_subdir_files.m4 b/m4/ax_subdir_files.m4
index 863dc0c..7a464ec 100644
--- a/m4/ax_subdir_files.m4
+++ b/m4/ax_subdir_files.m4
@@ -45,6 +45,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_SUBDIR_FILES], [AX_SUBDIR_FILES])
 AC_DEFUN([AX_SUBDIR_FILES],
 [AC_BEFORE($0,[AX_PROG_CP_S])
   for ac_subdir in ifelse([$1], , *, $1) ; do
diff --git a/m4/ax_swig_enable_cxx.m4 b/m4/ax_swig_enable_cxx.m4
index b3b42ff..722caeb 100644
--- a/m4/ax_swig_enable_cxx.m4
+++ b/m4/ax_swig_enable_cxx.m4
@@ -43,6 +43,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([SWIG_ENABLE_CXX], [AX_SWIG_ENABLE_CXX])
 AC_DEFUN([AX_SWIG_ENABLE_CXX],[
         AC_REQUIRE([AC_PROG_SWIG])
         AC_REQUIRE([AC_PROG_CXX])
diff --git a/m4/ax_swig_multi_module_support.m4 b/m4/ax_swig_multi_module_support.m4
index 9ed29e2..bee9413 100644
--- a/m4/ax_swig_multi_module_support.m4
+++ b/m4/ax_swig_multi_module_support.m4
@@ -47,6 +47,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([SWIG_MULTI_MODULE_SUPPORT], [AX_SWIG_MULTI_MODULE_SUPPORT])
 AC_DEFUN([AX_SWIG_MULTI_MODULE_SUPPORT],[
         AC_REQUIRE([AC_PROG_SWIG])
         SWIG="$SWIG -noruntime"
diff --git a/m4/ax_swig_python.m4 b/m4/ax_swig_python.m4
index 37ec313..72e4079 100644
--- a/m4/ax_swig_python.m4
+++ b/m4/ax_swig_python.m4
@@ -52,6 +52,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([SWIG_PYTHON], [AX_SWIG_PYTHON])
 AC_DEFUN([AX_SWIG_PYTHON],[
         AC_REQUIRE([AC_PROG_SWIG])
         AC_REQUIRE([AX_PYTHON_DEVEL])
diff --git a/m4/ax_sys_dev_poll.m4 b/m4/ax_sys_dev_poll.m4
index a466f98..e53494d 100644
--- a/m4/ax_sys_dev_poll.m4
+++ b/m4/ax_sys_dev_poll.m4
@@ -24,6 +24,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_SYS_DEV_POLL], [AX_SYS_DEV_POLL])
 AC_DEFUN([AX_SYS_DEV_POLL], [AC_CACHE_CHECK(for /dev/poll support, ac_cv_dev_poll,
     AC_TRY_COMPILE([#include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/m4/ax_sys_largefile_sensitive.m4 b/m4/ax_sys_largefile_sensitive.m4
index 664edae..c4c26a4 100644
--- a/m4/ax_sys_largefile_sensitive.m4
+++ b/m4/ax_sys_largefile_sensitive.m4
@@ -63,6 +63,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_SYS_LARGEFILE_SENSITIVE], [AX_SYS_LARGEFILE_SENSITIVE])
 AC_DEFUN([AX_SYS_LARGEFILE_SENSITIVE],[dnl
 AC_REQUIRE([AC_SYS_LARGEFILE])dnl
 # we know about some internals of ac_sys_largefile here...
diff --git a/m4/ax_sys_weak_alias.m4 b/m4/ax_sys_weak_alias.m4
index d156d14..6667f73 100644
--- a/m4/ax_sys_weak_alias.m4
+++ b/m4/ax_sys_weak_alias.m4
@@ -109,6 +109,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([KLM_SYS_WEAK_ALIAS], [AX_SYS_WEAK_ALIAS])
 AC_DEFUN([AX_SYS_WEAK_ALIAS], [
   # starting point: no aliasing scheme yet...
   ax_sys_weak_alias=no
diff --git a/m4/ax_sysv_ipc.m4 b/m4/ax_sysv_ipc.m4
index 96753c1..0c1abd5 100644
--- a/m4/ax_sysv_ipc.m4
+++ b/m4/ax_sysv_ipc.m4
@@ -20,6 +20,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([ETR_SYSV_IPC], [AX_SYSV_IPC])
 AC_DEFUN([AX_SYSV_IPC],
 [
 AC_CACHE_CHECK([for System V IPC headers], ac_cv_sysv_ipc, [
diff --git a/m4/ax_try_compile_java.m4 b/m4/ax_try_compile_java.m4
index 1a8e5b5..3b7af40 100644
--- a/m4/ax_try_compile_java.m4
+++ b/m4/ax_try_compile_java.m4
@@ -28,6 +28,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AC_TRY_COMPILE_JAVA], [AX_TRY_COMPILE_JAVA])
 AC_DEFUN([AX_TRY_COMPILE_JAVA],[
 AC_REQUIRE([AX_PROG_JAVAC])dnl
 cat << \EOF > Test.java
diff --git a/m4/ax_type_socklen_t.m4 b/m4/ax_type_socklen_t.m4
index d8f946f..90ae3b7 100644
--- a/m4/ax_type_socklen_t.m4
+++ b/m4/ax_type_socklen_t.m4
@@ -42,6 +42,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([TYPE_SOCKLEN_T], [AX_TYPE_SOCKLEN_T])
 AC_DEFUN([AX_TYPE_SOCKLEN_T],
 [AC_CACHE_CHECK([for socklen_t], ac_cv_ax_type_socklen_t,
 [
diff --git a/m4/ax_var_timezone_externals.m4 b/m4/ax_var_timezone_externals.m4
index 202b489..49fabb6 100644
--- a/m4/ax_var_timezone_externals.m4
+++ b/m4/ax_var_timezone_externals.m4
@@ -44,6 +44,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_VAR_TIMEZONE_EXTERNALS], [AX_VAR_TIMEZONE_EXTERNALS])
 AC_DEFUN([AX_VAR_TIMEZONE_EXTERNALS],
 [  AC_REQUIRE([AC_STRUCT_TIMEZONE])dnl
    AC_CACHE_CHECK(for timezone external, mb_cv_var_timezone,
diff --git a/m4/ax_very_nice.m4 b/m4/ax_very_nice.m4
index 5336342..e7e54df 100644
--- a/m4/ax_very_nice.m4
+++ b/m4/ax_very_nice.m4
@@ -51,6 +51,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([AC_VERY_NICE], [AX_VERY_NICE])
 AC_DEFUN([AX_VERY_NICE],[
 if test "x$1" != "x"; then
   NICE_VALUE=$1
diff --git a/m4/ax_with_build_path.m4 b/m4/ax_with_build_path.m4
index f2c76d9..7964eb3 100644
--- a/m4/ax_with_build_path.m4
+++ b/m4/ax_with_build_path.m4
@@ -27,6 +27,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([SMR_WITH_BUILD_PATH], [AX_WITH_BUILD_PATH])
 AC_DEFUN([AX_WITH_BUILD_PATH],
 [
     AC_ARG_WITH([build-path],
diff --git a/m4/ax_with_curses.m4 b/m4/ax_with_curses.m4
index 1216eff..4b27dc4 100644
--- a/m4/ax_with_curses.m4
+++ b/m4/ax_with_curses.m4
@@ -58,6 +58,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
 AC_DEFUN([AX_WITH_CURSES],
   [AC_ARG_WITH(ncurses, [AC_HELP_STRING([--with-ncurses],
         [Force the use of ncurses over curses])],,)
diff --git a/m4/ax_with_mpatrol.m4 b/m4/ax_with_mpatrol.m4
index 311293c..f805efc 100644
--- a/m4/ax_with_mpatrol.m4
+++ b/m4/ax_with_mpatrol.m4
@@ -27,6 +27,7 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
+AU_ALIAS([AM_WITH_MPATROL], [AX_WITH_MPATROL])
 AC_DEFUN([AX_WITH_MPATROL], [
   # Firstly, determine if the mpatrol library should be used.
 
diff --git a/m4/ax_xercesc.m4 b/m4/ax_xercesc.m4
index 83664f0..4d7d554 100644
--- a/m4/ax_xercesc.m4
+++ b/m4/ax_xercesc.m4
@@ -41,6 +41,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([RLC_XERCESC], [AX_XERCESC])
 AC_DEFUN([AX_XERCESC],
 [
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
diff --git a/m4/ax_xtra_classpath.m4 b/m4/ax_xtra_classpath.m4
index 244bbc0..992b9de 100644
--- a/m4/ax_xtra_classpath.m4
+++ b/m4/ax_xtra_classpath.m4
@@ -42,6 +42,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
+AU_ALIAS([DPS_XTRA_CLASSPATH], [AX_XTRA_CLASSPATH])
 AC_DEFUN([AX_XTRA_CLASSPATH],[
 AC_CHECK_PROG(SED, sed)
 AX_JAVA_CHECK_CLASS([$2],[got="yes"],[got="no"])
author	Reuben Thomas <rrt@sc3d.org>	2009-08-13 12:51:11 +0100
committer	Reuben Thomas <rrt@sc3d.org>	2009-08-13 12:51:11 +0100
commit	d722dcd17c95e0eb178fdd34dc14ce79f2f14103 (patch)
tree	c8297c839796480fc2c04bbe4d2b9751ee3e6917 /m4
parent	58f1084c58874f22d412a810030d0fdae4896443 (diff)
download	autoconf-archive-d722dcd17c95e0eb178fdd34dc14ce79f2f14103.tar.gz