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

* ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where

Browse source 
--with-xx-{include,lib} is ignored when --with-xx-dir is
  specified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2002-03-04 04:24:26 +00:00
parent 8c85fc1ec9
commit ab1b4b5869
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Mar 4 13:19:18 2002 Akinori MUSHA <knu@iDaemons.org>
* ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where
--with-xx-{include,lib} is ignored when --with-xx-dir is
specified.
Fri Mar 1 11:29:10 2002 WATANABE Hirofumi <eban@ruby-lang.org> Fri Mar 1 11:29:10 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const * ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const

18
ext/extmk.rb.in
View file

@ -333,21 +333,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