pier 01/09/16 16:54:20
Modified: webapp/support apjava.m4
Log:
Correctly discover Java binaries if JAVA_ENABLED is set to "true"
Revision Changes Path
1.11 +36 -16 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apjava.m4 2001/09/15 23:33:46 1.10
+++ apjava.m4 2001/09/16 23:54:20 1.11
@@ -57,7 +57,7 @@
dnl --------------------------------------------------------------------------
dnl Author Pier Fumagalli <[EMAIL PROTECTED]>
-dnl Version $Id: apjava.m4,v 1.10 2001/09/15 23:33:46 pier Exp $
+dnl Version $Id: apjava.m4,v 1.11 2001/09/16 23:54:20 pier Exp $
dnl --------------------------------------------------------------------------
dnl --------------------------------------------------------------------------
@@ -72,13 +72,13 @@
specified its value will be inherited from the
JAVA_HOME environment variable).],
[
- case "${withval}" in
- yes|YES|true|TRUE)
- JAVA_ENABLE="TRUE"
+ case "${enableval}" in
+ ""|"yes"|"YES"|"true"|"TRUE")
+ JAVA_ENABLE="true"
;;
*)
- JAVA_ENABLE="TRUE"
- JAVA_HOME="${withval}"
+ JAVA_ENABLE="true"
+ JAVA_HOME="${enableval}"
;;
esac
@@ -87,12 +87,10 @@
if ${TEST} ! -z "${JAVA_HOME}"
then
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"
+ JAVA_ENABLE="false"
AC_MSG_RESULT([no])
]
)
@@ -107,12 +105,19 @@
dnl retrieved from the JAVACFLAGS environment variable and checked.
dnl --------------------------------------------------------------------------
AC_DEFUN([JAVA_JAVAC],[
- if ${TEST} -z "${JAVA_HOME}"
+ if ${TEST} "${JAVA_ENABLE}" = "false"
then
JAVAC=""
JAVACFLAGS=""
else
- LOCAL_CHECK_PROG(JAVAC,javac,"${JAVA_HOME}/bin")
+ if ${TEST} -n "${JAVA_HOME}"
+ then
+ local_path="${JAVA_HOME}/bin"
+ else
+ local_path=""
+ fi
+ LOCAL_CHECK_PROG(JAVAC,javac,"${local_path}")
+ unset local_path
AC_CACHE_CHECK([wether the Java compiler (${JAVAC}) works],
ap_cv_prog_javac_works,[
@@ -127,7 +132,8 @@
AC_MSG_RESULT(no)
AC_MSG_ERROR([${JAVAC} cannot compile])
fi
- ])
+ ]
+ )
fi
AC_SUBST(JAVAC)
AC_SUBST(JAVACFLAGS)
@@ -139,11 +145,18 @@
dnl the binary name in the JAR environment variable.
dnl --------------------------------------------------------------------------
AC_DEFUN([JAVA_JAR],[
- if ${TEST} -z "${JAVA_HOME}"
+ if ${TEST} "${JAVA_ENABLE}" = "false"
then
JAR=""
else
- LOCAL_CHECK_PROG(JAR,jar,"${JAVA_HOME}/bin")
+ if ${TEST} -n "${JAVA_HOME}"
+ then
+ local_path="${JAVA_HOME}/bin"
+ else
+ local_path=""
+ fi
+ LOCAL_CHECK_PROG(JAR,jar,"${local_path}")
+ unset local_path
fi
AC_SUBST(JAR)
])
@@ -154,11 +167,18 @@
dnl Exports the binary name in the JAR environment variable.
dnl --------------------------------------------------------------------------
AC_DEFUN([JAVA_JAVADOC],[
- if ${TEST} -z "${JAVA_HOME}"
+ if ${TEST} "${JAVA_ENABLE}" = "false"
then
JAVADOC=""
else
- LOCAL_CHECK_PROG(JAVADOC,javadoc,"${JAVA_HOME}/bin")
+ if ${TEST} -n "${JAVA_HOME}"
+ then
+ local_path="${JAVA_HOME}/bin"
+ else
+ local_path=""
+ fi
+ LOCAL_CHECK_PROG(JAVADOC,javadoc,"${local_path}")
+ unset local_path
fi
AC_SUBST(JAVADOC)
])
