diff --git a/m4/ax_check_class.m4 b/m4/ax_check_class.m4
index a349279..098aa77 100644
--- a/m4/ax_check_class.m4
+++ b/m4/ax_check_class.m4
@@ -51,7 +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.
 
-#serial 6
+#serial 7
 
 AU_ALIAS([AC_CHECK_CLASS], [AX_CHECK_CLASS])
 AC_DEFUN([AX_CHECK_CLASS],[
@@ -109,7 +109,7 @@ JAABAAcAAAAhAAEAAQAAAAUqtwAmsQAAAAEACAAAAAoAAgAAAAQABAAEAAEA
 JwAAAAIAKA==
 ====
 EOF
-                if uudecode$EXEEXT Test.uue; then
+                if $UUDECODE Test.uue; then
                         :
                 else
                         echo "configure: __oline__: uudecode had trouble decoding base 64 file 'Test.uue'" >&AS_MESSAGE_LOG_FD
diff --git a/m4/ax_prog_java.m4 b/m4/ax_prog_java.m4
index a41e121..5471f32 100644
--- a/m4/ax_prog_java.m4
+++ b/m4/ax_prog_java.m4
@@ -21,9 +21,9 @@
 #
 #   AX_TRY_COMPILE_JAVA: attempt to compile user given source.
 #
-#   AC_TRY_RUN_JAVA: attempt to compile and run user given source.
+#   AX_TRY_RUN_JAVA: attempt to compile and run user given source.
 #
-#   AC_JAVA_OPTIONS: adds Java configure options.
+#   AX_JAVA_OPTIONS: adds Java configure options.
 #
 #   AX_PROG_JAVA tests an existing Java virtual machine. It uses the
 #   environment variable JAVA then tests in sequence various common Java
@@ -100,7 +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.
 
-#serial 7
+#serial 8
 
 AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA])
 AC_DEFUN([AX_PROG_JAVA],[
diff --git a/m4/ax_prog_java_works.m4 b/m4/ax_prog_java_works.m4
index d340134..741bd56 100644
--- a/m4/ax_prog_java_works.m4
+++ b/m4/ax_prog_java_works.m4
@@ -47,12 +47,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 7
+#serial 8
 
 AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS])
 AC_DEFUN([AX_PROG_JAVA_WORKS], [
-AC_CHECK_PROG(UUDECODE, uudecode, no)
-if test x$uudecode != xno; then
+AC_PATH_PROG(UUDECODE, uudecode, [no])
+if test x$UUDECODE != xno; then
 AC_CACHE_CHECK([if uudecode can decode base 64 file], ac_cv_prog_uudecode_base64, [
 dnl /**
 dnl  * Test.java: used to test if java compiler works.
diff --git a/m4/ax_try_run_java.m4 b/m4/ax_try_run_java.m4
index 6e78773..6bc91f9 100644
--- a/m4/ax_try_run_java.m4
+++ b/m4/ax_try_run_java.m4
@@ -1,14 +1,14 @@
 # ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_try_run_javac.html
+#     http://www.gnu.org/software/autoconf-archive/ax_try_run_java.html
 # ===========================================================================
 #
 # SYNOPSIS
 #
-#   AC_TRY_RUN_JAVA
+#   AX_TRY_RUN_JAVA
 #
 # DESCRIPTION
 #
-#   AC_TRY_RUN_JAVA attempt to compile and run user given source.
+#   AX_TRY_RUN_JAVA attempt to compile and run user given source.
 #
 #   *Warning*: its success or failure can depend on a proper setting of the
 #   CLASSPATH env. variable.
@@ -29,9 +29,10 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 6
+#serial 7
 
-AC_DEFUN([AC_TRY_RUN_JAVA],[
+AU_ALIAS([AC_TRY_RUN_JAVA], [AX_TRY_RUN_JAVA])
+AC_DEFUN([AX_TRY_RUN_JAVA],[
 AC_REQUIRE([AX_PROG_JAVAC])dnl
 AC_REQUIRE([AX_PROG_JAVA])dnl
 cat << \EOF > Test.java
