diff --git a/flaim/m4/ac_prog_try_doxygen.m4 b/flaim/m4/ac_prog_try_doxygen.m4
index 59e26a1..8b5ef2a 100644
--- a/flaim/m4/ac_prog_try_doxygen.m4
+++ b/flaim/m4/ac_prog_try_doxygen.m4
@@ -18,15 +18,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
-fi])dnl
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/ftk/m4/ac_prog_try_doxygen.m4 b/ftk/m4/ac_prog_try_doxygen.m4
index 59e26a1..8b5ef2a 100644
--- a/ftk/m4/ac_prog_try_doxygen.m4
+++ b/ftk/m4/ac_prog_try_doxygen.m4
@@ -18,15 +18,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
-fi])dnl
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/sql/m4/ac_prog_try_doxygen.m4 b/sql/m4/ac_prog_try_doxygen.m4
index 59e26a1..8b5ef2a 100644
--- a/sql/m4/ac_prog_try_doxygen.m4
+++ b/sql/m4/ac_prog_try_doxygen.m4
@@ -18,15 +18,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
-fi])dnl
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_csc.m4 b/xflaim/m4/ac_prog_try_csc.m4
index 07170b0..f9290d7 100644
--- a/xflaim/m4/ac_prog_try_csc.m4
+++ b/xflaim/m4/ac_prog_try_csc.m4
@@ -20,15 +20,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_CSC],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([CSC], [CSharp compiler])dnl
 AC_CHECK_PROGS([CSC], [mcs$EXEEXT csc$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$CSC"; then
-  AC_MSG_WARN([No CSharp compiler found - continuing without CSharp support])
-fi])dnl
+  AC_MSG_WARN([CSharp compiler not found - continuing without CSharp])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_csvm.m4 b/xflaim/m4/ac_prog_try_csvm.m4
index 4c8a26b..f2001c2 100644
--- a/xflaim/m4/ac_prog_try_csvm.m4
+++ b/xflaim/m4/ac_prog_try_csvm.m4
@@ -17,15 +17,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_CSVM],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([CSVM], [CSharp virtual machine])dnl
 AC_CHECK_PROGS([CSVM], [mono$EXEEXT cs$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$CSVM"; then
-  AC_MSG_WARN([No CSharp virtual machine found - continuing without CSVM support])
-fi])dnl
+  AC_MSG_WARN([CSharp VM not found - continuing without CSharp VM])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_doxygen.m4 b/xflaim/m4/ac_prog_try_doxygen.m4
index 59e26a1..8b5ef2a 100644
--- a/xflaim/m4/ac_prog_try_doxygen.m4
+++ b/xflaim/m4/ac_prog_try_doxygen.m4
@@ -18,15 +18,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
-fi])dnl
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_jar.m4 b/xflaim/m4/ac_prog_try_jar.m4
index fc680a0..2c15cb3 100644
--- a/xflaim/m4/ac_prog_try_jar.m4
+++ b/xflaim/m4/ac_prog_try_jar.m4
@@ -17,15 +17,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAR],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([JAR], [Java archive utility])dnl
 AC_CHECK_PROGS([JAR], [jar$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$JAR"; then
-  AC_MSG_WARN([No Java jar utility found - continuing without Java jar support])
-fi])dnl
+  AC_MSG_WARN([Java ARchive program not found - continuing without jar])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_java.m4 b/xflaim/m4/ac_prog_try_java.m4
index 2504968..91e102f 100644
--- a/xflaim/m4/ac_prog_try_java.m4
+++ b/xflaim/m4/ac_prog_try_java.m4
@@ -17,15 +17,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVA],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([JAVA], [Java virtual machine])dnl
 AC_CHECK_PROGS([JAVA], [kaffe$EXEEXT java$EXEEXT])
