1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
--- resin-3.1.0.vanilla/configure.in 2007-04-14 22:59:47.000000000 +0200
+++ resin-3.1.0/configure.in 2007-04-14 23:00:30.000000000 +0200
@@ -434,54 +434,6 @@
fi
fi
#
-# --with-java-home
-#
-AC_ARG_WITH(java-home,
-[ --with-java-home=DIR java home
-], [
-JAVA_HOME=${withval}
-])
-
-if test -z "$JAVA_HOME"; then
- java=`which java 2>/dev/null`
- if test $? = "0"; then
- while test -h "$java"
- do
- head=`dirname $java`
- tail=`/bin/ls -l $java | awk '{ print $NF; }'`
- if test -f "$tail"; then
- java=$tail
- else
- java=$head/$tail
- fi
- done
-
- javabin=`dirname $java`
- JAVA_HOME=`cd $javabin/..; pwd`
-
- # we're in $JAVA_HOME/jre
- if test -f "$JAVA_HOME/lib/rt.jar"; then
- JAVA_HOME=`cd $JAVA_HOME/..; pwd`
- elif test -d "/usr/java"; then
- JAVA_HOME=/usr/java
- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
- fi
- elif test -d "/usr/java"; then
- JAVA_HOME=/usr/java
- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
- fi
-fi
-
-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
-
-if test ! -d "$JAVA_HOME"; then
- AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
-fi
-
-AC_SUBST(JAVA_HOME)
-#
# Resin home
#
resin_home=`pwd`
@@ -792,68 +744,6 @@
AC_SUBST(SSL_LIBS)
#
-# --with-jni-include
-#
-AC_ARG_WITH(jni-include,
-[ --with-jni-include="-Idir -Idir" jni include string
-], [
-JNI_INCLUDE=${withval}
-JNI="yes"
-])
-
-#
-# --enable-jni
-#
-AC_ARG_ENABLE(jni,
-[ --enable-jni Turn on jni],
-[case "${enableval}" in
- yes) JNI=true ;;
- no) JNI="" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
- esac],[JNI=""])
-
-if test -n "$JNI_INCLUDE"; then
- JNI=yes
-elif test -r "$JAVA_HOME/include/jni_md.h"; then
- JNI_INCLUDE="-I$JAVA_HOME/include"
- JNI=yes
- echo "checking for JNI in $JAVA_HOME/include ... found"
-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
- JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
- JNI=yes
- echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
- # Darwin
- echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
- JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
- JNI=yes
-else
- JNI=""
- AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
-fi
-
-if test -r "$JAVA_HOME/include/jvmti.h"; then
- echo "Using JVMTI for class reloading"
-
- CFLAGS="$CFLAGS -DHAS_JVMTI"
-fi
-
-if test -r "$JAVA_HOME/include/jvmdi.h"; then
- echo "Using JVMDI for class reloading"
-
- CFLAGS="$CFLAGS -DHAS_JVMDI"
-fi
-
-if test -n "$JNI"; then
- plugins="$plugins $resin_plugin resin_os"
-else
- echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
-fi
-
-AC_SUBST(JNI)
-AC_SUBST(JNI_INCLUDE)
-
-#
# --enable-ssl
#
AC_ARG_ENABLE(ssl,
|
GitWeb