Author: jfclere
Date: Thu Apr 27 00:46:04 2006
New Revision: 397469
URL: http://svn.apache.org/viewcvs?rev=397469&view=rev
Log:
Allow to compile on MAC OS X (Darwin).
Modified:
tomcat/connectors/trunk/jni/native/build/tcnative.m4
tomcat/connectors/trunk/jni/native/configure.in
Modified: tomcat/connectors/trunk/jni/native/build/tcnative.m4
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/build/tcnative.m4?rev=397469&r1=397468&r2=397469&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/build/tcnative.m4 (original)
+++ tomcat/connectors/trunk/jni/native/build/tcnative.m4 Thu Apr 27 00:46:04
2006
@@ -177,17 +177,18 @@
],
[
AC_MSG_CHECKING(os_type directory)
- if test -f ${JAVA_HOME}/include/jni_md.h; then
+ JAVA_OS=NONE
+ if test -f ${JAVA_HOME}/${JAVA_INC}/jni_md.h; then
JAVA_OS=""
else
- for f in ${JAVA_HOME}/include/*/jni_md.h; do
+ for f in ${JAVA_HOME}/${JAVA_INC}/*/jni_md.h; do
if test -f $f; then
JAVA_OS=`dirname ${f}`
JAVA_OS=`basename ${JAVA_OS}`
echo " ${JAVA_OS}"
fi
done
- if test -z "${JAVA_OS}"; then
+ if test "${JAVA_OS}" = "NONE"; then
AC_MSG_RESULT(Cannot find jni_md.h in ${JAVA_HOME}/${OS})
AC_MSG_ERROR(You should retry --with-os-type=SUBDIR)
fi
Modified: tomcat/connectors/trunk/jni/native/configure.in
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/configure.in?rev=397469&r1=397468&r2=397469&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/configure.in (original)
+++ tomcat/connectors/trunk/jni/native/configure.in Thu Apr 27 00:46:04 2006
@@ -91,13 +91,24 @@
dnl
TCN_FIND_JDK
TCN_SABLEVM
-APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include])
+
+dnl MAC OS X does not used include but Headers
+if test -d ${JAVA_HOME}/Headers; then
+ JAVA_INC=Headers
+else
+ JAVA_INC=include
+fi
+APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC])
dnl sableVM does not have/need $JAVA_OS/jni_md.h
if test "$SABLEVM" = "NONE"
then
TCN_FIND_JDK_OS
- APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS])
+ if test -z "${JAVA_OS}"; then
+ AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
+ else
+ APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/$JAVA_INC/$JAVA_OS])
+ fi
fi
AC_SUBST(JAVA_HOME)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
