yugui	2008-11-19 01:48:06 +0900 (Wed, 19 Nov 2008)

  New Revision: 20268

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20268

  Log:
    merges r20241 from trunk into ruby_1_9_1.
    * enc/depend (LIBS): fixed for disable-shared.  [ruby-dev:37103]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enc/Makefile.in
    branches/ruby_1_9_1/enc/depend

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20267)
+++ ruby_1_9_1/ChangeLog	(revision 20268)
@@ -1,3 +1,7 @@
+Mon Nov 17 18:05:16 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/depend (LIBS): fixed for disable-shared.  [ruby-dev:37103]
+
 Mon Nov 17 11:12:24 2008  Masatoshi SEKI  <m_seki@m...>
 
 	* bin/erb: remove -K option.
Index: ruby_1_9_1/enc/Makefile.in
===================================================================
--- ruby_1_9_1/enc/Makefile.in	(revision 20267)
+++ ruby_1_9_1/enc/Makefile.in	(revision 20268)
@@ -38,7 +38,6 @@
 DEFS = @DEFS@
 CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS)
 LDSHARED = @LDSHARED@
 ldflags  = $(LDFLAGS)
 dldflags = @DLDFLAGS@
Index: ruby_1_9_1/enc/depend
===================================================================
--- ruby_1_9_1/enc/depend	(revision 20267)
+++ ruby_1_9_1/enc/depend	(revision 20268)
@@ -1,3 +1,4 @@
+% enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
 % deffile = (true if /\$\(DEFFILE\)/ =~ CONFIG["LINK_SO"])
 % encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS
 % encs.each {|e| e.chomp!(".c")}
@@ -40,6 +41,12 @@
 
 VPATH = <%=%w[$(arch_hdrdir)/ruby $(hdrdir)/ruby $(srcdir) $(encsrcdir)].join(CONFIG["PATH_SEPARATOR"])%>
 LIBPATH = <%=libpathflag($DEFLIBPATH)%>
+LIBS = <%=
+if enable_shared or RbConfig.expand(CONFIG["LIBRUBY"].dup) != RbConfig.expand(CONFIG["LIBRUBY_A"].dup)
+  CONFIG['LIBRUBYARG']
+else
+  ''
+end %> <%=CONFIG['LIBS']%> $(EXTLIBS)
 
 ENCOBJS = <%=encs.map {|e|"enc/#{e}.$(OBJEXT)"}.join(" \\\n\t  ")%><%="\n" if encs.size>1%>
 ENCSOS = <%=encs.map {|e|"$(ENCSODIR)/#{e}.$(DLEXT)"}.join(" \\\n\t ")%><%="\n" if encs.size>1%>

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/