* lib/mkmf.rb (libpathflag, find_header, dir_config): quote directory
  names if necessary.  [ruby-talk:104505]


Index: lib/mkmf.rb
===================================================================
RCS file: /pub/cvs/ruby/src/ruby/lib/mkmf.rb,v
retrieving revision 1.190
diff -U2 -p -d -r1.190 mkmf.rb
--- lib/mkmf.rb	20 May 2004 08:02:10 -0000	1.190
+++ lib/mkmf.rb	25 Jun 2004 02:29:10 -0000
@@ -252,5 +252,5 @@ end
 def libpathflag(libpath=$LIBPATH)
   libpath.map{|x|
-    (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x
+    (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote
   }.join
 end
@@ -542,8 +542,7 @@ def find_header(header, *paths)
       found = false
       paths.each do |dir|
-        opt = "-I#{dir}"
+        opt = "-I#{dir.quote}"
         if try_cpp(cpp_include(header), opt)
-          $INCFLAGS += " "
-          $INCFLAGS += opt
+          $INCFLAGS << " " << opt
           found = true
           break
@@ -683,5 +682,5 @@ def dir_config(target, idefault=nil, lde
     idirs -= Shellwords.shellwords($CPPFLAGS)
     unless idirs.empty?
-      $CPPFLAGS = (idirs << $CPPFLAGS).join(" ")
+      $CPPFLAGS = (idirs << $CPPFLAGS).quote.join(" ")
     end
   end