ruby-changes:10283
From: yugui <ko1@a...>
Date: Wed, 28 Jan 2009 18:23:19 +0900 (JST)
Subject: [ruby-changes:10283] Ruby:r21828 (ruby_1_9_1): merges r21748 from trunk into ruby_1_9_1.
yugui 2009-01-28 18:22:19 +0900 (Wed, 28 Jan 2009) New Revision: 21828 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21828 Log: merges r21748 from trunk into ruby_1_9_1. * lib/mkmf.rb (try_func): got rid of c-mode confusion. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/lib/mkmf.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 21827) +++ ruby_1_9_1/ChangeLog (revision 21828) @@ -1,3 +1,7 @@ +Fri Jan 23 14:36:06 2009 Nobuyoshi Nakada <nobu@r...> + + * lib/mkmf.rb (try_func): got rid of c-mode confusion. + Fri Jan 23 13:26:45 2009 Nobuyoshi Nakada <nobu@r...> * signal.c (trap_handler): also accepts symbols. [ruby-dev:37823] Index: ruby_1_9_1/lib/mkmf.rb =================================================================== --- ruby_1_9_1/lib/mkmf.rb (revision 21827) +++ ruby_1_9_1/lib/mkmf.rb (revision 21828) @@ -524,12 +524,13 @@ def try_func(func, libs, headers = nil, &b) headers = cpp_include(headers) - try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) + try_link(<<"SRC", libs, &b) or #{headers} /*top*/ #{MAIN_DOES_NOTHING} int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; } SRC + try_link(<<"SRC", libs, &b) #{headers} /*top*/ #{MAIN_DOES_NOTHING} @@ -1316,11 +1317,7 @@ SHELL = /bin/sh #### Start of system configuration section. #### -#{ -if $extmk - "top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") -end -} +#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk} srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}.quote} topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote} hdrdir = #{CONFIG["hdrdir"].quote} -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/