merge revision(s) 52124: [Backport #11591]

	* configure.in: check for libunwind.h, which is not available in
	  very old OS X SDK.  [ruby-core:71080] [Bug #11591]


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

4 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 155c834abd..bb7a163658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 29 22:56:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for libunwind.h, which is not available in
+	  very old OS X SDK.  [ruby-core:71080] [Bug #11591]
+
 Thu Oct 29 22:51:59 2015  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
diff --git a/configure.in b/configure.in
index 73f96b682b..343c04c5ac 100644
--- a/configure.in
+++ b/configure.in
@@ -2850,6 +2850,7 @@ AS_CASE(["$target_cpu-$target_os"],
     AC_CHECK_HEADERS([execinfo.h])
     if test "x$ac_cv_header_execinfo_h" = xyes; then
 	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_HEADERS([libunwind.h])
     fi],
 [*-freebsd*|x86_64-netbsd*], [
     AC_CHECK_HEADERS([execinfo.h])
diff --git a/version.h b/version.h
index 9aaee54a40..2dd1393d5f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.8"
 #define RUBY_RELEASE_DATE "2015-10-29"
-#define RUBY_PATCHLEVEL 406
+#define RUBY_PATCHLEVEL 407
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 10
diff --git a/vm_dump.c b/vm_dump.c
index 6caea9f5a5..d3cbf88ea8 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -435,7 +435,7 @@ rb_vmdebug_thread_dump_state(VALUE self)
 # if HAVE_LIBUNWIND
 #  undef backtrace
 #  define backtrace unw_backtrace
-# elif defined(__APPLE__) && defined(__x86_64__)
+# elif defined(__APPLE__) && defined(__x86_64__) && defined(HAVE_LIBUNWIND_H)
 #  define UNW_LOCAL_ONLY
 #  include <libunwind.h>
 #  undef backtrace