[ruby-dev:9615] Platform specific library for extensions.

小松です。

macosとかを導入するたびにconfigure.in, ext/extmk.rb.in, lib/mkmf.rb
の3つのファイルを変更するのは面倒なので、DLDLIBSを導入してみました。

# 名前 (DLDLIBS) に問題があれば変更しますが……

あとは、いつものwin32/ruby.defのメンテナンスです。

Tue May  2 09:50:03 2000  Katsuyuki Komatsu  <[e-mail]>

	* configure.in: add DLDLIBS to set platform specific library
	  for extensions.

	* ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.

	* lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.

	* config_s.dj: add @DLDLIBS@.

	* win32/config.status: ditto.

	* win32/ruby.def: regular maintenance.


diff -ru1p ruby-1.5.3.dist/config_s.dj ruby-1.5.3/config_s.dj
--- ruby-1.5.3.dist/config_s.dj	Wed Apr 12 14:06:21 2000
+++ ruby-1.5.3/config_s.dj	Tue May  2 09:50:03 2000
@@ -53,2 +53,3 @@ s%@LIBRUBY_SO@%%g
 s%@SOLIBS@%%g
+s%@DLDLIBS@%%g
 s%@srcdir%.%g
diff -ru1p ruby-1.5.3.dist/configure.in ruby-1.5.3/configure.in
--- ruby-1.5.3.dist/configure.in	Mon May  1 18:41:12 2000
+++ ruby-1.5.3/configure.in	Tue May  2 09:50:03 2000
@@ -713,2 +713,11 @@ fi
 
+case "$target_os" in
+  cygwin*|beos*|openstep*|nextstep*|rhapsody*|macos*|os2_emx*)
+    DLDLIBS=""
+    ;;
+  *)
+    DLDLIBS="-lc"
+    ;;
+esac
+
 LIBRUBY_LDSHARED=$LDSHARED
@@ -821,2 +830,3 @@ AC_SUBST(LIBRUBYARG)
 AC_SUBST(SOLIBS)
+AC_SUBST(DLDLIBS)
 
diff -ru1p ruby-1.5.3.dist/ext/extmk.rb.in ruby-1.5.3/ext/extmk.rb.in
--- ruby-1.5.3.dist/ext/extmk.rb.in	Mon May  1 18:41:34 2000
+++ ruby-1.5.3/ext/extmk.rb.in	Tue May  2 09:50:03 2000
@@ -501,12 +501,7 @@ def extmake(target)
   $objs = nil
+  $libs = "@DLDLIBS@"
   $local_flags = ""
-  case RUBY_PLATFORM
-  when /cygwin|beos|openstep|nextstep|rhapsody|macos|i386-os2_emx/
-    $libs = ""
-  when /mswin32/
+  if /mswin32/ =~ RUBY_PLATFORM
     $LIBEXT = "lib"
-    $libs = ""
     $local_flags = "$(topdir)/rubymw.lib -link /EXPORT:Init_$(TARGET)"
-  else
-    $libs = "-lc"
   end
diff -ru1p ruby-1.5.3.dist/lib/mkmf.rb ruby-1.5.3/lib/mkmf.rb
--- ruby-1.5.3.dist/lib/mkmf.rb	Wed Apr 12 14:06:23 2000
+++ ruby-1.5.3/lib/mkmf.rb	Tue May  2 09:50:03 2000
@@ -462,9 +462,6 @@ $OBJEXT = CONFIG["OBJEXT"]
 $objs = nil
-$libs = "-lc"
+$libs = CONFIG["DLDLIBS"]
 $local_flags = ""
 case RUBY_PLATFORM
-when /cygwin|beos|openstep|nextstep|rhapsody/
-  $libs = ""
 when /mswin32/
-  $libs = ""
   $local_flags = "rubymw.lib -link /LIBPATH:$(topdir) /EXPORT:Init_$(TARGET)"
diff -ru1p ruby-1.5.3.dist/win32/config.status ruby-1.5.3/win32/config.status
--- ruby-1.5.3.dist/win32/config.status	Wed Apr 12 14:06:23 2000
+++ ruby-1.5.3/win32/config.status	Tue May  2 09:50:03 2000
@@ -60,2 +60,3 @@ s%@LIBRUBYARG@%libruby.lib%g
 s%@SOLIBS@%%g
+s%@DLDLIBS@%%g
 s%@arch@%i386-mswin32%g
diff -ru1p ruby-1.5.3.dist/win32/ruby.def ruby-1.5.3/win32/ruby.def
--- ruby-1.5.3.dist/win32/ruby.def	Mon Mar 13 16:18:45 2000
+++ ruby-1.5.3/win32/ruby.def	Tue May  2 09:50:03 2000
@@ -500,2 +500,3 @@ EXPORTS
 	rb_str_to_str
+	rb_str_associate
 	rb_obj_as_string
@@ -510,2 +511,4 @@ EXPORTS
 	rb_str_cat
+	rb_str_cat2
+	rb_str_append
 	rb_str_concat
@@ -570,2 +573,3 @@ EXPORTS
 	rb_const_get_at
+	rb_autoload_load
 	rb_const_get
@@ -573,4 +577,4 @@ EXPORTS
 	rb_mod_const_at
-	rb_mod_constants
 	rb_mod_const_of
+	rb_mod_constants
 	rb_const_defined_at
@@ -579,4 +583,12 @@ EXPORTS
 	rb_const_set
+	rb_const_assign
 	rb_define_const
 	rb_define_global_const
+	rb_cvar_declare
+	rb_cvar_set
+	rb_cvar_get
+	rb_cvar_defined
+	rb_cv_set
+	rb_cv_get
+	rb_define_class_variable
 	rb_iv_get

--
小松克行 / Katsuyuki Komatsu <[e-mail]>