kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* configure.in: add --enable-pthread option (default: yes) 

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2003-11-22 13:58:57 +00:00
parent 615a54e77d
commit 3e6ec62611
2 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Nov 22 22:56:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* configure.in: add --enable-pthread option (default: yes)
Sat Nov 22 22:48:46 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite

70
configure.in
View File

@ -265,6 +265,10 @@ AC_ARG_WITH(libc_r,
*) with_libc_r=no;;
esac], [with_libc_r=no])
AC_ARG_ENABLE(pthread,
[ --enable-pthread use pthread library [--enable-pthread].],
[enable_pthread=$enableval], [enable_pthread=yes])
dnl Checks for libraries.
case "$target_os" in
nextstep*) ;;
@ -318,7 +322,7 @@ freebsd*) LIBS="-lm $LIBS"
if test "$rb_cv_lib_xpg4_needed" = yes; then
AC_CHECK_LIB(xpg4, setlocale)
fi
if test "$with_libc_r" = yes; then
if test "$with_libc_r" = yes -a "$enable_pthread" = 'yes'; then
AC_CACHE_CHECK([whether libc_r is supplementary to libc],
rb_cv_supplementary_lib_c_r,
[AC_TRY_CPP([
@ -672,52 +676,54 @@ int main()
], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
AC_CHECK_LIB(pthread, pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "no"; then
AC_CHECK_LIB(pthread, __pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
fi
if test "$rb_with_pthread" = "yes"; then
LIBS="-lpthread $LIBS"
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
else
AC_CHECK_LIB(pthreads, pthread_mutex_init,
if test "$enable_pthread" = "yes"; then
AC_CHECK_LIB(pthread, pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "no"; then
AC_CHECK_LIB(pthread, __pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
fi
if test "$rb_with_pthread" = "yes"; then
LIBS="-lpthreads $LIBS"
LIBS="-lpthread $LIBS"
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
else
AC_CHECK_LIB(c, pthread_mutex_init,
AC_CHECK_LIB(pthreads, pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then
AC_DEFINE(_REENTRANT)
LIBS="-lpthreads $LIBS"
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
else
AC_CHECK_LIB(c_r, pthread_mutex_init,
AC_CHECK_LIB(c, pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then
if test "$with_libc_r" = "yes"; then
if test "$rb_cv_supplementary_lib_c_r" = "yes"; then
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
MAINLIBS="-pthread $MAINLIBS"
if test "$rb_with_pthread" = "yes"; then
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
else
AC_CHECK_LIB(c_r, pthread_mutex_init,
rb_with_pthread=yes, rb_with_pthread=no)
if test "$rb_with_pthread" = "yes"; then
if test "$with_libc_r" = "yes"; then
if test "$rb_cv_supplementary_lib_c_r" = "yes"; then
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
MAINLIBS="-pthread $MAINLIBS"
fi
else
MAINLIBS="-pthread $MAINLIBS"
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
fi
else
MAINLIBS="-pthread $MAINLIBS"
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
fi
else
AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
fi
fi
fi
fi
fi