diff --git a/flaim/m4/ac_prog_try_doxygen.m4 b/flaim/m4/ac_prog_try_doxygen.m4
index 8b5ef2a..06b39ab 100644
--- a/flaim/m4/ac_prog_try_doxygen.m4
+++ b/flaim/m4/ac_prog_try_doxygen.m4
@@ -7,16 +7,14 @@
 # If no arguments are given to this macro, and no doxygen 
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the DOXYGEN variable precious to Autoconf. You can 
 # use the DOXYGEN variable in your Makefile.in files with 
 # @DOXYGEN@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -29,4 +27,4 @@ ifelse([$1],,
 [if test -z "$DOXYGEN"; then
   AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_DOXYGEN
diff --git a/ftk/m4/ac_prog_try_doxygen.m4 b/ftk/m4/ac_prog_try_doxygen.m4
index 8b5ef2a..06b39ab 100644
--- a/ftk/m4/ac_prog_try_doxygen.m4
+++ b/ftk/m4/ac_prog_try_doxygen.m4
@@ -7,16 +7,14 @@
 # If no arguments are given to this macro, and no doxygen 
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the DOXYGEN variable precious to Autoconf. You can 
 # use the DOXYGEN variable in your Makefile.in files with 
 # @DOXYGEN@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -29,4 +27,4 @@ ifelse([$1],,
 [if test -z "$DOXYGEN"; then
   AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_DOXYGEN
diff --git a/sql/m4/ac_prog_try_doxygen.m4 b/sql/m4/ac_prog_try_doxygen.m4
index 8b5ef2a..06b39ab 100644
--- a/sql/m4/ac_prog_try_doxygen.m4
+++ b/sql/m4/ac_prog_try_doxygen.m4
@@ -7,16 +7,14 @@
 # If no arguments are given to this macro, and no doxygen 
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the DOXYGEN variable precious to Autoconf. You can 
 # use the DOXYGEN variable in your Makefile.in files with 
 # @DOXYGEN@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -29,4 +27,4 @@ ifelse([$1],,
 [if test -z "$DOXYGEN"; then
   AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_DOXYGEN
diff --git a/xflaim/m4/ac_prog_try_csc.m4 b/xflaim/m4/ac_prog_try_csc.m4
index f9290d7..183e31b 100644
--- a/xflaim/m4/ac_prog_try_csc.m4
+++ b/xflaim/m4/ac_prog_try_csc.m4
@@ -9,16 +9,14 @@
 # If no arguments are given to this macro, and no CSharp
 # compiler can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the CSC variable precious to Autoconf. You can 
 # use the CSC variable in your Makefile.in files with 
 # @CSC@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -31,4 +29,4 @@ ifelse([$1],,
 [if test -z "$CSC"; then
   AC_MSG_WARN([CSharp compiler not found - continuing without CSharp])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_CSC
diff --git a/xflaim/m4/ac_prog_try_csvm.m4 b/xflaim/m4/ac_prog_try_csvm.m4
index f2001c2..4c5c96e 100644
--- a/xflaim/m4/ac_prog_try_csvm.m4
+++ b/xflaim/m4/ac_prog_try_csvm.m4
@@ -6,16 +6,14 @@
 # If no arguments are given to this macro, and no CSharp virtual
 # machine can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the CSVM variable precious to Autoconf. You can 
 # use the CSVM variable in your Makefile.in files with 
 # @CSVM@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -28,4 +26,4 @@ ifelse([$1],,
 [if test -z "$CSVM"; then
   AC_MSG_WARN([CSharp VM not found - continuing without CSharp VM])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_CSVM
diff --git a/xflaim/m4/ac_prog_try_doxygen.m4 b/xflaim/m4/ac_prog_try_doxygen.m4
index 8b5ef2a..06b39ab 100644
--- a/xflaim/m4/ac_prog_try_doxygen.m4
+++ b/xflaim/m4/ac_prog_try_doxygen.m4
@@ -7,16 +7,14 @@
 # If no arguments are given to this macro, and no doxygen 
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the DOXYGEN variable precious to Autoconf. You can 
 # use the DOXYGEN variable in your Makefile.in files with 
 # @DOXYGEN@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -29,4 +27,4 @@ ifelse([$1],,
 [if test -z "$DOXYGEN"; then
   AC_MSG_WARN([Doxygen program not found - continuing without Doxygen])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_DOXYGEN
diff --git a/xflaim/m4/ac_prog_try_jar.m4 b/xflaim/m4/ac_prog_try_jar.m4
index 2c15cb3..40e32d9 100644
--- a/xflaim/m4/ac_prog_try_jar.m4
+++ b/xflaim/m4/ac_prog_try_jar.m4
@@ -6,16 +6,14 @@
 # If no arguments are given to this macro, and no Java jar
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the JAR variable precious to Autoconf. You can 
 # use the JAR variable in your Makefile.in files with 
 # @JAR@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -28,4 +26,4 @@ ifelse([$1],,
 [if test -z "$JAR"; then
   AC_MSG_WARN([Java ARchive program not found - continuing without jar])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_JAR
diff --git a/xflaim/m4/ac_prog_try_java.m4 b/xflaim/m4/ac_prog_try_java.m4
index 91e102f..b211596 100644
--- a/xflaim/m4/ac_prog_try_java.m4
+++ b/xflaim/m4/ac_prog_try_java.m4
@@ -6,16 +6,14 @@
 # If no arguments are given to this macro, and no java virtual
 # machine can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the JAVA variable precious to Autoconf. You can 
 # use the JAVA variable in your Makefile.in files with 
 # @JAVA@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -28,4 +26,4 @@ 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])])
-])
+])# AC_PROG_TRY_JAVA
diff --git a/xflaim/m4/ac_prog_try_javac.m4 b/xflaim/m4/ac_prog_try_javac.m4
index 0db5cf9..57b1fa5 100644
--- a/xflaim/m4/ac_prog_try_javac.m4
+++ b/xflaim/m4/ac_prog_try_javac.m4
@@ -6,16 +6,14 @@
 # If no arguments are given to this macro, and no Java
 # compiler can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the JAVAC variable precious to Autoconf. You can 
 # use the JAVAC variable in your Makefile.in files with 
 # @JAVAC@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -28,4 +26,4 @@ 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])])
-])
+])# AC_PROG_TRY_JAVAC
diff --git a/xflaim/m4/ac_prog_try_javadoc.m4 b/xflaim/m4/ac_prog_try_javadoc.m4
index 92243ce..40a990c 100644
--- a/xflaim/m4/ac_prog_try_javadoc.m4
+++ b/xflaim/m4/ac_prog_try_javadoc.m4
@@ -6,16 +6,14 @@
 # If no arguments are given to this macro, and no javadoc 
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the JAVADOC variable precious to Autoconf. You can 
 # use the JAVADOC variable in your Makefile.in files with 
 # @JAVADOC@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -28,4 +26,4 @@ ifelse([$1],,
 [if test -z "$JAVADOC"; then
   AC_MSG_WARN([Javadoc program not found - continuing without javadoc])
 fi], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_JAVADOC
