X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Ftools%2Fbuild%2Fsrc%2Ftools%2Fzlib.jam;h=45dc4767a828f376ce100c8f8970a22410b81401;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=5a7d5fbdf57fd24abc96730fc6cbc6cb1768d027;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/tools/build/src/tools/zlib.jam b/ceph/src/boost/tools/build/src/tools/zlib.jam
index 5a7d5fbdf..45dc4767a 100644
--- a/ceph/src/boost/tools/build/src/tools/zlib.jam
+++ b/ceph/src/boost/tools/build/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 ] ] ;