You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jf...@apache.org on 2001/08/06 23:54:33 UTC
cvs commit: jakarta-tomcat-4.0/service/support apsupport.m4
jfclere 01/08/06 14:54:33
Modified: service configure.in
service/native java.c location.c
service/support apsupport.m4
Log:
Add support from cygwin.
Revision Changes Path
1.2 +6 -2 jakarta-tomcat-4.0/service/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/service/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure.in 2001/06/26 01:31:29 1.1
+++ configure.in 2001/08/06 21:54:33 1.2
@@ -57,7 +57,7 @@
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
-dnl Version $Id: configure.in,v 1.1 2001/06/26 01:31:29 pier Exp $
+dnl Version $Id: configure.in,v 1.2 2001/08/06 21:54:33 jfclere Exp $
dnl -------------------------------------------------------------------------
dnl -------------------------------------------------------------------------
@@ -107,12 +107,16 @@
unset _prevdir
else
CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
- LDFLAGS="$LDFLAGS -ldl"
+ if test "$supported_os" != "win32"
+ then
+ LDFLAGS="$LDFLAGS -ldl"
+ fi
fi
if test "$supported_os" = "solaris"
then
LDFLAGS="$LDFLAGS -lthread"
fi
+
dnl -------------------------------------------------------------------------
dnl Random programs we need to compile locally
1.3 +4 -1 jakarta-tomcat-4.0/service/native/java.c
Index: java.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/service/native/java.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java.c 2001/06/26 03:24:52 1.2
+++ java.c 2001/08/06 21:54:33 1.3
@@ -55,9 +55,12 @@
* *
* ========================================================================= */
-/* @version $Id: java.c,v 1.2 2001/06/26 03:24:52 pier Exp $ */
+/* @version $Id: java.c,v 1.3 2001/08/06 21:54:33 jfclere Exp $ */
#include "jsvc.h"
+#ifdef OS_CYGWIN
+typedef long long __int64;
+#endif
#include <jni.h>
static JavaVM *jvm=NULL;
1.2 +7 -1 jakarta-tomcat-4.0/service/native/location.c
Index: location.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/service/native/location.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- location.c 2001/06/26 01:37:41 1.1
+++ location.c 2001/08/06 21:54:33 1.2
@@ -55,7 +55,7 @@
* *
* ========================================================================= */
-/* @version $Id: location.c,v 1.1 2001/06/26 01:37:41 pier Exp $ */
+/* @version $Id: location.c,v 1.2 2001/08/06 21:54:33 jfclere Exp $ */
#include "jsvc.h"
/* Locations of various JVM files. We have to deal with all this madness since
@@ -74,6 +74,8 @@
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD)
"/usr/java",
"/usr/local/java",
+#elfif define(OS_CYGWIN)
+ "/cygdrive/c/WINNT/system32/java",
#endif
NULL,
};
@@ -94,6 +96,8 @@
char *location_jvm_default[] = {
#if defined(OS_DARWIN)
"$JAVA_HOME/../Libraries/libjvm.dylib",
+#elif defined(OS_CYGWIN)
+ "$JAVA_HOME/jre/bin/classic/jvm.dll", // Sun JDK 1.3
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD)
"$JAVA_HOME/jre/lib/" CPU "/classic/libjvm.so", // Sun JDK 1.2
"$JAVA_HOME/jre/lib/" CPU "/client/libjvm.so", // Sun JDK 1.3
@@ -129,6 +133,8 @@
char *location_jvm_configured[] = {
#if defined(OS_DARWIN)
"$JAVA_HOME/../Libraries/lib$VM_NAME.dylib",
+#elif defined(OS_CYGWIN)
+ "$JAVA_HOME/jre/bin/$VM_NAME/jvm.dll", // Sun JDK 1.3
#elif defined(OS_LINUX) || defined(OS_SOLARIS) || defined(OS_BSD)
"$JAVA_HOME/jre/lib/" CPU "/$VM_NAME/libjvm.so",// Sun JDK 1.3
"$JAVA_HOME/lib/" CPU "/$VM_NAME/libjvm.so", // Sun JRE 1.3
1.2 +5 -1 jakarta-tomcat-4.0/service/support/apsupport.m4
Index: apsupport.m4
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/service/support/apsupport.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apsupport.m4 2001/06/26 01:33:16 1.1
+++ apsupport.m4 2001/08/06 21:54:33 1.2
@@ -57,7 +57,7 @@
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
-dnl Version $Id: apsupport.m4,v 1.1 2001/06/26 01:33:16 pier Exp $
+dnl Version $Id: apsupport.m4,v 1.2 2001/08/06 21:54:33 jfclere Exp $
dnl -------------------------------------------------------------------------
AC_DEFUN(AP_SUPPORTED_HOST,[
@@ -86,6 +86,10 @@
linux*)
CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN"
supported_os="linux"
+ ;;
+ cygwin)
+ CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN"
+ supported_os="win32"
;;
*)
AC_MSG_RESULT([failed])