From 930368bf0aecabb752015a99bdf6c175cdc57ee7 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Sun, 25 Nov 2007 19:36:19 +0000
Subject: [PATCH] Full merge from trunk at revision 41356 of entire boost-root
 tree.

[SVN r41373]
---
 v2/build/project.jam            | 10 +++++++++-
 v2/example/qt/qt4/hello/Jamroot | 26 +++++++++++++-------------
 v2/tools/pathscale.jam          |  8 ++++----
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/v2/build/project.jam b/v2/build/project.jam
index 92d4a958a..ec9826828 100644
--- a/v2/build/project.jam
+++ b/v2/build/project.jam
@@ -1007,7 +1007,15 @@ module project-rules
     #
     rule conditional ( condition + : requirements * )
     {
-        return $(condition:J=,):$(requirements) ;
+        local condition = $(condition:J=,) ;
+        if [ MATCH (:) : $(condition) ]
+        {
+            return $(condition)$(requirements) ;
+        }
+        else
+        {
+            return $(condition):$(requirements) ;
+        }
     }
 }
 
diff --git a/v2/example/qt/qt4/hello/Jamroot b/v2/example/qt/qt4/hello/Jamroot
index 3c49dbc98..83952f17b 100644
--- a/v2/example/qt/qt4/hello/Jamroot
+++ b/v2/example/qt/qt4/hello/Jamroot
@@ -1,14 +1,14 @@
-
-import qt4 ;
-
-if ! [ qt4.initialized ]
-{
-    ECHO "Warning: Qt4 not initialized in user-config.jam" ;
-    ECHO "Assuming /space/p2/ghost/build/Qt4 as location." ;
-    ECHO "This is very likely won't work for you. " ;
-    using qt4 : /space/p2/ghost/build/Qt4 ;
-}
-
-project : requirements <threading>multi ;
-
+
+import qt4 ;
+
+if ! [ qt4.initialized ]
+{
+    ECHO "Warning: Qt4 not initialized in user-config.jam" ;
+    ECHO "Assuming /space/p2/ghost/build/Qt4 as location." ;
+    ECHO "This is very likely won't work for you. " ;
+    using qt4 : /space/p2/ghost/build/Qt4 ;
+}
+
+project : requirements <threading>multi ;
+
 exe arrow : main.cpp arrow.cpp arrow.h /qt//QtGui ;
\ No newline at end of file
diff --git a/v2/tools/pathscale.jam b/v2/tools/pathscale.jam
index b4c0578cd..26ecf496d 100644
--- a/v2/tools/pathscale.jam
+++ b/v2/tools/pathscale.jam
@@ -23,19 +23,19 @@ rule init ( version ? : command * : options * )
 {
   local condition = [ common.check-init-parameters pathscale : version $(version) ] ;
 
-  command = [ common.get-invocation-command pathscale : mpicxx : $(command) ] ;
+  command = [ common.get-invocation-command pathscale : pathCC : $(command) ] ;
 
   common.handle-options pathscale : $(condition) : $(command) : $(options) ;
     
   toolset.flags pathscale.compile.fortran90 OPTIONS $(condition) :
     [ feature.get-values <fflags> : $(options) ] : unchecked ;
 
-  command_c = $(command_c[1--2]) $(command[-1]:B=mpicxx) ;
+  command_c = $(command_c[1--2]) $(command[-1]:B=pathCC) ;
 
   toolset.flags pathscale CONFIG_C_COMMAND $(condition) : $(command_c) ;
 
   # fortran support
-  local f-command = [ common.get-invocation-command pathscale : mpif77 : $(command) ] ;
+  local f-command = [ common.get-invocation-command pathscale : pathf90 : $(command) ] ;
   local command_f = $(command_f[1--2]) $(f-command[-1]:B=pathf77) ;
   local command_f90 = $(command_f[1--2]) $(f-command[-1]:B=pathf90) ;
 
@@ -84,7 +84,7 @@ actions compile.c++
 
 actions compile.fortran
 {
-    "$(CONFIG_F_COMMAND)" $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_F_COMMAND)" -f77 $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.fortran90 ( targets * : sources * : properties * )