ruby-list

なかだです。

At Thu, 6 Dec 2001 01:25:44 +0900,
tamra@mail.goo.ne.jp wrote:
> mkmf.rb の dir_configですが、--with-<target>-{include,lib}を利用するときに
> 引数の数で挙動が変わってしまいます。
(snip)
> 後、dir_config が引数2つの時に同じものを補う処理を入れました。

「同じもの補う」という意味がよく分からないんですが。

> dir_config の初期ディレクトリ指定がない場合に、'/usr/local' を補うのは
> マズイかな ?

というか、idefault && ldefault == nilのifの中なので、ここには決
して行かないのでは。

ベースのデフォルトを指定するのでなく、idefaultだけを指定して
ldefaultを指定しないという方法がないようなので、こんなのを考え
てみました。


Index: mkmf.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/mkmf.rb,v
retrieving revision 1.63
diff -u -2 -p -r1.63 mkmf.rb
--- mkmf.rb	2001/08/15 18:51:58	1.63
+++ mkmf.rb	2001/12/06 01:35:51
@@ -336,20 +336,13 @@ def create_header()
 end
 
-def dir_config(target, idefault=nil, ldefault=nil)
-  if idefault && ldefault == nil
-    default = idefault
+def dir_config(target, idefault=nil, ldefault=(default=idefault)&&nil)
+  default = with_config(target + "-dir", default)
+  if default
     idefault = default + "/include"
     ldefault = default + "/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

$ cat test.sh
#! /bin/sh

for conf in \
    "" \
    "'/hoge'" \
    "'/hoge/include','/hoge/lib'" \
    "nil,'/hoge/lib'" \
    "'/hoge/include',nil"
do
    echo conf="$conf"
    for arg in \
	"" \
	--with-hoge-include=/bar/include \
	--with-hoge-lib=/bar/lib \
	--with-hoge-dir=/foo \
	"--with-hoge-dir=/foo --with-hoge-include=/bar/include" \
	"--with-hoge-dir=/foo --with-hoge-lib=/bar/lib"
    do
	ruby -r$1 -e "p [ARGV, dir_config('hoge'${conf:+,}$conf)]" -- $arg
    done
    echo
done

$ sh test.sh ./mkmf
conf=
[[], [nil, nil]]
[["--with-hoge-include=/bar/include"], ["/bar/include", nil]]
[["--with-hoge-lib=/bar/lib"], [nil, "/bar/lib"]]
[["--with-hoge-dir=/foo"], ["/foo/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-include=/bar/include"], ["/bar/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-lib=/bar/lib"], ["/foo/include", "/bar/lib"]]

conf='/hoge'
[[], ["/hoge/include", "/hoge/lib"]]
[["--with-hoge-include=/bar/include"], ["/bar/include", "/hoge/lib"]]
[["--with-hoge-lib=/bar/lib"], ["/hoge/include", "/bar/lib"]]
[["--with-hoge-dir=/foo"], ["/foo/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-include=/bar/include"], ["/bar/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-lib=/bar/lib"], ["/foo/include", "/bar/lib"]]

conf='/hoge/include','/hoge/lib'
[[], ["/hoge/include", "/hoge/lib"]]
[["--with-hoge-include=/bar/include"], ["/bar/include", "/hoge/lib"]]
[["--with-hoge-lib=/bar/lib"], ["/hoge/include", "/bar/lib"]]
[["--with-hoge-dir=/foo"], ["/foo/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-include=/bar/include"], ["/bar/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-lib=/bar/lib"], ["/foo/include", "/bar/lib"]]

conf=nil,'/hoge/lib'
[[], [nil, "/hoge/lib"]]
[["--with-hoge-include=/bar/include"], ["/bar/include", "/hoge/lib"]]
[["--with-hoge-lib=/bar/lib"], [nil, "/bar/lib"]]
[["--with-hoge-dir=/foo"], ["/foo/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-include=/bar/include"], ["/bar/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-lib=/bar/lib"], ["/foo/include", "/bar/lib"]]

