wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 5af48430563e (bug 1056128) for causing regressions

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-08-26 14:03:58 +02:00
parent bb65c8f451
commit 0bc38d254e
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/android-common.mk
View File

@ -19,9 +19,9 @@ ifndef JAVA_BOOTCLASSPATH
JAVA_BOOTCLASSPATH = $(ANDROID_SDK)/android.jar
endif
# For Android, we default to 1.7
# For Android, we default to 1.5
ifndef JAVA_VERSION
JAVA_VERSION = 1.7
JAVA_VERSION = 1.5
endif
JAVAC_FLAGS = \

18
configure.in
View File

@ -5607,24 +5607,6 @@ if test -n "${JAVA_BIN_PATH}" -o \
fi
fi
AC_MSG_CHECKING([for minimum required javac version >= 1.7])
dnl Javac spits out something like `javac 1.8.0`. This line cuts off the 'javac'
_javac_version=$($JAVAC -version 2>&1 | cut -d ' ' -f 2)
dnl Here, we extract the major (1) and minor (8) version numbers from the
dnl acquired version string.
_javac_major_version=$(echo $_javac_version | cut -d '.' -f 1)
_javac_minor_version=$(echo $_javac_version | cut -d '.' -f 2)
AC_MSG_RESULT([$_javac_version])
dnl Fail if we have a version older than 1.7
if test "$_javac_major_version" -lt "1" -o \
\( "$_javac_minor_version" -lt "7" \); then
AC_MSG_ERROR([javac 1.7 or higher is required.])
fi
dnl ========================================================
dnl = ANGLE OpenGL->D3D translator for WebGL
dnl = * only applies to win32