summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 15:21:24 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-11 15:21:24 +0000
commit8babc0c3789ebff6d8fed3b87cd7fa0e1fcf2d23 (patch)
tree6890e472abd491fe580a80c32d93df44fb4bb2e0
parent523787f9af8a0591964c9523bd8e485b2d784b2d (diff)
merges r20210 from trunk into ruby_1_9_1.
* configure.in: fix SEGV on Mac OS X 10.5.3 with pthread. a patch from Wataru Kimura in Bug #193 [ruby-core:17333]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ced70f4b8b..aa7fdbaadc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 11 20:49:29 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * configure.in: fix SEGV on Mac OS X 10.5.3 with pthread.
+ a patch from Wataru Kimura in Bug #193 [ruby-core:17333].
+
Tue Nov 11 23:24:23 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* ruby.c: merges r20053 and r20067 from trunk into ruby_1_9_1.
diff --git a/configure.in b/configure.in
index 779d6adb23..26e8c47901 100644
--- a/configure.in
+++ b/configure.in
@@ -517,7 +517,7 @@ darwin*) LIBS="-lobjc $LIBS"
#endif
],
[
- test "x$target_cpu" = xppc && ac_cv_header_ucontext_h=no
+ test "x$target_cpu" = xpowerpc && ac_cv_header_ucontext_h=no
],
[
AC_DEFINE(BROKEN_SETREUID, 1)