summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-07-26 09:25:04 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-07-26 09:25:04 (GMT)
commit53d8f7cd998e372fab2f5e6e9da12bdb75774db2 (patch)
treefed1b6d408fa4ca353af6a43b0e46a5ec48c1826
parentc18ff320dadb2de0fb7fa21ef2dedf768f86979b (diff)
parent1eb974e906f684e45986bca8eee145e1904ec8d2 (diff)
downloadtk-53d8f7cd998e372fab2f5e6e9da12bdb75774db2.zip
tk-53d8f7cd998e372fab2f5e6e9da12bdb75774db2.tar.gz
tk-53d8f7cd998e372fab2f5e6e9da12bdb75774db2.tar.bz2
sync with Tcl version
FossilOrigin-Name: 81d1637c79438361c0109801c69035ab832eed90
-rwxr-xr-xunix/configure5
-rw-r--r--unix/tcl.m45
2 files changed, 6 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index b0d5f3b..e1e7dff 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4035,7 +4035,7 @@ echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you m
# Does the pthread-implementation provide
# 'pthread_attr_setstacksize' ?
-for ac_func in pthread_attr_setstacksize
+for ac_func in pthread_attr_setstacksize pthread_atfork
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -4913,7 +4913,8 @@ fi
SHLIB_CFLAGS=""
SHLIB_LD='${CC} -shared'
SHLIB_SUFFIX=".dll"
- DL_OBJS="tclLoadDl.o tclWinError.o"
+ DL_OBJS="tclLoadDl.o"
+ PLAT_OBJS="tclWinError.o"
DL_LIBS="-ldl"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index b9b6532..dc5c16a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -676,7 +676,7 @@ AC_DEFUN([SC_ENABLE_THREADS], [
# Does the pthread-implementation provide
# 'pthread_attr_setstacksize' ?
- AC_CHECK_FUNCS(pthread_attr_setstacksize)
+ AC_CHECK_FUNCS(pthread_attr_setstacksize pthread_atfork)
else
TCL_THREADS=0
fi
@@ -1224,7 +1224,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_CFLAGS=""
SHLIB_LD='${CC} -shared'
SHLIB_SUFFIX=".dll"
- DL_OBJS="tclLoadDl.o tclWinError.o"
+ DL_OBJS="tclLoadDl.o"
+ PLAT_OBJS="tclWinError.o"
DL_LIBS="-ldl"
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""