From 977d08666446e7c20cbcf52e240e5b9c684e27fe Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Fri, 29 Jul 2005 12:00:40 +0000
Subject: [PATCH] Unbreak " lib a ; " syntax.

Thanks to Craig Rodrigues for the bug report.


[SVN r30309]
---
 v2/test/searched_lib.py | 18 ++++++++++++++++++
 v2/tools/builtin.jam    |  6 ++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/v2/test/searched_lib.py b/v2/test/searched_lib.py
index 3bd325e4c..e6a61ca7a 100644
--- a/v2/test/searched_lib.py
+++ b/v2/test/searched_lib.py
@@ -140,4 +140,22 @@ lib l : : <name>l_f ;
 
 t.run_build_system("-n")
 
+
+# Make sure that plain "lib foobar ; " works.
+t.write("Jamfile", """
+exe a : a.cpp foobar ;
+lib foobar ;
+""")
+t.run_build_system("-n -d2")
+t.fail_test(string.find(t.stdout(), "foobar") == -1)
+
+# Make sure that plain "lib foo bar ; " works.
+t.write("Jamfile", """
+exe a : a.cpp foo bar ;
+lib foo bar ;
+""")
+t.run_build_system("-n -d2")
+t.fail_test(string.find(t.stdout(), "foo") == -1)
+t.fail_test(string.find(t.stdout(), "bar") == -1)
+
 t.cleanup()
diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index 55a53c65c..cef7e342a 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -380,11 +380,13 @@ rule lib ( names + : sources * : requirements * : default-build *
               "it's not allowed to specify sources. " ;
         }        
     }
-    
+                
     for local name in $(names)
     {    
         local r = $(requirements) ;
-        if $(names[2])
+        # Support " lib a ; " and " lib a b c ; " syntaxes.
+        if ! $(sources) && ! <name> in $(requirements:G)
+                        && ! <file> in $(requirements:G)
         {
             r += <name>$(name) ;
         }