From ea78e214f7decc3b456dee3b01c606bcd344f2bf Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 3 Nov 2003 19:50:47 +0000
Subject: [PATCH] Attempt to handle frameworks in consistent manner. *
 darwin-tools.jam; Use -F option to specify the framework location, if the
 framework has one. * python.jam; Try and determine where the Python framework
 is. * python.jam; Remove requirement that warnings be off when building.

[SVN r20616]
---
 v1/darwin-tools.jam |  8 ++++----
 v1/python.jam       | 13 +++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/v1/darwin-tools.jam b/v1/darwin-tools.jam
index f3203d6cd..c5d32fe30 100644
--- a/v1/darwin-tools.jam
+++ b/v1/darwin-tools.jam
@@ -157,7 +157,7 @@ actions darwin-Link-action bind NEEDLIBS NEEDIMPS
     $(SHELL_EXPORT)$(gSHELL_LIBPATH)
     $(.GCC_BIN_DIR)$(.GXX) $(LINKFLAGS) -o "$(<[1])" "$(>)" \
       -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) \
-      -framework$(_)$(FRAMEWORKS) -bundle_loader$(_)"$(BUNDLE_LOADER)" "$(BUNDLE_LOADER)"
+      -F$(FRAMEWORKS:D) -framework$(_)$(FRAMEWORKS:D=) -bundle_loader$(_)"$(BUNDLE_LOADER)" "$(BUNDLE_LOADER)"
 }
 
 actions darwin-Link-DyLib-action bind NEEDLIBS NEEDIMPS
@@ -168,7 +168,7 @@ actions darwin-Link-DyLib-action bind NEEDLIBS NEEDIMPS
     && \
     $(.GCC_BIN_DIR)$(.GXX) $(LINKFLAGS) $(DLLFLAGS) -o "$(<[1])" "$(<[1]:S=.lo)" \
       -L"$(LIBPATH:T)" -L"$(STDLIBPATH:T)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) \
-      -framework$(_)$(FRAMEWORKS) \
+      -F$(FRAMEWORKS:D) -framework$(_)$(FRAMEWORKS:D=) \
     && \
     rm -f "$(<[1]:S=.lo)"
 }
@@ -183,7 +183,7 @@ rule Cc-action
 
 actions darwin-Cc-action
 {
-    $(.GCC_BIN_DIR)$(.GCC) -c -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(.GCC_BIN_DIR)$(.GCC) -c -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) -F$(FRAMEWORKS:D) -framework$(_)$(FRAMEWORKS:D=) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 #### C++ ####
@@ -195,7 +195,7 @@ rule C++-action
 
 actions darwin-C++-action
 {
-    $(.GCC_BIN_DIR)$(.GXX) -c -ftemplate-depth-120 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(.GCC_BIN_DIR)$(.GXX) -c -ftemplate-depth-120 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -F$(FRAMEWORKS:D) -framework$(_)$(FRAMEWORKS:D=) -I"$(HDRS)" -I"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 #### Archive ####
diff --git a/v1/python.jam b/v1/python.jam
index f8613995b..7246cf6c2 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -81,13 +81,22 @@ if $(NT)
 }
 else if $(UNIX) && $(OS) = MACOSX
 {
-    PYTHON_ROOT ?= /Library/Frameworks/Python.framework/Versions/$(PYTHON_VERSION) ;
+    if ! $(PYTHON_ROOT)
+    {
+        if [ GLOB /System/Library/Frameworks : Python.framework ]
+        {
+            PYTHON_ROOT ?= /System/Library/Frameworks/Python.framework/Versions/$(PYTHON_VERSION) ;
+        }
+        else
+        {
+            PYTHON_ROOT ?= /Library/Frameworks/Python.framework/Versions/$(PYTHON_VERSION) ;
+        }
+    }
     PYTHON_ROOT = $(PYTHON_ROOT:J=" ") ;
     PYTHON_INCLUDES ?= $(PYTHON_ROOT)/include/python$(PYTHON_VERSION) ;
 
     PYTHON_PROPERTIES ?=
       <sysinclude>$(PYTHON_INCLUDES)
-        <warnings>off
       ;
 }
 else if $(UNIX)