pier 01/09/14 21:43:40
Modified: webapp/support apjava.m4
Log:
Added JAVADOC and documentation to AutoConf's JAVA macros.
Revision Changes Path
1.9 +87 -52 jakarta-tomcat-connectors/webapp/support/apjava.m4
Index: apjava.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/apjava.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apjava.m4 2001/09/10 03:32:58 1.8
+++ apjava.m4 2001/09/15 04:43:40 1.9
@@ -57,72 +57,107 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
-dnl Version $Id: apjava.m4,v 1.8 2001/09/10 03:32:58 pier Exp $
+dnl Version $Id: apjava.m4,v 1.9 2001/09/15 04:43:40 pier Exp $
dnl --------------------------------------------------------------------------
-AC_DEFUN([JAVA_JAVAC_WORKS],[
- AC_CACHE_CHECK([wether the Java compiler (${JAVAC}) works],
- ap_cv_prog_javac_works,[
- echo "public class Test {}" > Test.java
- ${JAVAC} ${JAVACFLAGS} Test.java > /dev/null 2>&1
- if ${TEST} $? -eq 0
+dnl --------------------------------------------------------------------------
+dnl JAVA_INIT
+dnl Check if --enable-java was specified and discovers JAVA_HOME.
+dnl --------------------------------------------------------------------------
+AC_DEFUN([JAVA_INIT],[
+ AC_MSG_CHECKING([for java support])
+ AC_ARG_ENABLE(java,
+ [ --enable-java[=JAVA_HOME] enable Java compilation (if JAVA_HOME is not
+ specified its value will be inherited from the
+ JAVA_HOME environment variable).],
+ [
+ case "${withval}" in
+ yes|YES|true|TRUE)
+ JAVA_ENABLE="TRUE"
+ ;;
+ *)
+ JAVA_ENABLE="TRUE"
+ JAVA_HOME="${withval}"
+ ;;
+ esac
+
+ AC_MSG_RESULT([yes])
+
+ if ${TEST} ! -z "${JAVA_HOME}"
then
- rm -f Test.java Test.class
- ap_cv_prog_javac_works=yes
- else
- rm -f Test.java Test.class
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([${JAVAC} cannot compile])
+ LOCAL_RESOLVEDIR(JAVA_HOME,${JAVA_HOME},[java home directory])
+ AC_MSG_RESULT([error])
+ AC_MSG_ERROR([java home not specified and not found in environment])
fi
+
+ ],[
+ JAVA_ENABLE="FALSE"
+ AC_MSG_RESULT([no])
])
+ AC_SUBST(JAVA_ENABLE)
+ AC_SUBST(JAVA_HOME)
])
+dnl --------------------------------------------------------------------------
+dnl JAVA_JAVAC
+dnl Checks wether we can find and use a Java Compiler or not. Exports the
+dnl binary name in the JAVAC environment variable. Compilation flags are
+dnl retrieved from the JAVACFLAGS environment variable and checked.
+dnl --------------------------------------------------------------------------
AC_DEFUN([JAVA_JAVAC],[
- AC_PATH_PROG(JAVAC,javac,
- AC_MSG_ERROR([javac not found]),
- ${JAVA_HOME}/bin:${PATH}
- )
- JAVA_JAVAC_WORKS()
- AC_PROVIDE([$0])
+ if ${TEST} -z "${JAVA_HOME}"
+ then
+ JAVAC=""
+ JAVACFLAGS=""
+ else
+ LOCAL_CHECK_PROG(JAVAC,javac,"${JAVA_HOME}/bin")
+
+ AC_CACHE_CHECK([wether the Java compiler (${JAVAC}) works],
+ ap_cv_prog_javac_works,[
+ echo "public class Test {}" > Test.java
+ ${JAVAC} ${JAVACFLAGS} Test.java > /dev/null 2>&1
+ if ${TEST} $? -eq 0
+ then
+ rm -f Test.java Test.class
+ ap_cv_prog_javac_works=yes
+ else
+ rm -f Test.java Test.class
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([${JAVAC} cannot compile])
+ fi
+ ])
+ fi
AC_SUBST(JAVAC)
AC_SUBST(JAVACFLAGS)
])
+dnl --------------------------------------------------------------------------
+dnl JAVA_JAR
+dnl Checks wether we can find and use a Java Archieve Tool (JAR). Exports
+dnl the binary name in the JAR environment variable.
+dnl --------------------------------------------------------------------------
AC_DEFUN([JAVA_JAR],[
- AC_PATH_PROG(JAR,jar,
- AC_MSG_ERROR([jar not found]),
- ${JAVA_HOME}/bin:${PATH})
- AC_PROVIDE([$0])
+ if ${TEST} -z "${JAVA_HOME}"
+ then
+ JAR=""
+ else
+ LOCAL_CHECK_PROG(JAR,jar,"${JAVA_HOME}/bin")
+ fi
AC_SUBST(JAR)
])
-AC_DEFUN([JAVA_CHECK],[
- AC_MSG_CHECKING([Java support])
- AC_ARG_ENABLE(java,
- [ --enable-java[=JAVA_HOME]
- enable Java compilation (if JAVA_HOME is not
- specified its value will be inherited from the
- JAVA_HOME environment variable).],
- [
- case "${withval}" in
- yes|YES|true|TRUE)
- AC_MSG_RESULT([${JAVA_HOME}])
- ;;
- *)
- JAVA_HOME="${withval}"
- AC_MSG_RESULT([${JAVA_HOME}])
- ;;
- esac
- if ${TEST} ! -d "${JAVA_HOME}"
- then
- AC_MSG_ERROR([${JAVA_HOME} is not a directory])
- fi
- JAVA_ENABLE="true"
- AC_SUBST(JAVA_HOME)
- AC_SUBST(JAVA_ENABLE)
- ],[
- AC_MSG_RESULT([disabled])
- JAVA_ENABLE="false"
- AC_SUBST(JAVA_ENABLE)
- ])
+dnl --------------------------------------------------------------------------
+dnl JAVA_JAVADOC
+dnl Checks wether we can find and use a Java Documentation Tool (JAVADOC).
+dnl Exports the binary name in the JAR environment variable.
+dnl --------------------------------------------------------------------------
+AC_DEFUN([JAVA_JAVADOC],[
+ if ${TEST} -z "${JAVA_HOME}"
+ then
+ JAVADOC=""
+ else
+ LOCAL_CHECK_PROG(JAVADOC,javadoc,"${JAVA_HOME}/bin")
+ fi
+ AC_SUBST(JAVADOC)
])
+
