mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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/trunk@2036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
097c41755d
commit
3d51761abd
2 changed files with 14 additions and 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.
|
||||
|
|
25
lib/mkmf.rb
25
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
|
||||
|
|
Loading…
Reference in a new issue