From b9762ef2962dc75df99efafc5c3f674359ad428d Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Oct 2011 13:17:20 +0000
Subject: merges 33352 from trunk into ruby_1_9_3. -- * configure.in
 (pthread_np.h): needs pthread.h to be included   previously on OpenBSD.  a
 patch by George Koehler <xkernigh AT   netscape.net> at [ruby-core:39752]. 
 [Bug #5376]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 6 ++++++
 configure.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 616136f5f7..644d3ce1f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 28 09:14:16 2011  Nobuyoshi Nakada  <>
+
+	* configure.in (pthread_np.h): needs pthread.h to be included
+	  previously on OpenBSD.  a patch by George Koehler <xkernigh AT
+	  netscape.net> at [ruby-core:39752].  [Bug #5376]
+
 Tue Sep 13 15:02:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/pstore.rb (PStore): always open in binary mode even if
diff --git a/configure.in b/configure.in
index 73c87b708d..5bc2e4eea1 100644
--- a/configure.in
+++ b/configure.in
@@ -1817,7 +1817,7 @@ if test x"$enable_pthread" = xyes; then
 	AC_DEFINE(_REENTRANT)
 	AC_DEFINE(_THREAD_SAFE)
 	AC_DEFINE(HAVE_LIBPTHREAD)
-	AC_CHECK_HEADERS(pthread_np.h)
+	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
 	AS_CASE([$pthread_lib],
 	[c],    [],
 	[root], [],
-- 
cgit v1.2.3