summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e159467ba..a65e8bb448 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 0f701e0a05..1051a9a929 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