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

Merge backout of Bug 800613

Browse Source
This commit is contained in:
Justin Wood 2012-10-22 00:43:31 -04:00
commit 120bee0c87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -63,7 +63,7 @@ dnl ========================================================
GLIB_VERSION=1.2.0
PERL_VERSION=5.006
PYTHON_VERSION_MAJOR=2
PYTHON_VERSION_MINOR=6
PYTHON_VERSION_MINOR=5
CAIRO_VERSION=1.10
PANGO_VERSION=1.14.0
GTK2_VERSION=2.10.0
@ -803,7 +803,7 @@ else
AC_MSG_RESULT([yes])
fi
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python)
MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python)
if test -z "$PYTHON"; then
AC_MSG_ERROR([python was not found in \$PATH])
fi
@ -1839,7 +1839,7 @@ case "$host" in
;;
esac
dnl We require version 2.6 or newer of Python to build.
dnl We require version 2.5 or newer of Python to build.
AC_MSG_CHECKING([for Python version >= $PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR but not 3.x])
changequote(:)

6
js/src/configure.in
View File

@ -55,7 +55,7 @@ NSPR_VERSION=4
dnl Set the minimum version of toolkit libs used by mozilla
dnl ========================================================
PERL_VERSION=5.006
PYTHON_VERSION=2.6
PYTHON_VERSION=2.5
WINDRES_VERSION=2.14.90
W32API_VERSION=3.14
@ -1405,8 +1405,8 @@ dnl System overrides of the defaults for host
dnl ========================================================
case "$host" in
*mingw*)
# we need Python 2.6 on Windows
PYTHON_VERSION=2.6
# we need Python 2.5 on Windows
PYTHON_VERSION=2.5
if test -n "$_WIN32_MSVC"; then
HOST_AR=lib
HOST_AR_FLAGS='-NOLOGO -OUT:"$@"'