merge revision(s) 42713: [Backport #8792]

	* configure.in (sys/pstat.h): fix missing header check for
	  missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]


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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d906909b7e..124786491c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 12 01:18:44 2013  Michal Rokos  <michal@rokos.cz>
+
+	* configure.in (sys/pstat.h): fix missing header check for
+	  missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]
+
 Thu Sep 12 01:02:56 2013  Benoit Daloze  <eregontp@gmail.com>
 
 	* test/ruby/test_time.rb: use the in_timezone() helper
diff --git a/configure.in b/configure.in
index 381dfd3ae4..bc6855dc93 100644
--- a/configure.in
+++ b/configure.in
@@ -1616,6 +1616,7 @@ AS_CASE(["$target_os"],
 [aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
 [hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
 [])
+AC_CHECK_HEADERS(sys/pstat.h)
 
 
 AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
diff --git a/version.h b/version.h
index 6ceede6fbd..5d6b3bbb1b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-09-12"
-#define RUBY_PATCHLEVEL 301
+#define RUBY_PATCHLEVEL 302
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 9