From: Akinori MUSHA <knu@...>
Date: 2001-04-24T14:48:08+09:00
Subject: [ruby-dev:13026] Re: enhancing dir_config()

At Tue, 24 Apr 2001 03:02:28 +0900,
I wrote:
> 2. 返り値として [includedir, libdir] を返す。(現状、返り値は
> 有効に使われていない)

idir には -I が付いていたので、そのまま返してもありがたくない
ですね。さらに整理して直しました。

-- 
                     /
                    /__  __            Akinori.org / MUSHA.org
                   / )  )  ) )  /     FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ /  ( (__(  @ iDaemons.org / and.or.jp

"Freeze this moment a little bit longer, make each impression
  a little bit stronger..  Experience slips away -- Time stand still"

Index: lib/mkmf.rb
===================================================================
RCS file: /mirror/ruby/src/ruby/lib/mkmf.rb,v
retrieving revision 1.47
diff -u -r1.47 mkmf.rb
--- lib/mkmf.rb	2001/04/03 01:16:14	1.47
+++ lib/mkmf.rb	2001/04/24 05:44:12
@@ -336,21 +336,27 @@
     idefault = default + "/include"
     ldefault = default + "/lib"
   end
-  dir = with_config("%s-dir"%target, default)
-  if dir
-    idir = " -I"+dir+"/include"
-    ldir = dir+"/lib"
-  end
-  unless idir
-    dir = with_config("%s-include"%target, idefault)
-    idir = " -I"+dir if dir
+
+  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
+
+  if idir
+    idircflag = "-I" + idir
+    $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
   end
-  unless ldir
-    ldir = with_config("%s-lib"%target, ldefault)
+
+  if ldir
+    $LIBPATH |= [ldir]
   end
 
-  $CPPFLAGS += idir if idir
-  $LIBPATH |= [ldir] if ldir
+  [idir, ldir]
 end
 
 def create_makefile(target, srcdir = File.dirname($0))
@@ -581,20 +587,11 @@
 $defs = []
 
 $make = with_config("make-prog", ENV["MAKE"] || "make")
-dir = with_config("opt-dir")
-if dir
-  idir = "-I"+dir+"/include"
-  ldir = dir+"/lib"
-end
-unless idir
-  dir = with_config("opt-include")
-  idir = "-I"+dir if dir
-end
-unless ldir
-  ldir = with_config("opt-lib")
-end
 
 $CFLAGS = with_config("cflags", "")
-$CPPFLAGS = [with_config("cppflags", ""), idir].compact.join(" ")
+$CPPFLAGS = with_config("cppflags", "")
 $LDFLAGS = with_config("ldflags", "")
-$LIBPATH = [ldir].compact
+$LIBPATH = []
+
+dir_config("opt")
+dir_config("x11")
Index: ext/extmk.rb.in
===================================================================
RCS file: /mirror/ruby/src/ruby/ext/extmk.rb.in,v
retrieving revision 1.41
diff -u -r1.41 extmk.rb.in
--- ext/extmk.rb.in	2001/04/03 01:16:14	1.41
+++ ext/extmk.rb.in	2001/04/24 05:44:03
@@ -338,21 +338,27 @@
     idefault = default + "/include"
     ldefault = default + "/lib"
   end
-  dir = with_config("%s-dir"%target, default)
-  if dir
-    idir = " -I"+dir+"/include"
-    ldir = dir+"/lib"
-  end
-  unless idir
-    dir = with_config("%s-include"%target, idefault)
-    idir = " -I"+dir if dir
+
+  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
+
+  if idir
+    idircflag = "-I" + idir
+    $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
   end
-  unless ldir
-    ldir = with_config("%s-lib"%target, ldefault)
+
+  if ldir
+    $LIBPATH |= [ldir]
   end
 
-  $CPPFLAGS += idir if idir
-  $LIBPATH |= [ldir] if ldir
+  [idir, ldir]
 end
 
 def create_makefile(target)
@@ -609,23 +615,13 @@
     $local_flags = "-link /INCREMENTAL:no /EXPORT:Init_$(TARGET)"
   end
   $LOCAL_LIBS = ""		# to be assigned in extconf.rb
-  dir = with_config("opt-dir")
-  if dir
-    idir = "-I"+dir+"/include"
-    ldir = dir+"/lib"
-  end
-  unless idir
-    dir = with_config("opt-include")
-    idir = "-I"+dir if dir
-  end
-  unless ldir
-    ldir = with_config("opt-lib")
-  end
-
   $CFLAGS = ""
-  $CPPFLAGS = idir || ""
+  $CPPFLAGS = ""
   $LDFLAGS = ""
-  $LIBPATH = [ldir].compact
+  $LIBPATH = []
+
+  dir_config("opt")
+  dir_config("x11")
 
   begin
     Dir.mkdir target unless File.directory?(target)