2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 13:02:11 +00:00

Build with Python 2.4 by default; also deduce the default PYTHON_ROOT properly on Windows.

[SVN r31325]
This commit is contained in:
Dave Abrahams
2005-10-14 16:19:14 +00:00
parent 7957c76a0a
commit a736430389

View File

@@ -14,7 +14,7 @@ else if $(UNIX)
CATENATE = cat ;
}
PYTHON_VERSION ?= 2.2 ;
PYTHON_VERSION ?= 2.4 ;
# Strip the dot from the Python version in order to be able to name
# libraries
@@ -91,7 +91,7 @@ else if $(UNIX)
if $(NT)
{
PYTHON_ROOT ?= c:/tools/python ;
PYTHON_ROOT ?= c:/Python$(PYTHON_VERSION_NODOT) ;
# Reconstitute any paths split due to embedded spaces.
PYTHON_ROOT = $(PYTHON_ROOT:J=" ") ;
@@ -579,10 +579,19 @@ rule check-python-config ( )
ECHO "couldn't find Python.h in" \"$(dir:J=" ")\" ;
ECHO ;
ECHO You can configure the location of your python installation by setting: ;
ECHO "PYTHON_ROOT - currently" \"$(PYTHON_ROOT:J=" ")\" ;
ECHO "PYTHON_VERSION - The 2-part python Major.Minor version number (e.g." ;
ECHO " \"2.2\", NOT \"2.2.1\") - currently" \"$(PYTHON_VERSION)\" ;
ECHO ;
if $(NT)
{
ECHO "PYTHON_ROOT - automatically configured from PYTHON_VERSION if not" ;
ECHO " otherwise set ; currently" \"$(PYTHON_ROOT:J=" ")\" ;
}
else
{
ECHO "PYTHON_ROOT - currently" \"$(PYTHON_ROOT:J=" ")\" ;
}
ECHO ;
ECHO "The following are automatically configured from PYTHON_ROOT if not" ;
ECHO "otherwise set:" ;
ECHO ;