From edca8b1e9317dd6f0ffc46536841708be8480e5d Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Sat, 28 Feb 2015 20:31:53 -0700
Subject: [PATCH] Don't initialize python in project-config.jam if it's already
 been configured in user-config.jam.

---
 bootstrap.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 2bc515b600..9e61569e2e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -353,7 +353,11 @@ if test "x$flag_no_python" = x; then
   cat >> project-config.jam <<EOF
 
 # Python configuration
-using python : $PYTHON_VERSION : $PYTHON_ROOT ;
+import python ;
+if ! [ python.configured ]
+{
+    using python : $PYTHON_VERSION : $PYTHON_ROOT ;
+}
 EOF
 fi