[libgda] Check for JAVA compiler version, for bug #587733
- From: Vivien Malerba <vivien src gnome org>
- To: svn-commits-list gnome org
- Subject: [libgda] Check for JAVA compiler version, for bug #587733
- Date: Sun, 5 Jul 2009 12:16:17 +0000 (UTC)
commit b891ef72e66451a50493fe6e96788a404763d16a
Author: Vivien Malerba <malerba gnome-db org>
Date: Sun Jul 5 11:52:08 2009 +0200
Check for JAVA compiler version, for bug #587733
configure.in | 70 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 26 deletions(-)
---
diff --git a/configure.in b/configure.in
index 3c341b8..c9975c5 100644
--- a/configure.in
+++ b/configure.in
@@ -1380,33 +1380,51 @@ then
if test ${acx_java_works} = yes; then
AC_MSG_RESULT([yes])
- AC_MSG_CHECKING([for Java environment])
- ## retrieve JAVA_HOME from Java itself if not set
- if test -z "${JAVA_HOME}" ; then
- RUN_JAVA(JAVA_HOME,[-classpath . getsp java.home])
- fi
-
- ## the availability of JAVA_HOME will tell us whether it's supported
- if test -z "${JAVA_HOME}" ; then
- if test x$acx_java_env_msg != xyes; then
- AC_MSG_RESULT([not found])
- fi
+ AC_MSG_CHECKING([java compiler version])
+ JVERSION=`$JAVAC -version 2>&1 | sed -e "1s/javac //" -e "1q"`
+ case "$JVERSION" in
+ 1.1.*) try_java=false;;
+ 1.2.*) try_java=false;;
+ 1.3.*) try_java=false;;
+ 1.4.*) try_java=false;;
+ 1.5.*)
+ ;;
+ *)
+ ;;
+ esac
+ if test $try_java = true; then
+ AC_MSG_RESULT([Version >= 1.5, Ok])
+
+ AC_MSG_CHECKING([for Java environment])
+ ## retrieve JAVA_HOME from Java itself if not set
+ if test -z "${JAVA_HOME}" ; then
+ RUN_JAVA(JAVA_HOME,[-classpath . getsp java.home])
+ fi
+
+ ## the availability of JAVA_HOME will tell us whether it's supported
+ if test -z "${JAVA_HOME}" ; then
+ if test x$acx_java_env_msg != xyes; then
+ AC_MSG_RESULT([not found])
+ fi
+ else
+ AC_MSG_RESULT([in ${JAVA_HOME}])
+
+ case "${host_os}" in
+ darwin*)
+ JAVA_LIBS="-framework JavaVM"
+ JAVA_LD_PATH=
+ ;;
+ *)
+ RUN_JAVA(JAVA_LIBS, [-classpath . getsp -libs])
+ JAVA_LIBS="${JAVA_LIBS} -ljvm"
+ RUN_JAVA(JAVA_LD_PATH, [-classpath . getsp java.library.path])
+ ;;
+ esac
+ ## note that we actually don't test JAVA_LIBS - we hope that the detection
+ ## was correct. We should also test the functionality for javac.
+ fi
else
- AC_MSG_RESULT([in ${JAVA_HOME}])
-
- case "${host_os}" in
- darwin*)
- JAVA_LIBS="-framework JavaVM"
- JAVA_LD_PATH=
- ;;
- *)
- RUN_JAVA(JAVA_LIBS, [-classpath . getsp -libs])
- JAVA_LIBS="${JAVA_LIBS} -ljvm"
- RUN_JAVA(JAVA_LD_PATH, [-classpath . getsp java.library.path])
- ;;
- esac
- ## note that we actually don't test JAVA_LIBS - we hope that the detection
- ## was correct. We should also test the functionality for javac.
+ AC_MSG_RESULT([Version < 1.5, please update your JAVAC version])
fi
else
AC_MSG_RESULT([no])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]