diff --git a/xflaim/m4/ac_prog_try_javah.m4 b/xflaim/m4/ac_prog_try_javah.m4
index a393297..63cbe0a 100644
--- a/xflaim/m4/ac_prog_try_javah.m4
+++ b/xflaim/m4/ac_prog_try_javah.m4
@@ -6,16 +6,14 @@
 # If no arguments are given to this macro, and no javah
 # program can be found, it prints a warning message to STDOUT
 # and to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed.
+# then only the normal "check" line is displayed. Any other
+# argument is considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the JAVAH variable precious to Autoconf. You can 
 # use the JAVAH variable in your Makefile.in files with 
 # @JAVAH@.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -28,4 +26,4 @@ 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])])
-])
+])# AC_PROG_TRY_JAVAH
diff --git a/xflaim/m4/ac_prog_try_jni.m4 b/xflaim/m4/ac_prog_try_jni.m4
index a90fab9..facdead 100644
--- a/xflaim/m4/ac_prog_try_jni.m4
+++ b/xflaim/m4/ac_prog_try_jni.m4
@@ -13,16 +13,14 @@
 # these programs cannot be found, it prints a warning 
 # message to STDOUT and to the config.log file. If the 
 # "quiet" argument is passed, then only the normal 
-# "check" line is displayed.
+# "check" line is displayed. Any other argument is 
+# considered by autoconf to be an error at expansion
+# time.
 #
 # Makes the JAVAC, JAVAH, and JAR variables precious to
 # Autoconf. You can use these variables in your Makefile.in
 # files with @JAVAC@, @JAVAH@, and @JAR@, respectively.
 #
-# NOTE: Currently, passing any value in the first argument has 
-#       the same effect as passing "quiet", however, you should
-#       not rely on this, as all other words are reserved.
-#
 # Author:   John Calcote <john.calcote@gmail.com>
 # Modified: 2009-04-27
 # License:  AllPermissive
@@ -40,4 +38,4 @@ 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], [$1], [quiet],, [m4_fatal([Invalid option '$1' in $0])])
-])
+])# AC_PROG_TRY_JNI