BoostBuild.rb in dev-1.0.197

- old
+ new

@@ -28,12 +28,12 @@
     #words=filename.split('-')
 	#flags=words[2] if words.length == 4
 	#flags = flags + "-" + words[3] if words.length == 5
 	#result="<toolset>" + getToolset(words[1]) if words.length==4
 	link="static"
-	link="shared" if filename.index("lib") != 0
-	link="shared" if filename.include?(".so")
+	link="shared" if filename.index("lib") != 0 && !filename.include?(".a")
+	link="shared" if filename.include?(".so") || filename.include?(".dylib")
     result =  " <link>" + link + " " 
 	variant = "release"
 	variant = "debug" if filename.include?("d.") || filename.include?("-gd-")
 	#result = result + " <variant>release " if !flags.include?("d")
 	#result = result + " <variant>debug " if flags.include?("d")
@@ -58,12 +58,12 @@
 	  Dir.chdir(directory) do
 	    File.open(jamfilename,'w') { |jamfile|
 	      Dir.glob("*boost_*").each {|f|
 		    jamfile.puts getJamfileLine(f)
 
-			# add <link>shared
+			# add extra <link>shared entry for windows
 			line = getJamfileLine(f)
-			if(line.include?("<link>static"))
+			if(line.include?("<link>static") && line.include?("-vc") && line.include?(".lib"))
 			  line = line.gsub("<link>static","<link>shared")
 			  jamfile.puts line
 			end
 		  }
 		}
\ No newline at end of file