diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 25 |
2 files changed, 14 insertions, 18 deletions
@@ -1,3 +1,10 @@ +Thu Jan 31 20:45:33 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * lib/mkmf.rb (dir_config): prior --with flag. + + * lib/mkmf.rb (arg_config): avoid special variables for + font-lock-mode. + Thu Jan 31 13:22:36 2002 Tanaka Akira <akr@m17n.org> * lib/pp.rb (File::Stat#pretty_print): print rdev_major and rdev_minor. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index f6ebe27f4f..8b8363af82 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -299,11 +299,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) @@ -340,21 +337,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 |