conf='/hoge/include',nil
[[], ["/hoge/include", nil]]
[["--with-hoge-include=/bar/include"], ["/bar/include", nil]]
[["--with-hoge-lib=/bar/lib"], ["/hoge/include", "/bar/lib"]]
[["--with-hoge-dir=/foo"], ["/foo/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-include=/bar/include"], ["/bar/include", "/foo/lib"]]
[["--with-hoge-dir=/foo", "--with-hoge-lib=/bar/lib"], ["/foo/include", "/bar/lib"]]



-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦

Thread

Prev Next

In This Thread

Prev Next

[#32695] md5.so (LoadError) — FUKUI Osamu <o-fukui@...>

[#32701] Racc website 404 — rubikitch <rubikitch@...>

[#32721] コマンドラインオプション -K と -e — "Tatsuaki Nagai" <Tatsuaki_Nagai@...>

[#32727] require "./xxx" の「カレントディレクトリ」の意味 — Take_tk <ggb03124@...>

[#32735] Re: コマンドラインオプション -K と -e — "Tatsuaki Nagai" <Tatsuaki_Nagai@...>

[#32740] 空白を含むファイルを system で起動するには — Take_tk <ggb03124@...>

[#32758] [Q]Ruby/Gtk で画面を変化させる — yamato@...

[#32772] newdate — tadf@...

[#32783] Ruby/Becky! 0.9.7 — "T.Shimomura" <redbugml@...>

[#32797] dir_config (mkmf.rb) のオプション指定の優先順位 — tamra@...

[#32800] [ANN]irbsh-0.4.4 — rubikitch <rubikitch@...>

[#32801] blade Internal Server Error — Kazuhiro Yoshida <moriq.kazuhiro@...>

[#32806] Lucie 0.0.1 — TAKAMIYA Yasuhito <takamiya@...>

[#32807] irb 0.8 release — keiju@... (Keiju ISHITSUKA)

[#32814] 添削お願い — Take_tk <ggb03124@...>

[#32827] Ruby Test Form — 堀川 久 <vzw00011@...>

[#32832] irb & pp — rubikitch <rubikitch@...>

[#32836] configure.in for netbsd — hiramatu@...

[#32837] RubyAEOSA 0.1.0 — FUJIMOTO Hisakuni <hisa@...>

[#32840] [ANN]RDE0.9.3.0 公開 — sakazuki <QZS01353@...>

[#32843] [ANN] irbsh-0.5.0 — rubikitch <rubikitch@...>

[#32849] -e で実行した場合うまくいかない正規表現 — "Tatsuaki Nagai" <Tatsuaki_Nagai@...>

[#32853] Re: -e で実行した場合うまくいかない正規表現 — "Tatsuaki Nagai" <Tatsuaki_Nagai@...>

[#32858] [ANN] html-template 0.15 — IKEBE Tomohiro <ikebe@...>

[#32869] RAA update — rubikitch <rubikitch@...>

[#32878] [ANN] irbsh-0.5.1 — rubikitch <rubikitch@...>

[#32892] [ANN] RubyCocoa 0.1.3 — FUJIMOTO Hisakuni <hisa@...>

[#32896] Re: cygwin database Ruby Install MySQL PostgreSQL other... MS-Access(blase) — "井上 浩一" <kyoui32@...>

[#32904] Segmentation fault — em6t-kbt@...

[#32914] rb_define_module を一回だけ呼びたい — Takeshi Horinouchi <horinout@...>

[#32921] uri.rb compatibility — rubikitch <rubikitch@...>

[#32923] Ruby/GSL — yoshiki@...

[#32925] Re: -e で実行した場合うまくいかない正規表現 — "Tatsuaki Nagai" <Tatsuaki_Nagai@...>

[#32930] irbsh の rehash が遅い — rubikitch <rubikitch@...>

[#32935] Ruby256 倍本 " 界道編 " — shukaku@...

[#32939] [watch] 情処プロ研 02-01-30 — Noritsugu Nakamura <nnakamur@...>

[#32940] gsub でマッチした文字列を小文字に変換 — Takeshi Yamamoto <hora@...>

[#32945] class-in-state — keiju@... (Keiju ISHITSUKA)

[#32946] scope-in-state — keiju@... (Keiju ISHITSUKA)

[#32948] [uri.rb] strip or not — rubikitch <rubikitch@...>

[#32953] Ruby and dRuby on Turbolinux 7 — Tohru OTOKITA <otokita@...>

[#32967] URI should be URL+URN ? — OZAWA -Crouton- Sakuro <crouton@...>

[#32974] ruby で組んだ CGI の挙動がおかしい — Toru MITANI <toru_m@...2.dion.ne.jp>

[#32978] [Q]extract regular expression from String — Masaaki Sakano <mas@...>

[#32982] ロゴ？の扱い — encore ann <i@...>

[#32987] [Media Watch] 「横着プログラミング」 — Shin-ichiro HARA <sinara@...>

[#32989] write to $> causes error on mswin32/mingw32 — "U.Nakamura" <usa@...>

[#32999] [ANN] RubyCocoa 0.2.0 — FUJIMOTO Hisakuni <hisa@...>

[#33002] Re: [ruby-talk:29048] Re: Best way to do XML-RPC — TAKAHASHI Masayoshi <maki@...>

[#33007] tmail error — rubikitch <rubikitch@...>

[#33008] racc-1.3.7 --> racc-1.4.1 ではまったこと — Noritsugu Nakamura <nnakamur@...>

[#33009] [ANN]RDE0.9.3.1 公開 — sakazuki <QZS01353@...>

[#33014] "Walrus" on LinuxJapan — Taku Nakajima <tnakajima@...>

[#33025] ruby 1.6.6 is out — matz@... (Yukihiro Matsumoto)

[#33026] Ruby 1.6.6 リファレンスマニュアル日本語版 (RD) — Kazuhiro NISHIYAMA <zn@...>

[#33038] PStore on Windows — keiichi matsunaga <ma2@...>

[#33040] win32ole と Excel 倍精度 — ISIHARA HIROSI <ishihara-h@...>

[#33042] [][][] macro Ruby — "井上 浩一" <kyoui32@...>

[#33043] Re: win32ole と Excel 倍精度 — ISIHARA HIROSI <ishihara-h@...>

[#33047] regex bug? — Yamamoto Atsushi <yamamoto@...>

[#33050] cgi.rb で cookie の encoding について — Beyond <beyond@...>

[#33067] It wants to divide dirty source. library para-amino-salicylic acid — "井上 浩一" <kyoui32@...>

[#33068] Re: [][][] macro Ruby — "井上 浩一" <kyoui32@...>

[#33070] [ANN] Walrus-0.7.4 公開 — Taku Nakajima <tnakajima@...>

[#33100] ruby_unit newest binary in djgpp — maili31s@... (SugHimsi == SUGIHARA Hiroshi)

[#33114] 新年会 — "Shin'ya Adzumi" <adzumi@...>

[#33122] 中田さんとこの・・ — Take_tk <ggb03124@...>

[#33139] setup 3.0.2 のタスクオプション — FUJIMOTO Hisakuni <hisa@...>

[#33141] [ann] Q's WebCalendar リリース — 堀川 久 <vzw00011@...>

[ruby-list:32798] Re: dir_config (mkmf.rb) のオプション指定の優先順位

Thread

In This Thread

[#32827] Ruby Test Form — 堀川久 <vzw00011@...>

[#32896] Re: cygwin database Ruby Install MySQL PostgreSQL other... MS-Access(blase) — "井上浩一" <kyoui32@...>

[#33042] [][][] macro Ruby — "井上浩一" <kyoui32@...>

[#33067] It wants to divide dirty source. library para-amino-salicylic acid — "井上浩一" <kyoui32@...>

[#33068] Re: [][][] macro Ruby — "井上浩一" <kyoui32@...>

[#33141] [ann] Q's WebCalendar リリース — 堀川久 <vzw00011@...>