From 0a331272e41201c5170ae64872bebb28c141f194 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Oct 2002 12:58:42 +0000
Subject: * configure.in (LIBPATHFLAG): avoid $ substitution.  
 [ruby-dev:18577]

* ext/extmk.rb (extmake): expand $srcdir.

* ext/win32ole/extconf.rb: should not override $CFLAGS, but
  append.

* lib/mkmf.rb (config_string): use given config hash.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog               | 12 +++++++++++-
 configure.in            |  2 +-
 ext/extmk.rb            |  2 +-
 ext/win32ole/extconf.rb |  8 +++-----
 lib/mkmf.rb             |  4 ++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 75ab1ff85..678d4a2bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-Thu Oct 24 14:27:38 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+Thu Oct 24 21:57:02 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* configure.in (LIBPATHFLAG): avoid $ substitution.
+	  [ruby-dev:18577]
+
+	* ext/extmk.rb (extmake): expand $srcdir.
+
+	* ext/win32ole/extconf.rb: should not override $CFLAGS, but
+	  append.
+
+	* lib/mkmf.rb (config_string): use given config hash.
 
 	* bcc32/Makefile.sub (.rc.res): directory part may be empty in
 	  Borland make.
diff --git a/configure.in b/configure.in
index e4e850787..0e4bc356e 100644
--- a/configure.in
+++ b/configure.in
@@ -779,7 +779,7 @@ if test "$with_dln_a_out" != yes; then
 	netbsd*)	LDSHARED='${CC} -shared'
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="-Wl,-export-dynamic"
-			    LIBPATHFLAG=' -L%1$$s -Wl,-R%1$$s'
+			    LIBPATHFLAG=' -L%1$-s -Wl,-R%1$-s'
 			fi
 			rb_cv_dlopen=yes ;;
 	openbsd*) 	LDSHARED="ld -Bforcearchive -Bshareable"
diff --git a/ext/extmk.rb b/ext/extmk.rb
index c98afdf44..e43638326 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -50,7 +50,7 @@ def extmake(target)
     $srcdir = File.join($top_srcdir, "ext", $mdir)
     unless $ignore
       if $static ||
-	older("./Makefile", *MTIMES + %w"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb")
+	older("./Makefile", *MTIMES + %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb")
       then
 	$defs = []
 	Logging::logfile 'mkmf.log'
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index f627fcabb..c0dfd4c72 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -17,10 +17,8 @@ end
 
 case RUBY_PLATFORM
 when /mswin32/
-  $CFLAGS='/W3'
-when /mingw/
-  $CFLAGS='-DNONAMELESSUNION'
-when /cygwin/
-  $CFLAGS='-DNONAMELESSUNION'
+  $CFLAGS += ' /W3'
+when /cygwin/, /mingw/
+  $defs << '-DNONAMELESSUNION'
 end
 create_win32ole_makefile
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 1f0ef5d37..b20a06cdd 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -820,8 +820,8 @@ Config::CONFIG["topdir"] = CONFIG["topdir"] =
 $configure_args["--topdir"] ||= $curdir
 $ruby = arg_config("--ruby", CONFIG["ruby_install_name"])
 
-def config_string(key)
-  return unless s = CONFIG[key] and !s.empty?
+def config_string(key, config = CONFIG)
+  return unless s = config[key] and !s.empty?
   return s unless block_given?
   yield s
 end
-- 
cgit