From 9d02966c739fd05f6152be4bc193814c71c1fd56 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Thu, 14 Oct 2010 19:37:50 +0200 Subject: [PATCH] Bug 599737 - Fully end-of-life Python 2.4 for build support; (Av1a) Remove remnants in configure.in, Support 'python2.7' executable. r=ted.mielczarek. --- configure.in | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index cc7e1d38cf0..f0197aa1ad0 100644 --- a/configure.in +++ b/configure.in @@ -982,7 +982,7 @@ else AC_MSG_RESULT([yes]) fi -MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 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 @@ -1828,8 +1828,6 @@ case "$host" in ;; *cygwin*|*mingw*|*mks*|*msvc*|*wince|*winmo) - # 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:"$@"' @@ -1903,8 +1901,7 @@ case "$host" in ;; esac -dnl We require version 2.4 or newer of Python to build, -dnl and 2.5 or newer on Windows. +dnl We require version 2.5 or newer of Python to build. AC_MSG_CHECKING([for minimum required Python version >= $PYTHON_VERSION]) changequote(,) $PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1])" $PYTHON_VERSION