From 9eb90af0bc6b9d4fd3298354cab6e6219c9bad49 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 12 Oct 2006 09:28:28 +0000
Subject: * ext/tk/tkutil/tkutil.c (cbsubst_table_setup): need to handle new  
 character literal (1 char string).

* lib/mkmf.rb: shut up some warnings from tk's extconf.rb.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 5dad67975..45900fe0f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1043,6 +1043,7 @@ def configuration(srcdir)
       CONFIG['PATH_SEPARATOR'] = ';'
     end
   end
+  CONFIG["hdrdir"] ||= $hdrdir
   mk << %{
 SHELL = /bin/sh
 
@@ -1107,7 +1108,7 @@ COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
 
 #### End of system configuration section. ####
 
-preload = #{$preload ? $preload.join(' ') : ''}
+preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''}
 }
   if $nmake == ?b
     mk.each do |x|
-- 
cgit