summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-01 02:36:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-01 02:36:21 +0000
commit748e6bc820e729a118a09e73229003f15fbefe28 (patch)
tree8df95805ce958ea1e86206976ffa900c24052f18
parente763894bea232f5d2ee1e6f1f57b77124527a106 (diff)
downloadruby-748e6bc820e729a118a09e73229003f15fbefe28.tar.gz
ruby-748e6bc820e729a118a09e73229003f15fbefe28.tar.xz
ruby-748e6bc820e729a118a09e73229003f15fbefe28.zip
* configure.in: _setjmp is available but _longjmp is not on mingw.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3dba7c381..81a0e22c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr 1 11:36:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: _setjmp is available but _longjmp is not on mingw.
+
Tue Apr 1 09:41:22 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
diff --git a/configure.in b/configure.in
index b9bda745f..759ac1f7a 100644
--- a/configure.in
+++ b/configure.in
@@ -704,7 +704,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd
setrgid setegid setregid setresgid issetugid pause lchown lchmod\
getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
getpriority getrlimit setrlimit sysconf group_member\
- dlopen sigprocmask sigaction sigsetjmp _setjmp vsnprintf snprintf\
+ dlopen sigprocmask sigaction sigsetjmp _setjmp _longjmp vsnprintf snprintf\
setsid telldir seekdir fchmod cosh sinh tanh log2 round signbit\
setuid setgid daemon select_large_fdset setenv unsetenv\
mktime timegm clock_gettime gettimeofday\
@@ -718,6 +718,8 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
[ac_cv_func___builtin_setjmp=no])
])
+test $ac_cv_func__longjmp = no && ac_cv_func__setjmp=no
+
AC_MSG_CHECKING(for setjmp type)
AC_ARG_WITH(setjmp-type,
[ --with-setjmp-type select setjmp type], [
@@ -730,7 +732,7 @@ AC_ARG_WITH(setjmp-type,
*) AC_MSG_ERROR(invalid setjmp type: $withval);;
esac], [unset setjmp_prefix])
if test ${setjmp_prefix+set}; then
- if test "${setjmp_prefix}" && eval test '$ac_cv_'${setjmp_prefix}setjmp = no; then
+ if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp = no; then
AC_MSG_ERROR(${setjmp_prefix}setjmp is not available)
fi
elif test "$ac_cv_func___builtin_setjmp" = yes; then