From 2b988d4ed690dd5ad8143c8d779edd7cd104f11c Mon Sep 17 00:00:00 2001
From: Steven Watanabe <steven@providere-consulting.com>
Date: Fri, 28 Jul 2017 22:02:30 -0600
Subject: [PATCH] Eliminate the need for the annoying is-default argument of
 zlib, bzip2, and lzma.

---
 src/tools/bzip2.jam | 10 +++++++++-
 src/tools/lzma.jam  | 10 +++++++++-
 src/tools/zlib.jam  | 10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/tools/bzip2.jam b/src/tools/bzip2.jam
index ae9a03909..e6f9dcc13 100644
--- a/src/tools/bzip2.jam
+++ b/src/tools/bzip2.jam
@@ -96,7 +96,10 @@ rule init (
 
     : is-default ?
     # Default configurations are only used when bzip
-    # has not yet been configured.
+    # has not yet been configured.  This option is
+    # deprecated.  A configuration will be treated
+    # as a default when none of <include>, <search>,
+    # <name>, and <source> are present.
     )
 {
     local caller = [ project.current ] ;
@@ -123,6 +126,11 @@ rule init (
     local build-name = [ property.select <build-name> : $(options) ] ;
     build-name = $(build-name:G=) ;
 
+    if ! $(library-path) && ! $(include-path) && ! $(source-path) && ! $(library-name)
+    {
+        is-default = true ;
+    }
+
     condition = [ property-set.create $(requirements) ] ;
     condition = [ property-set.create [ $(condition).base ] ] ;
 
diff --git a/src/tools/lzma.jam b/src/tools/lzma.jam
index a98ba80c0..2c9c77b6f 100644
--- a/src/tools/lzma.jam
+++ b/src/tools/lzma.jam
@@ -45,7 +45,10 @@ rule init (
 
     : is-default ?
     # Default configurations are only used when
-    # not yet configured.
+    # not yet configured.  This option is
+    # deprecated.  A configuration will be treated
+    # as a default when none of <include>, <search>,
+    # <name>, and <source> are present.
     )
 {
     local caller = [ project.current ] ;
@@ -66,6 +69,11 @@ rule init (
     local library-name = [ property.select <name> : $(options) ] ;
     library-name = $(library-name:G=) ;
 
+    if ! $(options)
+    {
+        is-default = true ;
+    }
+
     condition = [ property-set.create $(requirements) ] ;
     condition = [ property-set.create [ $(condition).base ] ] ;
 
diff --git a/src/tools/zlib.jam b/src/tools/zlib.jam
index 5a7d5fbdf..45dc4767a 100644
--- a/src/tools/zlib.jam
+++ b/src/tools/zlib.jam
@@ -94,7 +94,10 @@ rule init (
 
     : is-default ?
     # Default configurations are only used when zlib
-    # has not yet been configured.
+    # has not yet been configured.  This option is
+    # deprecated.  A configuration will be treated
+    # as a default when none of <include>, <search>,
+    # <name>, and <source> are present.
     )
 {
     local caller = [ project.current ] ;
@@ -121,6 +124,11 @@ rule init (
     local build-name = [ property.select <build-name> : $(options) ] ;
     build-name = $(build-name:G=) ;
 
+    if ! $(library-path) && ! $(include-path) && ! $(source-path) && ! $(library-name)
+    {
+        is-default = true ;
+    }
+
     condition = [ property-set.create $(requirements) ] ;
     condition = [ property-set.create [ $(condition).base ] ] ;