summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-06-03 17:26:10 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-06-03 17:26:10 (GMT)
commit6efc06566b9ee1b8ed7645920b7f37226cc00643 (patch)
treee82c6ea75216223c2d056e6f4cfe8c90e0371150
parentd2673c18e756c5e38c377eee7ba8a1afbf8c0af1 (diff)
parent596b5e9c70fd7bbef2a6d801c647bb939482961a (diff)
downloadtcl-core_8_4_20_rc.zip
tcl-core_8_4_20_rc.tar.gz
tcl-core_8_4_20_rc.tar.bz2
-rw-r--r--tests/httpd2
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/httpd b/tests/httpd
index 3ea8024..7ba07af 100644
--- a/tests/httpd
+++ b/tests/httpd
@@ -39,7 +39,7 @@ proc httpdAccept {newsock ipaddr port} {
fconfigure $newsock -blocking 0 -translation {auto crlf}
httpd_log $newsock Connect $ipaddr $port
set data(ipaddr) $ipaddr
- fileevent $newsock readable [list httpdRead $newsock]
+ after 50 [list fileevent $newsock readable [list httpdRead $newsock]]
}
# read data from a client request
diff --git a/unix/configure b/unix/configure
index b7d2fb6..403a49f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -3425,14 +3425,14 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
if test $doRpath = yes ; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
fi
if test "${TCL_THREADS}" = "1" ; then
# The -pthread needs to go in the LDFLAGS, not LIBS
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 85b8f82..45d19ae 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1564,14 +1564,14 @@ dnl AC_CHECK_TOOL(AR, ar)
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
if test $doRpath = yes ; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
fi
if test "${TCL_THREADS}" = "1" ; then
# The -pthread needs to go in the LDFLAGS, not LIBS