diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 13 |
2 files changed, 17 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu May 28 07:39:22 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (THREAD_MODEL): reject unknown value and checks + pthread.h only when pthread. [ruby-core:23577] + Thu May 28 03:47:46 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * sample/optparse/opttest.rb: typo fixed. [ruby-dev:38544] diff --git a/configure.in b/configure.in index f03dbfe309..60efa337c1 100644 --- a/configure.in +++ b/configure.in @@ -930,7 +930,7 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(limits.h sys/file.h sys/ioctl.h sys/syscall.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ syscall.h pwd.h grp.h a.out.h utime.h direct.h sys/resource.h \ - sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h pthread.h \ + sys/mkdev.h sys/utime.h xti.h netinet/in_systm.h float.h ieeefp.h \ ucontext.h intrinsics.h langinfo.h locale.h sys/sendfile.h time.h \ net/socket.h sys/socket.h) @@ -2167,6 +2167,17 @@ case "$target_os" in esac MINIOBJS="$MINIDLNOBJ" +case "$THREAD_MODEL" in +when(pthread) + AC_CHECK_HEADERS(pthread.h) + ;; +when(win32) + ;; +when(*) + AC_MSG_ERROR(unknown thread model $THREAD_MODEL) + ;; +esac + case "$FIRSTMAKEFILE" in when(*GNUmakefile:*) gnumake=yes |