merge revision(s) 35687:35691:

	* ext/zlib/extconf.rb: Use an exception instaed of bare puts.

	* ext/psych/extconf.rb: Use an exception instaed of bare abort.

	* ext/fiddle/extconf.rb: Use an exception instaed of bare abort.

	* ext/readline/extconf.rb: Use an exception instead of bare exit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 23 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index ac3d2336ed..630358fa49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/zlib/extconf.rb: Use an exception instaed of bare puts.
+
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/psych/extconf.rb: Use an exception instaed of bare abort.
+
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/fiddle/extconf.rb: Use an exception instaed of bare abort.
+
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/readline/extconf.rb: Use an exception instead of bare exit.
+
 Sun Sep  9 02:34:39 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* ext/extmk.rb: Show a message when extconf.rb raised an exception.
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 03b0ac2765..78622b6a6f 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -9,12 +9,12 @@ unless have_header('ffi.h')
   if have_header('ffi/ffi.h')
     $defs.push(format('-DUSE_HEADER_HACKS'))
   else
-    abort "ffi.h is missing. Please install libffi."
+    raise "ffi.h is missing. Please install libffi."
   end
 end
 
 unless have_library('ffi') || have_library('libffi')
-  abort "libffi is missing. Please install libffi."
+  raise "libffi is missing. Please install libffi."
 end
 
 have_header 'sys/mman.h'
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index b8e9e0fab4..e1c37ce5fa 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -40,14 +40,14 @@ when true
   unless (have_readline_header("editline/readline.h") ||
           have_readline_header("readline/readline.h")) &&
           have_library("edit", "readline")
-    exit
+    raise "libedit not found"
   end
 when false
   # --disable-libedit
   unless ((have_readline_header("readline/readline.h") &&
            have_readline_header("readline/history.h")) &&
            have_library("readline", "readline"))
-    exit
+    raise "readline not found"
   end
 else
   # does not specify
@@ -57,7 +57,7 @@ else
             have_library("edit", "readline"))) ||
             (have_readline_header("editline/readline.h") &&
              have_library("edit", "readline"))
-    exit
+    raise "readline nor libedit not found"
   end
 end
 
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb
index 499f55a046..da91046fdb 100644
--- a/ext/zlib/extconf.rb
+++ b/ext/zlib/extconf.rb
@@ -48,8 +48,7 @@ if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
     'OS_UNKNOWN' => 'Unknown',
   }
   unless OS_NAMES.key? os_code then
-    puts "invalid OS_CODE `#{os_code}'"
-    exit
+    raise "invalid OS_CODE `#{os_code}'"
   end
   message "#{OS_NAMES[os_code]}\n"
   defines << "OS_CODE=#{os_code}"
diff --git a/version.h b/version.h
index 287c9eef92..fc18a05603 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 267
+#define RUBY_PATCHLEVEL 268
 
 #define RUBY_RELEASE_DATE "2012-09-09"
 #define RUBY_RELEASE_YEAR 2012