You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/09/10 05:32:58 UTC
cvs commit: jakarta-tomcat-connectors/webapp/support apjava.m4
pier 01/09/09 20:32:58
Modified: webapp/support apjava.m4
Log:
Build modifications: Function prototype names for JAVA changed (now in line
with local function names).
Revision Changes Path
1.8 +11 -10 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apjava.m4 2001/08/06 20:18:26 1.7
+++ apjava.m4 2001/09/10 03:32:58 1.8
@@ -57,10 +57,10 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <pi...@sun.com>
-dnl Version $Id: apjava.m4,v 1.7 2001/08/06 20:18:26 pier Exp $
+dnl Version $Id: apjava.m4,v 1.8 2001/09/10 03:32:58 pier Exp $
dnl --------------------------------------------------------------------------
-AC_DEFUN([AP_PROG_JAVAC_WORKS],[
+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
@@ -77,18 +77,18 @@
])
])
-AC_DEFUN([AP_PROG_JAVAC],[
+AC_DEFUN([JAVA_JAVAC],[
AC_PATH_PROG(JAVAC,javac,
AC_MSG_ERROR([javac not found]),
${JAVA_HOME}/bin:${PATH}
)
- AP_PROG_JAVAC_WORKS()
+ JAVA_JAVAC_WORKS()
AC_PROVIDE([$0])
AC_SUBST(JAVAC)
AC_SUBST(JAVACFLAGS)
])
-AC_DEFUN([AP_PROG_JAR],[
+AC_DEFUN([JAVA_JAR],[
AC_PATH_PROG(JAR,jar,
AC_MSG_ERROR([jar not found]),
${JAVA_HOME}/bin:${PATH})
@@ -96,12 +96,13 @@
AC_SUBST(JAR)
])
-AC_DEFUN([AP_JAVA],[
+AC_DEFUN([JAVA_CHECK],[
AC_MSG_CHECKING([Java support])
- AC_ARG_WITH(java,
- [ --with-java[=JAVA_HOME] Build Java sources. If JAVA_HOME is not specified
- its value will be inherited from the JAVA_HOME
- environment variable ],
+ 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)