From b159938246761143d7c2ea2f28c8100e33c48976 Mon Sep 17 00:00:00 2001
From: Dmitry <grisumbras@yandex.ru>
Date: Thu, 9 May 2024 14:37:04 +0300
Subject: [PATCH] fix broken multiple configurations for some toolset modules
 (#388)

---
 src/tools/fop.jam        | 2 +-
 src/tools/pkg-config.jam | 2 +-
 src/tools/python.jam     | 2 +-
 src/tools/saxonhe.jam    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tools/fop.jam b/src/tools/fop.jam
index 697cbe9656..57f8d8afc0 100644
--- a/src/tools/fop.jam
+++ b/src/tools/fop.jam
@@ -23,7 +23,7 @@ rule init ( fop-command ? : java-home ? : java ? )
     }
     else
     {
-        if ! ( $(1) && $(2) && $(3) )
+        if ! ( $(1) || $(2) || $(3) )
         {
             return ;
         }
diff --git a/src/tools/pkg-config.jam b/src/tools/pkg-config.jam
index 9d7fe2c34a..8ddb66d83b 100644
--- a/src/tools/pkg-config.jam
+++ b/src/tools/pkg-config.jam
@@ -158,7 +158,7 @@ rule init ( config ? : command * : options * )
     {
         config = [ default-config ] ;
         if ( $(config) in [ $(.configs).all ] )
-           && ! ( $(command) && $(options) )
+           && ! ( $(command) || $(options) )
         {
             return ;
         }
diff --git a/src/tools/python.jam b/src/tools/python.jam
index bac00b33e7..f8f63f40ff 100644
--- a/src/tools/python.jam
+++ b/src/tools/python.jam
@@ -110,7 +110,7 @@ rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
     }
     else
     {
-        if ! ( $(1) && $(2) && $(3) && $(4) && $(5) && $(6) )
+        if ! ( $(1) || $(2) || $(3) || $(4) || $(5) || $(6) )
         {
             return ;
         }
diff --git a/src/tools/saxonhe.jam b/src/tools/saxonhe.jam
index fc4203cab6..a8d40f33b5 100644
--- a/src/tools/saxonhe.jam
+++ b/src/tools/saxonhe.jam
@@ -17,7 +17,7 @@ rule init ( saxonhe_jar ? : java_exe ? )
     }
     else
     {
-        if ! ( $(1) && $(2) )
+        if ! ( $(1) || $(2) )
         {
             return ;
         }