From 23ca07f00b1b87c7bfaa6cfc37265422a81ae0f3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 26 Jun 2004 02:07:40 +0000
Subject: * lib/mkmf.rb (libpathflag, dir_config): quote directory names if  
 necessary.  [ruby-talk:104505]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   | 5 ++++-
 lib/mkmf.rb | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e159467b..a65e8bb44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Sat Jun 26 11:05:39 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 26 11:07:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (aix): -b must come at the start of the command line,
 	  and -e must not appear while testing libraries.  [ruby-talk:104501]
 
+	* lib/mkmf.rb (libpathflag, dir_config): quote directory names if
+	  necessary.  [ruby-talk:104505]
+
 Fri Jun 25 15:33:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0f701e0a0..1051a9a92 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -251,7 +251,7 @@ end
 def libpathflag(libpath=$LIBPATH)
   libpath.map{|x|
     (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x
-  }.join
+  }.quote.join
 end
 
 def try_link0(src, opt="", &b)
@@ -661,7 +661,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
     idirs.collect! {|dir| "-I" + dir}
     idirs -= Shellwords.shellwords($CPPFLAGS)
     unless idirs.empty?
-      $CPPFLAGS = (idirs << $CPPFLAGS).join(" ")
+      $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
     end
   end
 
-- 
cgit