tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfcl...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/build tcnative.m4
Date Mon, 22 Aug 2005 20:30:18 GMT
jfclere     2005/08/22 13:30:18

  Modified:    jni/native configure.in
               jni/native/build tcnative.m4
  Log:
  Allow to use sableVM.
  
  Revision  Changes    Path
  1.10      +11 -4     jakarta-tomcat-connectors/jni/native/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/configure.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- configure.in	2 Aug 2005 11:33:11 -0000	1.9
  +++ configure.in	22 Aug 2005 20:30:18 -0000	1.10
  @@ -85,16 +85,23 @@
   AC_PROG_INSTALL
   
   dnl
  -dnl  Find the APR-ICONV directory.
  +dnl  Find the JVM related information
   dnl
   TCN_FIND_JDK
  -TCN_FIND_JDK_OS
  +TCN_SABLEVM
  +APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include])
  +
  +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])
  +fi
  +
   AC_SUBST(JAVA_HOME)
   AC_SUBST(JAVA_PLATFORM)
   AC_SUBST(JAVA_OS)
   
  -APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include])
  -APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS])
   
   dnl
   dnl Detect openssl toolkit installation
  
  
  
  1.10      +16 -0     jakarta-tomcat-connectors/jni/native/build/tcnative.m4
  
  Index: tcnative.m4
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build/tcnative.m4,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- tcnative.m4	12 Jun 2005 06:10:13 -0000	1.9
  +++ tcnative.m4	22 Aug 2005 20:30:18 -0000	1.10
  @@ -195,6 +195,22 @@
         ])
     ])
   
  +dnl check for sableVM
  +dnl (copied from daemon/src/native/unix/support/apjava.m4)
  +AC_DEFUN(
  +  [TCN_SABLEVM],
  +  [
  +  if test x"$JAVA_HOME" != x
  +  then
  +    AC_PATH_PROG(SABLEVM,sablevm,NONE,$JAVA_HOME/bin)
  +    if test "$SABLEVM" != "NONE"
  +    then
  +      AC_MSG_RESULT([Using sableVM: $SABLEVM])
  +      CFLAGS="$CFLAGS -DHAVE_SABLEVM"
  +    fi
  +  fi
  +  ])
  +
   dnl TCN_HELP_STRING(LHS, RHS)
   dnl Autoconf 2.50 can not handle substr correctly.  It does have 
   dnl AC_HELP_STRING, so let's try to call it if we can.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message