diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-24 12:58:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-24 12:58:42 +0000 |
| commit | 0a331272e41201c5170ae64872bebb28c141f194 (patch) | |
| tree | c99777e908e584ebe5464882ee920688f880235b /lib | |
| parent | f81b064d7da630563ad1e3b046176df9a482fa90 (diff) | |
| download | ruby-0a331272e41201c5170ae64872bebb28c141f194.tar.gz ruby-0a331272e41201c5170ae64872bebb28c141f194.tar.xz ruby-0a331272e41201c5170ae64872bebb28c141f194.zip | |
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |