diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-01-31 12:03:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-01-31 12:03:08 +0000 |
| commit | e198d0e5cb7e8db7d4dbd8a3047455b8b014a175 (patch) | |
| tree | f5e748af812aeaca460d11251bd59fa0c59993d4 /lib | |
| parent | 8d0e2c530c5ad810860d66239a48d75d4a016e34 (diff) | |
* lib/mkmf.rb (dir_config): prior --with flag.
* lib/mkmf.rb (arg_config): avoid special variables for
font-lock-mode.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d95fe85063..c0b4712d0f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -300,11 +300,8 @@ def arg_config(config, default=nil) $configure_args = {} for arg in CONFIG["configure_args"].split + ARGV next unless /^--/ =~ arg - if /=/ =~ arg - $configure_args[$`] = $' - else - $configure_args[arg] = true - end + arg, val = arg.split('=', 2) + $configure_args[arg] = val || true end end $configure_args.fetch(config, default) @@ -341,21 +338,13 @@ def create_header() end def dir_config(target, idefault=nil, ldefault=nil) - if idefault && ldefault == nil - default = idefault - idefault = default + "/include" - ldefault = default + "/lib" + if dir = with_config(target + "-dir", (idefault unless ldefault)) + idefault = dir + "/include" + ldefault = dir + "/lib" end - dir = with_config(target + "-dir", default) - - idir, ldir = if dir then [ - dir + "/include", - dir + "/lib" - ] else [ - with_config(target + "-include", idefault), - with_config(target + "-lib", ldefault) - ] end + idir = with_config(target + "-include", idefault) + ldir = with_config(target + "-lib", ldefault) if idir idircflag = "-I" + idir |