Updated doxyfiles to use proper top_srcdir macro in INPUT field. Updated macro files to display one-line messages. Other minor details.

git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1091 0109f412-320b-0410-ab79-c3e0c5ffbbe6

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([flaim-projects],[1.0])
+AC_INIT([flaim-projects], [1.0])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 LT_PREREQ([2.2])
 LT_INIT([dlopen])

flaim/m4/ac_prog_try_doxygen.m4

@@ -1,21 +1,24 @@
-# AC_PROG_TRY_DOXYGEN([quiet])
-# ----------------------------
+# AC_PROG_TRY_DOXYGEN(["quiet"])
+# ------------------------------
 # AC_PROG_TRY_DOXYGEN tests for an existing doxygen source
 # documentation program. It sets or uses the environment 
 # variable DOXYGEN. 
 #
 # If no arguments are given to this macro, and no doxygen 
-# program can be found, it prints a very visible message 
-# to STDOUT and to the config.log file. If the "quiet" 
-# argument is passed, then only the normal "check" line
-# is displayed. (Technically, any passing any value in 
-# the first argument has the same effect as "quiet".)
+# 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.
 #
-# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in
-# your Makefile.in files with @DOXYGEN@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
@@ -24,10 +27,6 @@ AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No Doxygen program found - continuing
-   without Doxygen documentation support.
-  -----------------------------------------])
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
 fi])dnl
 ])

ftk/configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([FTK],[1.2],[flaim-users@forge.novell.com])
+AC_INIT([FTK], [1.2], [flaim-users@forge.novell.com])
 AM_INIT_AUTOMAKE([-Wall -Werror])
 LT_PREREQ([2.2])
 LT_INIT([dlopen])

ftk/m4/ac_prog_try_doxygen.m4

@@ -1,21 +1,24 @@
-# AC_PROG_TRY_DOXYGEN([quiet])
-# ----------------------------
+# AC_PROG_TRY_DOXYGEN(["quiet"])
+# ------------------------------
 # AC_PROG_TRY_DOXYGEN tests for an existing doxygen source
 # documentation program. It sets or uses the environment 
 # variable DOXYGEN. 
 #
 # If no arguments are given to this macro, and no doxygen 
-# program can be found, it prints a very visible message 
-# to STDOUT and to the config.log file. If the "quiet" 
-# argument is passed, then only the normal "check" line
-# is displayed. (Technically, any passing any value in 
-# the first argument has the same effect as "quiet".)
+# 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.
 #
-# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in
-# your Makefile.in files with @DOXYGEN@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
@@ -24,10 +27,6 @@ AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No Doxygen program found - continuing
-   without Doxygen documentation support.
-  -----------------------------------------])
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
 fi])dnl
 ])

sql/configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([SQLFLAIM],[6.0],[flaim-users@forge.novell.com])
+AC_INIT([SQLFLAIM], [6.0], [flaim-users@forge.novell.com])
 AM_INIT_AUTOMAKE([-Wall -Werror])
 LT_PREREQ([2.2])
 LT_INIT([dlopen])

sql/m4/ac_prog_try_doxygen.m4

@@ -1,21 +1,24 @@
-# AC_PROG_TRY_DOXYGEN([quiet])
-# ----------------------------
+# AC_PROG_TRY_DOXYGEN(["quiet"])
+# ------------------------------
 # AC_PROG_TRY_DOXYGEN tests for an existing doxygen source
 # documentation program. It sets or uses the environment 
 # variable DOXYGEN. 
 #
 # If no arguments are given to this macro, and no doxygen 
-# program can be found, it prints a very visible message 
-# to STDOUT and to the config.log file. If the "quiet" 
-# argument is passed, then only the normal "check" line
-# is displayed. (Technically, any passing any value in 
-# the first argument has the same effect as "quiet".)
+# 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.
 #
-# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in
-# your Makefile.in files with @DOXYGEN@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
@@ -24,10 +27,6 @@ AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No Doxygen program found - continuing
-   without Doxygen documentation support.
-  -----------------------------------------])
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
 fi])dnl
 ])

xflaim/configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.62])
-AC_INIT([XFLAIM],[5.2],[flaim-users@forge.novell.com])
+AC_INIT([XFLAIM], [5.2], [flaim-users@forge.novell.com])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([-Wall -Werror])
 LT_PREREQ([2.2])

xflaim/m4/ac_prog_try_csc.m4

@@ -1,21 +1,26 @@
-# AC_PROG_TRY_CSC([quiet])
-# ------------------------
-# AC_PROG_TRY_CSC looks for an existing CSharp compiler. If the 
-# CSC variable is empty, it checks for a Mono CSharp compiler
-# and then for a Microsoft CSharp compiler.
+# AC_PROG_TRY_CSC(["quiet"])
+# --------------------------
+# AC_PROG_TRY_CSC tests for an existing CSharp compiler. It sets
+# or uses the environment variable CSC.
 #
-# If no arguments are given to this macro, and no CSharp compiler
-# can be found, it prints a very visible message to STDOUT and to
-# the config.log file. If the "quiet" argument is passed, then 
-# only the normal "check" line is displayed. (Technically, any 
-# passing any value in the first argument has the same effect as
-# passing "quiet".)
+# It checks for a Mono CSharp compiler (msc) and then for a 
+# Microsoft CSharp compiler (csc).
 #
-# Makes CSC precious to Autoconf. You can use CSC variable in
-# your Makefile.in with @CSC@.
+# 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.
+#
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_CSC],
@@ -24,10 +29,6 @@ AC_ARG_VAR([CSC], [CSharp compiler])dnl
 AC_CHECK_PROGS([CSC], [mcs$EXEEXT csc$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$CSC"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No CSharp compiler found - continuing
-   without CSHARP compiler support.
-  -----------------------------------------])
+  AC_MSG_WARN([No CSharp compiler found - continuing without CSharp support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_csvm.m4

@@ -1,22 +1,23 @@
-# AC_PROG_TRY_CSVM([quiet])
-# -------------------------
-# AC_PROG_TRY_CSVM looks for an existing CSharp virtual machine. 
-# If the CSVM environment variable is not already set, it looks
-# in the system path for a program named mono, and then for one
-# named cs (the Microsoft CSharp VM).
+# AC_PROG_TRY_CSVM(["quiet"])
+# ---------------------------
+# AC_PROG_TRY_CSVM tests for an existing CSharp virtual machine. 
+# It sets or uses the environment variable CSVM.
 #
-# If no arguments are given to this macro, and no CSharp VM can
-# be found, it prints a very visible message to STDOUT and to 
-# the config.log file. If the "quiet" argument is passed, then
-# only the normal "check" line is displayed. (Technically, any
-# passing any value in the first argument has the same effect 
-# as "quiet".)
+# 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.
 #
-# Makes CSVM precious to Autoconf. You can use CSVM in your 
-# Makefile.in with @CSVM@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_CSVM],
@@ -25,10 +26,6 @@ AC_ARG_VAR([CSVM], [CSharp virtual machine])dnl
 AC_CHECK_PROGS([CSVM], [mono$EXEEXT cs$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$CSVM"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No CSharp VM found - continuing without
-   CSharp Virtual Machine support.
-  -----------------------------------------])
+  AC_MSG_WARN([No CSharp virtual machine found - continuing without CSVM support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_doxygen.m4

@@ -1,21 +1,24 @@
-# AC_PROG_TRY_DOXYGEN([quiet])
-# ----------------------------
+# AC_PROG_TRY_DOXYGEN(["quiet"])
+# ------------------------------
 # AC_PROG_TRY_DOXYGEN tests for an existing doxygen source
 # documentation program. It sets or uses the environment 
 # variable DOXYGEN. 
 #
 # If no arguments are given to this macro, and no doxygen 
-# program can be found, it prints a very visible message 
-# to STDOUT and to the config.log file. If the "quiet" 
-# argument is passed, then only the normal "check" line
-# is displayed. (Technically, any passing any value in 
-# the first argument has the same effect as "quiet".)
+# 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.
 #
-# Makes DOXYGEN precious to Autoconf. You can use DOXYGEN in
-# your Makefile.in files with @DOXYGEN@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_DOXYGEN],
@@ -24,10 +27,6 @@ AC_ARG_VAR([DOXYGEN], [Doxygen source doc generation program])dnl
 AC_CHECK_PROGS([DOXYGEN], [doxygen$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$DOXYGEN"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No Doxygen program found - continuing
-   without Doxygen documentation support.
-  -----------------------------------------])
+  AC_MSG_WARN([Doxygen program not found - continuing without Doxygen support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_jar.m4

@@ -1,21 +1,23 @@
-# AC_PROG_TRY_JAR([quiet])
-# ------------------------
-# AC_PROG_TRY_JAR tests for an existing jar program. If the JAR
-# environment variable is empty, then it searches for a jar program
-# in the system search path.
+# AC_PROG_TRY_JAR(["quiet"])
+# --------------------------
+# AC_PROG_TRY_JAR tests for an existing Java ARchive program.i
+# It sets or uses the environment variable JAR.
 #
-# If no arguments are given to this macro, and no jar program 
-# can be found, it prints a very visible message to STDOUT and
-# to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed. (Technically, 
-# any passing any value in the first argument has the same effect 
-# as passing "quiet".)
+# 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.
 #
-# Makes JAR precious to Autoconf. You can use JAR in your
-# Makefile.in files with @JAR@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAR],
@@ -24,10 +26,6 @@ AC_ARG_VAR([JAR], [Java archive utility])dnl
 AC_CHECK_PROGS([JAR], [jar$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$JAR"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No Java jar utility found - continuing
-   without Java Archive support.
-  -----------------------------------------])
+  AC_MSG_WARN([No Java jar utility found - continuing without Java jar support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_java.m4

@@ -1,21 +1,23 @@
-# AC_PROG_TRY_JAVA([quiet])
-# -------------------------
-# AC_PROG_TRY_JAVA looks for an existing JAVA virtual machine. If 
-# the JAVA environment variable is empty, it searches the system 
-# path for a java program.
+# AC_PROG_TRY_JAVA(["quiet"])
+# ---------------------------
+# AC_PROG_TRY_JAVA test for an existing JAVA virtual machine.
+# It uses or sets the environment variable JAVA.
 #
 # If no arguments are given to this macro, and no java virtual
-# machine can be found, it prints a very visible message to STDOUT
-# and to the config.log file. If the "quiet" argument is passed,
-# then only the normal "check" line is displayed. (Technically, 
-# any passing any value in the first argument has the same effect
-# as "quiet".)
+# 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.
 #
-# Makes JAVA precious to Autoconf. You can use the JAVA variable
-# in your Makefile.in files with @JAVA@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVA],
@@ -24,10 +26,6 @@ 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 Doxygen program found - continuing
-   without Doxygen documentation support.
-  -----------------------------------------])
+  AC_MSG_WARN([No Java virtual machine found - continuing without JVM support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_javac.m4

@@ -1,21 +1,23 @@
-# AC_PROG_TRY_JAVAC([quiet])
-# --------------------------
-# AC_PROG_TRY_JAVAC looks for an existing Java compiler. If the
-# JAVAC environment variable is not set, it searches the system 
-# path for a Java compiler, beginning with the free ones.
+# AC_PROG_TRY_JAVAC(["quiet"])
+# ----------------------------
+# AC_PROG_TRY_JAVAC tests for an existing Java compiler. It uses
+# or sets the environment variable JAVAC.
 #
-# If no arguments are given to this macro, and no Java compiler
-# can be found, it prints a very visible message to STDOUT and 
-# to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed. (Technically,
-# any passing any value in the first argument has the same effect
-# as "quiet".)
+# 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.
 #
-# Makes JAVAC precious to Autoconf. You can use the JAVAC 
-# variable in your Makefile.in files with @JAVAC@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVAC],
@@ -24,10 +26,6 @@ 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 compiler support.
-  -----------------------------------------])
+  AC_MSG_WARN([No Java compiler found - continuing without Java support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_javadoc.m4

@@ -1,21 +1,23 @@
-# AC_PROG_TRY_JAVADOC([quiet])
-# ----------------------------
+# AC_PROG_TRY_JAVADOC(["quiet"])
+# ------------------------------
 # AC_PROG_TRY_JAVADOC tests for an existing javadoc generator.
-# If the JAVADOC environment variable is not set, it searches the
-# system path to find it. 
+# It uses or sets the environment variable JAVADOC.
 #
-# If no arguments are given to this macro, and no doxygen 
-# program can be found, it prints a very visible message 
-# to STDOUT and to the config.log file. If the "quiet" 
-# argument is passed, then only the normal "check" line
-# is displayed. (Technically, any passing any value in 
-# the first argument has the same effect as "quiet".)
+# 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.
 #
-# Makes JAVADOC precious to Autoconf. You can use the JAVADOC 
-# variable in your Makefile.in files with @JAVADOC@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVADOC],
@@ -24,10 +26,6 @@ AC_ARG_VAR([JAVADOC], [Java source documentation utility])dnl
 AC_CHECK_PROGS([JAVADOC], [javadoc$EXEEXT])
 m4_ifvaln([$1],,
 [if test -z "$JAVADOC"; then
-  AC_MSG_WARN([
-  -----------------------------------------
-   No javadoc program found - continuing
-   without javadoc documentation support.
-  -----------------------------------------])
+  AC_MSG_WARN([No javadoc program found - continuing without javadoc support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_javah.m4

@@ -1,21 +1,23 @@
-# AC_PROG_TRY_JAVAH([quiet])
-# --------------------------
-# AC_PROG_TRY_JAVAH looks for an existing Java native header (JNI)
-# generator. If the JAVAH environment variable is not set, it looks
-# in the system path for a javah program. 
+# AC_PROG_TRY_JAVAH(["quiet"])
+# ----------------------------
+# AC_PROG_TRY_JAVAH tests for an existing Java native header (JNI)
+# generator. It uses or sets the environment variable JAVAH.
 #
-# If no arguments are given to this macro, and no javah program
-# can be found, it prints a very visible message to STDOUT and 
-# to the config.log file. If the "quiet" argument is passed, 
-# then only the normal "check" line is displayed. (Technically, 
-# any passing any value in the first argument has the same effect
-# as "quiet".)
+# 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.
 #
-# Makes JAVAH precious to Autoconf. You can use the JAVAH
-# variable in your Makefile.in files with @JAVAH@.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JAVAH],
@@ -25,10 +27,6 @@ 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
-   without Java Header utility support.
-  -----------------------------------------])
+  AC_MSG_WARN([No javah utility found - continuing wihtout javah support])
 fi])dnl
 ])

xflaim/m4/ac_prog_try_jni.m4

@@ -1,24 +1,30 @@
-# AC_PROG_TRY_JNI([quiet])
-# ------------------------
+# AC_PROG_TRY_JNI(["quiet"])
+# --------------------------
 # AC_PROG_TRY_JNI tests for the existence of the three
 # tools required to build Java Native Interface (JNI) 
-# modules: javac, javah, and jar
+# modules: javac, javah, and jar. It manages the
+# environment variable ac_prog_have_jni.
 #
-# If one or more of the tools are not found, and the "quiet"
-# parameter was not passed, then it prints a very visible 
-# message to STDOUT and to the log file indicating that the
-# build process will continue without JNI support.
+# If all three tools are present, then the 
+# ac_prog_have_jni environment variable is set to 'yes', 
+# otherwise it's set to 'no'.
 #
-# In the process, the JAVAC, JAVAH and JAR environment 
-# variables are made precious to Autoconf. You can use them 
-# in your Makefile.in files with @JAVAC@, @JAVAH@ and @JAR@.
+# If no arguments are given to this macro, and any of
+# 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.
 #
-# If all three tools are present, then the ac_prog_have_jni
-# environment variable is set to 'yes', otherwise it's set to
-# 'no'.
+# 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-22
+# Modified: 2009-04-23
 # License:  AllPermissive
 #
 AC_DEFUN([AC_PROG_TRY_JNI],
@@ -32,11 +38,6 @@ 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 Java Native Interface
-   tools missing - continuing without 
-   project JNI support.
-  -----------------------------------------])
+  AC_MSG_WARN([Some required JNI tools are missing - continuing without JNI support])
 fi])dnl
 ])

xflaim/src/cs/wrapper/Makefile.am

@@ -65,8 +65,8 @@ install-data-local:
 	$(INSTALL_DATA) xflaim_csharp.xml "$(DESTDIR)$(docdir)"
 
 uninstall-local:
-	rm "$(DESTDIR)$(libdir)/xflaim_csharp.dll"
-	rm "$(DESTDIR)$(docdir)/xflaim_csharp.xml"
+	rm -f "$(DESTDIR)$(libdir)/xflaim_csharp.dll"
+	rm -f "$(DESTDIR)$(docdir)/xflaim_csharp.xml"
 
 xflaim_csharp.dll: $(xfcs_sources)
 	@list1='$+'; list2=; if test -n "$$list1"; then \