|
Lines 1181-1196
Link Here
|
| 1181 |
dnl Check if there is a java compiler at all. |
1181 |
dnl Check if there is a java compiler at all. |
| 1182 |
if test -x "$_javac_path"; then |
1182 |
if test -x "$_javac_path"; then |
| 1183 |
JAVAC=$_javac_path |
1183 |
JAVAC=$_javac_path |
| 1184 |
else |
1184 |
else |
| 1185 |
AC_MSG_ERROR([$_javac_path not found set with_jdk_home]) |
1185 |
_javac_path="$with_jdk_home/gcj" |
|
|
1186 |
dnl Check for gcj |
| 1187 |
if test -x "$_javac_path"; then |
| 1188 |
JAVAC=$_javac_path |
| 1189 |
else |
| 1190 |
AC_MSG_ERROR([$_javac_path not found set with_jdk_home]) |
| 1191 |
fi |
| 1186 |
fi |
1192 |
fi |
| 1187 |
|
1193 |
|
| 1188 |
_java_path="$with_jdk_home/bin/java" |
1194 |
_java_path="$with_jdk_home/bin/java" |
| 1189 |
dnl Check if there is a java interpreter at all. |
1195 |
dnl Check if there is a java interpreter at all. |
| 1190 |
if test -x "$_java_path"; then |
1196 |
if test -x "$_java_path"; then |
| 1191 |
JAVA=$_java_path |
1197 |
JAVA=$_java_path |
| 1192 |
else |
1198 |
else |
| 1193 |
AC_MSG_ERROR([$_java_path not found set with_jdk_home]) |
1199 |
_java_path="$with_jdk_home/gij" |
|
|
1200 |
dnl Check for gcj |
| 1201 |
if test -x "$_java_path"; then |
| 1202 |
JAVA=$_java_path |
| 1203 |
else |
| 1204 |
AC_MSG_ERROR([$_java_path not found set with_jdk_home]) |
| 1205 |
fi |
| 1194 |
fi |
1206 |
fi |
| 1195 |
fi |
1207 |
fi |
| 1196 |
AC_MSG_CHECKING([the installed JDK]) |
1208 |
AC_MSG_CHECKING([the installed JDK]) |
|
Lines 1215-1220
Link Here
|
| 1215 |
AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)]) |
1227 |
AC_MSG_RESULT([checked (Kaffe $KAFFE_VER)]) |
| 1216 |
AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile]) |
1228 |
AC_MSG_WARN([EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile]) |
| 1217 |
echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn |
1229 |
echo "EXPERIMENTAL: Kaffe is not a full JDK replacement - some projects will fail to compile" >>warn |
|
|
1230 |
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"` |
| 1231 |
elif test `$JAVAC -v 2>&1 | grep -c "gcc version"` -gt 0; then |
| 1232 |
|
| 1233 |
dnl gcj specific tests |
| 1234 |
|
| 1235 |
GCJ_VER=`$JAVAC -dumpversion 2>&1` |
| 1236 |
if test -z "$GCJ_VER"; then |
| 1237 |
AC_MSG_ERROR([looks like gcj but version detection failed]) |
| 1238 |
fi |
| 1239 |
_gcj_ver=$GCJ_VER |
| 1240 |
|
| 1241 |
JDK=gcj |
| 1242 |
AC_MSG_RESULT([checked (gcj $GCJ_VER)]) |
| 1243 |
AC_MSG_WARN([EXPERIMENTAL: gcj is not a full JDK replacement - some projects will fail to compile]) |
| 1244 |
echo "EXPERIMENTAL: gcj is not a full JDK replacement - some projects will fail to compile" >>warn |
| 1245 |
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*gcj,,p"` |
| 1218 |
else |
1246 |
else |
| 1219 |
|
1247 |
|
| 1220 |
dnl SUN JDK specific tests |
1248 |
dnl SUN JDK specific tests |
|
Lines 1225-1234
Link Here
|
| 1225 |
AC_MSG_ERROR([JDK is too old, you need at least 1.3]) |
1253 |
AC_MSG_ERROR([JDK is too old, you need at least 1.3]) |
| 1226 |
fi |
1254 |
fi |
| 1227 |
AC_MSG_RESULT([checked (JDK $_jdk)]) |
1255 |
AC_MSG_RESULT([checked (JDK $_jdk)]) |
|
|
1256 |
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"` |
| 1228 |
fi |
1257 |
fi |
| 1229 |
JAVA_HOME=`echo $JAVAC | $SED -n "s,//*bin//*javac,,p"` |
|
|
| 1230 |
else |
1258 |
else |
| 1231 |
AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3]) |
1259 |
AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3, Kaffee 1.01, or gcj]) |
| 1232 |
fi |
1260 |
fi |
| 1233 |
dnl xsltproc not needed with JDK present. |
1261 |
dnl xsltproc not needed with JDK present. |
| 1234 |
XSLTPROC=NO_XSLTPROC |
1262 |
XSLTPROC=NO_XSLTPROC |