diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-06-03 20:31:58 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-06-03 20:31:58 (GMT) |
| commit | 60c6195c4c60a3493f13ecb118fe433cfbd4af98 (patch) | |
| tree | 2819b0d8c05dd43fd8ef3bf605159257243774f3 | |
| parent | bcc20b58f79b107e5877ba74855fd4f5b6f567df (diff) | |
| parent | 68d9ec32251e4fef72df8960441ff9784a7b8381 (diff) | |
| download | tcl-60c6195c4c60a3493f13ecb118fe433cfbd4af98.zip tcl-60c6195c4c60a3493f13ecb118fe433cfbd4af98.tar.gz tcl-60c6195c4c60a3493f13ecb118fe433cfbd4af98.tar.bz2 | |
merge 8.5
| -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 46b9843..583cd01 100755 --- a/unix/configure +++ b/unix/configure @@ -7840,7 +7840,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="" @@ -7848,7 +7848,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 ea7fcc7..cc7c936 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1550,14 +1550,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//` |