diff options
| author | hobbs <hobbs> | 2005-07-08 01:06:05 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2005-07-08 01:06:05 (GMT) |
| commit | c7cbce40a31cd045bd4d15ebf401f13f6172ab2b (patch) | |
| tree | ef6cbd99c219ed45f554068074278d1882b2ee1a /unix/tcl.m4 | |
| parent | b70197afbdb6e71461ae861830db8f544fc47505 (diff) | |
| download | tcl-c7cbce40a31cd045bd4d15ebf401f13f6172ab2b.zip tcl-c7cbce40a31cd045bd4d15ebf401f13f6172ab2b.tar.gz tcl-c7cbce40a31cd045bd4d15ebf401f13f6172ab2b.tar.bz2 | |
* unix/tcl.m4, unix/configure: Backported [Bug 1095909], removing
* unix/tclUnixPort.h: any use of readdir_r as it is not
* unix/tclUnixThrd.c: necessary and just confuses things.
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 4749011..1d59355 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -484,43 +484,6 @@ AC_DEFUN(SC_ENABLE_THREADS, [ AC_CHECK_FUNCS(pthread_attr_setstacksize) AC_CHECK_FUNCS(pthread_atfork) LIBS=$ac_saved_libs - AC_CHECK_FUNCS(readdir_r) - if test "x$ac_cv_func_readdir_r" = "xyes"; then - AC_MSG_CHECKING([how many args readdir_r takes]) - # IRIX 5.3 has a 2 arg version of readdir_r - # while other systems have a 3 arg version. - AC_CACHE_VAL(tcl_cv_two_arg_readdir_r, - AC_TRY_COMPILE([#include <stdlib.h> -#include <sys/types.h> -#ifdef NO_DIRENT_H -# include <sys/dir.h> /* logic from tcl/compat/dirent.h * -# define dirent direct * */ -#else -# include <dirent.h> -#endif -], [readdir_r(NULL, NULL);], - tcl_cv_two_arg_readdir_r=yes, tcl_cv_two_arg_readdir_r=no)) - AC_CACHE_VAL(tcl_cv_three_arg_readdir_r, - AC_TRY_COMPILE([#include <stdlib.h> -#include <sys/types.h> -#ifdef NO_DIRENT_H -# include <sys/dir.h> /* logic from tcl/compat/dirent.h * -# define dirent direct * */ -#else -# include <dirent.h> -#endif -], [readdir_r(NULL, NULL, NULL);], - tcl_cv_three_arg_readdir_r=yes, tcl_cv_three_arg_readdir_r=no)) - if test "x$tcl_cv_two_arg_readdir_r" = "xyes" ; then - AC_MSG_RESULT([2]) - AC_DEFINE(HAVE_TWO_ARG_READDIR_R) - elif test "x$tcl_cv_three_arg_readdir_r" = "xyes" ; then - AC_MSG_RESULT([3]) - AC_DEFINE(HAVE_THREE_ARG_READDIR_R) - else - AC_MSG_ERROR([unknown number of args for readdir_r]) - fi - fi else TCL_THREADS=0 AC_MSG_RESULT([no (default)]) @@ -896,9 +859,14 @@ dnl AC_CHECK_TOOL(AR, ar) AIX-*) if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes" ; then # AIX requires the _r compiler when gcc isn't being used - if test "${CC}" != "cc_r" ; then - CC=${CC}_r - fi + case "${CC}" in + *_r) + # ok ... + ;; + *) + CC=${CC}_r + ;; + esac AC_MSG_RESULT([Using $CC for compiling with threads]) fi LIBS="$LIBS -lc" |