kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb (dir_config): prior --with flag.

Browse source 
* 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:
nobu 2002-01-31 12:03:08 +00:00
parent 097c41755d
commit 3d51761abd
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 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. * lib/pp.rb (File::Stat#pretty_print): print rdev_major and rdev_minor.

25
lib/mkmf.rb
View file

@ -299,11 +299,8 @@ def arg_config(config, default=nil)
$configure_args = {} $configure_args = {}
for arg in CONFIG["configure_args"].split + ARGV for arg in CONFIG["configure_args"].split + ARGV
next unless /^--/ =~ arg next unless /^--/ =~ arg
if /=/ =~ arg arg, val = arg.split('=', 2)
$configure_args[$`] = $' $configure_args[arg] = val || true
else
$configure_args[arg] = true
end
end end
end end
$configure_args.fetch(config, default) $configure_args.fetch(config, default)
@ -340,21 +337,13 @@ def create_header()
end end
def dir_config(target, idefault=nil, ldefault=nil) def dir_config(target, idefault=nil, ldefault=nil)
if idefault && ldefault == nil if dir = with_config(target + "-dir", (idefault unless ldefault))
default = idefault idefault = dir + "/include"
idefault = default + "/include" ldefault = dir + "/lib"
ldefault = default + "/lib"
end end
dir = with_config(target + "-dir", default) idir = with_config(target + "-include", idefault)
ldir = with_config(target + "-lib", ldefault)
idir, ldir = if dir then [
dir + "/include",
dir + "/lib"
] else [
with_config(target + "-include", idefault),
with_config(target + "-lib", ldefault)
] end
if idir if idir
idircflag = "-I" + idir idircflag = "-I" + idir