From 2716db1b8170e013f26fa66998065b58e076283a Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 31 Jan 2002 12:03:08 +0000
Subject: * lib/mkmf.rb (dir_config): prior --with flag.

* lib/mkmf.rb (arg_config): avoid special variables for
  font-lock-mode.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f6ebe27f4..8b8363af8 100644
--- a/lib/mkmf.rb
+++ b/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
-- 
cgit