-m4_ifvaln([$1],,
-[if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([No Java virtual machine found - continuing without JVM support])
-fi])dnl
+ifelse([$1],,
+[if test -z "$JAVA"; then
+  AC_MSG_WARN([Java VM not found - continuing without JVM])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_javac.m4 b/xflaim/m4/ac_prog_try_javac.m4
index 290469e..0db5cf9 100644
--- a/xflaim/m4/ac_prog_try_javac.m4
+++ b/xflaim/m4/ac_prog_try_javac.m4
@@ -17,15 +17,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVAC],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([JAVAC], [Java compiler])dnl
 AC_CHECK_PROGS([JAVAC], ["gcj$EXEEXT -C" guavac$EXEEXT jikes$EXEEXT javac$EXEEXT])
-m4_ifvaln([$1],,
-[if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([No Java compiler found - continuing without Java support])
-fi])dnl
+ifelse([$1],,
+[if test -z "$JAVAC"; then
+  AC_MSG_WARN([Java compiler not found - continuing without javac])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_javadoc.m4 b/xflaim/m4/ac_prog_try_javadoc.m4
index 3e8fce0..92243ce 100644
--- a/xflaim/m4/ac_prog_try_javadoc.m4
+++ b/xflaim/m4/ac_prog_try_javadoc.m4
@@ -17,15 +17,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVADOC],
 [AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([JAVADOC], [Java source documentation utility])dnl
 AC_CHECK_PROGS([JAVADOC], [javadoc$EXEEXT])
-m4_ifvaln([$1],,
+ifelse([$1],,
 [if test -z "$JAVADOC"; then
-  AC_MSG_WARN([No javadoc program found - continuing without javadoc support])
-fi])dnl
+  AC_MSG_WARN([Javadoc program not found - continuing without javadoc])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_javah.m4 b/xflaim/m4/ac_prog_try_javah.m4
index 0c1fb88..a393297 100644
--- a/xflaim/m4/ac_prog_try_javah.m4
+++ b/xflaim/m4/ac_prog_try_javah.m4
@@ -17,16 +17,15 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVAH],
-[AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
+[AC_REQUIRE([AC_EXEEXT])dnl
 AC_ARG_VAR([JAVAH], [Java header utility])dnl
-AC_CHECK_PROGS([JAVAH], [javah])
-m4_ifvaln([$1],,
-[if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([No javah utility found - continuing wihtout javah support])
-fi])dnl
+AC_CHECK_PROGS([JAVAH], [javah$EXEEXT])
+ifelse([$1],,
+[if test -z "$JAVAH"; then
+  AC_MSG_WARN([Java header program not found - continuing without javah])
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])
diff --git a/xflaim/m4/ac_prog_try_jni.m4 b/xflaim/m4/ac_prog_try_jni.m4
index 673a286..a90fab9 100644
--- a/xflaim/m4/ac_prog_try_jni.m4
+++ b/xflaim/m4/ac_prog_try_jni.m4
@@ -24,7 +24,7 @@
 #       not rely on this, as all other words are reserved.
 #
 # Author:   John Calcote <john.calcote@gmail.com>
-# Modified: 2009-04-23
+# Modified: 2009-04-27
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JNI],
@@ -32,12 +32,12 @@ AC_DEFUN([AC_PROG_TRY_JNI],
 AC_PROG_TRY_JAVAC([quiet])dnl
 AC_PROG_TRY_JAVAH([quiet])dnl
 AC_PROG_TRY_JAR([quiet])dnl
-m4_ifvaln([$1],,
+ifelse([$1],,
 [ac_prog_have_jni=yes
 if test -z "$JAVAC"; then ac_prog_have_jni=no; fi
 if test -z "$JAVAH"; then ac_prog_have_jni=no; fi
 if test -z "$JAR"; then ac_prog_have_jni=no; fi
 if test "x$ac_prog_have_jni" = xno; then
   AC_MSG_WARN([Some required JNI tools are missing - continuing without JNI support])
-fi])dnl
+fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
 ])