diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-06-03 20:31:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-06-03 20:31:31 (GMT) |
| commit | 68d9ec32251e4fef72df8960441ff9784a7b8381 (patch) | |
| tree | 6e8dee7119656a6c0e133368223d2a162c424538 | |
| parent | 312d727024ac9e43d8989d411361cb1d0b50b9b5 (diff) | |
| parent | 596b5e9c70fd7bbef2a6d801c647bb939482961a (diff) | |
| download | tcl-68d9ec32251e4fef72df8960441ff9784a7b8381.zip tcl-68d9ec32251e4fef72df8960441ff9784a7b8381.tar.gz tcl-68d9ec32251e4fef72df8960441ff9784a7b8381.tar.bz2 | |
merge 8.4
| -rw-r--r-- | tests/httpd | 2 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/httpd b/tests/httpd index f810797..232e80a 100644 --- a/tests/httpd +++ b/tests/httpd @@ -40,7 +40,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 784599b..61c2247 100755 --- a/unix/configure +++ b/unix/configure @@ -7680,7 +7680,7 @@ fi # 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="" @@ -7688,7 +7688,7 @@ fi 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 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index d87fd94..850e940 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1562,14 +1562,14 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # 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="" AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}']) + LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) AS_IF([test "${TCL_THREADS}" = "1"], [ # The -pthread needs to go in the LDFLAGS, not LIBS LIBS=`echo $LIBS | sed s/-pthread//` |