2000-05-09

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 8 deletions

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ca57b25a79..1df53ceb06 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -328,6 +328,11 @@ def create_makefile(target)
   end
   $DLDFLAGS = CONFIG["DLDFLAGS"]
 
+  if $configure_args['--enable-shared']
+    $libs = CONFIG["LIBRUBYARG"] + " " + $libs
+    $DLDFLAGS = $DLDFLAGS + " -L$(topdir)"
+  end
+
   if RUBY_PLATFORM =~ /beos/
     $libs = $libs + " " + CONFIG["LIBRUBYARG"]
     $DLDFLAGS = $DLDFLAGS + " -L" + CONFIG["prefix"] + "/lib"
@@ -338,8 +343,6 @@ def create_makefile(target)
     if File.exist? target + ".def"
       defflag = "--def=" + target + ".def"
     end
-    $libs = $libs + " " + CONFIG["LIBRUBYARG"]
-    $DLDFLAGS = $DLDFLAGS + " -L$(topdir)"
   end
 
   unless $objs then
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 4acaaadd3a..ca259416e0 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -5,7 +5,7 @@ $Date$
 
 net/telnet.rb
 
-Version 1.30
+Version 1.31
 
 Wakou Aoyama <wakou@fsinet.or.jp>
 
@@ -24,7 +24,7 @@ Wakou Aoyama <wakou@fsinet.or.jp>
 	           # if ignore timeout then set "Timeout" to false.
 	         "Waittime"   => 0,            # default: 0
 	         "Proxy"      => proxy         # default: nil
-	                         # proxy is Telnet or TCPsocket object
+	                         # proxy is Net::Telnet or IO object
 	       })
 
 Telnet object has socket class methods.
@@ -157,6 +157,12 @@ of cource, set sync=true or flush is necessary.
 
 == HISTORY
 
+=== Version 1.31
+
+2000/05/02 21:48:39
+
+- Proxy option: can receive IO object
+
 === Version 1.30
 
 2000/04/03 18:27:02
@@ -437,7 +443,7 @@ module Net
     EOL  = CR + LF
   v = $-v
   $-v = false
-    VERSION = "1.30"
+    VERSION = "1.31"
     RELEASE_DATE = "$Date$"
   $-v = v
 
@@ -487,12 +493,12 @@ module Net
       end
 
       if @options.has_key?("Proxy")
-        if @options["Proxy"].kind_of?(Telnet)
+        if @options["Proxy"].kind_of?(Net::Telnet)
           @sock = @options["Proxy"].sock
-        elsif @options["Proxy"].kind_of?(TCPsocket)
+        elsif @options["Proxy"].kind_of?(IO)
           @sock = @options["Proxy"]
         else
-          raise "Error; Proxy is Telnet or TCPSocket object."
+          raise "Error; Proxy is Net::Telnet or IO object."
         end
       else
         message = "Trying " + @options["Host"] + "...\n"