kosaki	2012-09-09 15:39:23 +0900 (Sun, 09 Sep 2012)

  New Revision: 36929

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36929

  Log:
    merge revision(s) 35685
    
    * ext/extmk.rb: Show a message when extconf.rb raised an exception.
    * ext/openssl/extconf.rb: Use exception raising instead of message
      and/or abort. We want to display error message to console _and_
      logging into mkmf.log.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/extmk.rb
    branches/ruby_1_9_3/ext/openssl/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36928)
+++ ruby_1_9_3/ChangeLog	(revision 36929)
@@ -1,3 +1,10 @@
+Sun Sep  9 02:34:39 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/extmk.rb: Show a message when extconf.rb raised an exception.
+	* ext/openssl/extconf.rb: Use exception raising instead of message
+	  and/or abort. We want to display error message to console _and_
+	  logging into mkmf.log.
+
 Sun Sep  9 02:30:20 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* thread.c (rb_mutex_lock): stop multiple threads use
Index: ruby_1_9_3/ext/openssl/extconf.rb
===================================================================
--- ruby_1_9_3/ext/openssl/extconf.rb	(revision 36928)
+++ ruby_1_9_3/ext/openssl/extconf.rb	(revision 36929)
@@ -58,8 +58,7 @@
 end
 
 unless have_header("openssl/conf_api.h")
-  message "OpenSSL 0.9.6 or later required.\n"
-  exit 1
+  raise "OpenSSL 0.9.6 or later required."
 end
 
 %w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")}
Index: ruby_1_9_3/ext/extmk.rb
===================================================================
--- ruby_1_9_3/ext/extmk.rb	(revision 36928)
+++ ruby_1_9_3/ext/extmk.rb	(revision 36929)
@@ -183,6 +183,8 @@
 	end
       rescue SystemExit
 	# ignore
+      rescue => error
+        ok = false
       ensure
 	rm_f "conftest*"
 	config = $0
@@ -194,7 +196,15 @@
       open(makefile, "w") do |f|
 	f.print(*dummy_makefile(CONFIG["srcdir"]))
       end
-      print "Failed to configure #{target}. It will not be installed.\n"
+
+      mess = "Failed to configure #{target}. It will not be installed.\n"
+      if error
+        mess.prepend(error.to_s + "\n")
+      end
+
+      Logging::message(mess)
+      print(mess)
+      $stdout.flush
       return true
     end
     args = sysquote($mflags)
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36928)
+++ ruby_1_9_3/version.h	(revision 36929)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 266
+#define RUBY_PATCHLEVEL 267
 
 #define RUBY_RELEASE_DATE "2012-09-09"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/