summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-10-29 13:12:03 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-10-29 13:12:03 (GMT)
commit48abc4faa37b34ffbe405b86425aa8415da29e88 (patch)
tree781b71b889a7de7512ede95a0e96ec7f341ecc19
parent0dd6aea93ddc469a60059a29582f10a3a472e00d (diff)
parent18425b42d186aee1a919721890d7ffeb875137c3 (diff)
downloadtcl-48abc4faa37b34ffbe405b86425aa8415da29e88.zip
tcl-48abc4faa37b34ffbe405b86425aa8415da29e88.tar.gz
tcl-48abc4faa37b34ffbe405b86425aa8415da29e88.tar.bz2
merge 8.5
-rw-r--r--library/platform/platform.tcl2
-rw-r--r--library/tzdata/America/Fort_Nelson151
-rw-r--r--library/tzdata/Europe/Istanbul3
-rw-r--r--library/tzdata/Pacific/Fiji72
-rw-r--r--library/tzdata/Pacific/Norfolk3
-rw-r--r--tests/platform.test13
-rwxr-xr-xunix/configure231
-rw-r--r--unix/configure.in6
-rw-r--r--unix/tcl.m442
9 files changed, 205 insertions, 318 deletions
diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index c596e60..35a22a3 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -165,7 +165,7 @@ proc ::platform::identify {} {
global tcl_platform
set id [generic]
- regexp {^([^-]+)-([^-]+)$} $id -> plat ver wow cpu
+ regexp {^([^-]+)-([^-]+)$} $id -> plat cpu
switch -- $plat {
solaris {
diff --git a/library/tzdata/America/Fort_Nelson b/library/tzdata/America/Fort_Nelson
new file mode 100644
index 0000000..d819368
--- /dev/null
+++ b/library/tzdata/America/Fort_Nelson
@@ -0,0 +1,151 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:America/Fort_Nelson) {
+ {-9223372036854775808 -29447 0 LMT}
+ {-2713880953 -28800 0 PST}
+ {-1632060000 -25200 1 PDT}
+ {-1615129200 -28800 0 PST}
+ {-880207200 -25200 1 PWT}
+ {-769395600 -25200 1 PPT}
+ {-765385200 -28800 0 PST}
+ {-757353600 -28800 0 PST}
+ {-725817600 -28800 0 PST}
+ {-715788000 -25200 1 PDT}
+ {-702486000 -28800 0 PST}
+ {-684338400 -25200 1 PDT}
+ {-671036400 -28800 0 PST}
+ {-652888800 -25200 1 PDT}
+ {-639586800 -28800 0 PST}
+ {-620834400 -25200 1 PDT}
+ {-608137200 -28800 0 PST}
+ {-589384800 -25200 1 PDT}
+ {-576082800 -28800 0 PST}
+ {-557935200 -25200 1 PDT}
+ {-544633200 -28800 0 PST}
+ {-526485600 -25200 1 PDT}
+ {-513183600 -28800 0 PST}
+ {-495036000 -25200 1 PDT}
+ {-481734000 -28800 0 PST}
+ {-463586400 -25200 1 PDT}
+ {-450284400 -28800 0 PST}
+ {-431532000 -25200 1 PDT}
+ {-418230000 -28800 0 PST}
+ {-400082400 -25200 1 PDT}
+ {-386780400 -28800 0 PST}
+ {-368632800 -25200 1 PDT}
+ {-355330800 -28800 0 PST}
+ {-337183200 -25200 1 PDT}
+ {-323881200 -28800 0 PST}
+ {-305733600 -25200 1 PDT}
+ {-292431600 -28800 0 PST}
+ {-273679200 -25200 1 PDT}
+ {-260982000 -28800 0 PST}
+ {-242229600 -25200 1 PDT}
+ {-226508400 -28800 0 PST}
+ {-210780000 -25200 1 PDT}
+ {-195058800 -28800 0 PST}
+ {-179330400 -25200 1 PDT}
+ {-163609200 -28800 0 PST}
+ {-147880800 -25200 1 PDT}
+ {-131554800 -28800 0 PST}
+ {-116431200 -25200 1 PDT}
+ {-100105200 -28800 0 PST}
+ {-84376800 -25200 1 PDT}
+ {-68655600 -28800 0 PST}
+ {-52927200 -25200 1 PDT}
+ {-37206000 -28800 0 PST}
+ {-21477600 -25200 1 PDT}
+ {-5756400 -28800 0 PST}
+ {9972000 -25200 1 PDT}
+ {25693200 -28800 0 PST}
+ {41421600 -25200 1 PDT}
+ {57747600 -28800 0 PST}
+ {73476000 -25200 1 PDT}
+ {89197200 -28800 0 PST}
+ {104925600 -25200 1 PDT}
+ {120646800 -28800 0 PST}
+ {136375200 -25200 1 PDT}
+ {152096400 -28800 0 PST}
+ {167824800 -25200 1 PDT}
+ {183546000 -28800 0 PST}
+ {199274400 -25200 1 PDT}
+ {215600400 -28800 0 PST}
+ {230724000 -25200 1 PDT}
+ {247050000 -28800 0 PST}
+ {262778400 -25200 1 PDT}
+ {278499600 -28800 0 PST}
+ {294228000 -25200 1 PDT}
+ {309949200 -28800 0 PST}
+ {325677600 -25200 1 PDT}
+ {341398800 -28800 0 PST}
+ {357127200 -25200 1 PDT}
+ {372848400 -28800 0 PST}
+ {388576800 -25200 1 PDT}
+ {404902800 -28800 0 PST}
+ {420026400 -25200 1 PDT}
+ {436352400 -28800 0 PST}
+ {452080800 -25200 1 PDT}
+ {467802000 -28800 0 PST}
+ {483530400 -25200 1 PDT}
+ {499251600 -28800 0 PST}
+ {514980000 -25200 1 PDT}
+ {530701200 -28800 0 PST}
+ {536486400 -28800 0 PST}
+ {544615200 -25200 1 PDT}
+ {562150800 -28800 0 PST}
+ {576064800 -25200 1 PDT}
+ {594205200 -28800 0 PST}
+ {607514400 -25200 1 PDT}
+ {625654800 -28800 0 PST}
+ {638964000 -25200 1 PDT}
+ {657104400 -28800 0 PST}
+ {671018400 -25200 1 PDT}
+ {688554000 -28800 0 PST}
+ {702468000 -25200 1 PDT}
+ {720003600 -28800 0 PST}
+ {733917600 -25200 1 PDT}
+ {752058000 -28800 0 PST}
+ {765367200 -25200 1 PDT}
+ {783507600 -28800 0 PST}
+ {796816800 -25200 1 PDT}
+ {814957200 -28800 0 PST}
+ {828871200 -25200 1 PDT}
+ {846406800 -28800 0 PST}
+ {860320800 -25200 1 PDT}
+ {877856400 -28800 0 PST}
+ {891770400 -25200 1 PDT}
+ {909306000 -28800 0 PST}
+ {923220000 -25200 1 PDT}
+ {941360400 -28800 0 PST}
+ {954669600 -25200 1 PDT}
+ {972810000 -28800 0 PST}
+ {986119200 -25200 1 PDT}
+ {1004259600 -28800 0 PST}
+ {1018173600 -25200 1 PDT}
+ {1035709200 -28800 0 PST}
+ {1049623200 -25200 1 PDT}
+ {1067158800 -28800 0 PST}
+ {1081072800 -25200 1 PDT}
+ {1099213200 -28800 0 PST}
+ {1112522400 -25200 1 PDT}
+ {1130662800 -28800 0 PST}
+ {1143972000 -25200 1 PDT}
+ {1162112400 -28800 0 PST}
+ {1173607200 -25200 1 PDT}
+ {1194166800 -28800 0 PST}
+ {1205056800 -25200 1 PDT}
+ {1225616400 -28800 0 PST}
+ {1236506400 -25200 1 PDT}
+ {1257066000 -28800 0 PST}
+ {1268560800 -25200 1 PDT}
+ {1289120400 -28800 0 PST}
+ {1300010400 -25200 1 PDT}
+ {1320570000 -28800 0 PST}
+ {1331460000 -25200 1 PDT}
+ {1352019600 -28800 0 PST}
+ {1362909600 -25200 1 PDT}
+ {1383469200 -28800 0 PST}
+ {1394359200 -25200 1 PDT}
+ {1414918800 -28800 0 PST}
+ {1425808800 -25200 0 MST}
+}
diff --git a/library/tzdata/Europe/Istanbul b/library/tzdata/Europe/Istanbul
index 7cb4820..8eadbc3 100644
--- a/library/tzdata/Europe/Istanbul
+++ b/library/tzdata/Europe/Istanbul
@@ -133,7 +133,8 @@ set TZData(:Europe/Istanbul) {
{1396227600 10800 0 EEST}
{1414285200 7200 0 EET}
{1427590800 10800 1 EEST}
- {1445734800 7200 0 EET}
+ {1445734800 10800 1 EEST}
+ {1446944400 7200 0 EET}
{1459040400 10800 1 EEST}
{1477789200 7200 0 EET}
{1490490000 10800 1 EEST}
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index 4aae330..8f8b12f 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -20,9 +20,9 @@ set TZData(:Pacific/Fiji) {
{1414850400 46800 1 FJST}
{1421503200 43200 0 FJT}
{1446300000 46800 1 FJST}
- {1453557600 43200 0 FJT}
+ {1452952800 43200 0 FJT}
{1478354400 46800 1 FJST}
- {1485007200 43200 0 FJT}
+ {1484402400 43200 0 FJT}
{1509804000 46800 1 FJST}
{1516456800 43200 0 FJT}
{1541253600 46800 1 FJST}
@@ -30,11 +30,11 @@ set TZData(:Pacific/Fiji) {
{1572703200 46800 1 FJST}
{1579356000 43200 0 FJT}
{1604152800 46800 1 FJST}
- {1611410400 43200 0 FJT}
+ {1610805600 43200 0 FJT}
{1636207200 46800 1 FJST}
- {1642860000 43200 0 FJT}
+ {1642255200 43200 0 FJT}
{1667656800 46800 1 FJST}
- {1674309600 43200 0 FJT}
+ {1673704800 43200 0 FJT}
{1699106400 46800 1 FJST}
{1705759200 43200 0 FJT}
{1730556000 46800 1 FJST}
@@ -42,9 +42,9 @@ set TZData(:Pacific/Fiji) {
{1762005600 46800 1 FJST}
{1768658400 43200 0 FJT}
{1793455200 46800 1 FJST}
- {1800712800 43200 0 FJT}
+ {1800108000 43200 0 FJT}
{1825509600 46800 1 FJST}
- {1832162400 43200 0 FJT}
+ {1831557600 43200 0 FJT}
{1856959200 46800 1 FJST}
{1863612000 43200 0 FJT}
{1888408800 46800 1 FJST}
@@ -54,9 +54,9 @@ set TZData(:Pacific/Fiji) {
{1951308000 46800 1 FJST}
{1957960800 43200 0 FJT}
{1983362400 46800 1 FJST}
- {1990015200 43200 0 FJT}
+ {1989410400 43200 0 FJT}
{2014812000 46800 1 FJST}
- {2021464800 43200 0 FJT}
+ {2020860000 43200 0 FJT}
{2046261600 46800 1 FJST}
{2052914400 43200 0 FJT}
{2077711200 46800 1 FJST}
@@ -64,11 +64,11 @@ set TZData(:Pacific/Fiji) {
{2109160800 46800 1 FJST}
{2115813600 43200 0 FJT}
{2140610400 46800 1 FJST}
- {2147868000 43200 0 FJT}
+ {2147263200 43200 0 FJT}
{2172664800 46800 1 FJST}
- {2179317600 43200 0 FJT}
+ {2178712800 43200 0 FJT}
{2204114400 46800 1 FJST}
- {2210767200 43200 0 FJT}
+ {2210162400 43200 0 FJT}
{2235564000 46800 1 FJST}
{2242216800 43200 0 FJT}
{2267013600 46800 1 FJST}
@@ -76,9 +76,9 @@ set TZData(:Pacific/Fiji) {
{2298463200 46800 1 FJST}
{2305116000 43200 0 FJT}
{2329912800 46800 1 FJST}
- {2337170400 43200 0 FJT}
+ {2336565600 43200 0 FJT}
{2361967200 46800 1 FJST}
- {2368620000 43200 0 FJT}
+ {2368015200 43200 0 FJT}
{2393416800 46800 1 FJST}
{2400069600 43200 0 FJT}
{2424866400 46800 1 FJST}
@@ -86,11 +86,11 @@ set TZData(:Pacific/Fiji) {
{2456316000 46800 1 FJST}
{2462968800 43200 0 FJT}
{2487765600 46800 1 FJST}
- {2495023200 43200 0 FJT}
+ {2494418400 43200 0 FJT}
{2519820000 46800 1 FJST}
- {2526472800 43200 0 FJT}
+ {2525868000 43200 0 FJT}
{2551269600 46800 1 FJST}
- {2557922400 43200 0 FJT}
+ {2557317600 43200 0 FJT}
{2582719200 46800 1 FJST}
{2589372000 43200 0 FJT}
{2614168800 46800 1 FJST}
@@ -98,9 +98,9 @@ set TZData(:Pacific/Fiji) {
{2645618400 46800 1 FJST}
{2652271200 43200 0 FJT}
{2677068000 46800 1 FJST}
- {2684325600 43200 0 FJT}
+ {2683720800 43200 0 FJT}
{2709122400 46800 1 FJST}
- {2715775200 43200 0 FJT}
+ {2715170400 43200 0 FJT}
{2740572000 46800 1 FJST}
{2747224800 43200 0 FJT}
{2772021600 46800 1 FJST}
@@ -110,9 +110,9 @@ set TZData(:Pacific/Fiji) {
{2834920800 46800 1 FJST}
{2841573600 43200 0 FJT}
{2866975200 46800 1 FJST}
- {2873628000 43200 0 FJT}
+ {2873023200 43200 0 FJT}
{2898424800 46800 1 FJST}
- {2905077600 43200 0 FJT}
+ {2904472800 43200 0 FJT}
{2929874400 46800 1 FJST}
{2936527200 43200 0 FJT}
{2961324000 46800 1 FJST}
@@ -120,11 +120,11 @@ set TZData(:Pacific/Fiji) {
{2992773600 46800 1 FJST}
{2999426400 43200 0 FJT}
{3024223200 46800 1 FJST}
- {3031480800 43200 0 FJT}
+ {3030876000 43200 0 FJT}
{3056277600 46800 1 FJST}
- {3062930400 43200 0 FJT}
+ {3062325600 43200 0 FJT}
{3087727200 46800 1 FJST}
- {3094380000 43200 0 FJT}
+ {3093775200 43200 0 FJT}
{3119176800 46800 1 FJST}
{3125829600 43200 0 FJT}
{3150626400 46800 1 FJST}
@@ -132,9 +132,9 @@ set TZData(:Pacific/Fiji) {
{3182076000 46800 1 FJST}
{3188728800 43200 0 FJT}
{3213525600 46800 1 FJST}
- {3220783200 43200 0 FJT}
+ {3220178400 43200 0 FJT}
{3245580000 46800 1 FJST}
- {3252232800 43200 0 FJT}
+ {3251628000 43200 0 FJT}
{3277029600 46800 1 FJST}
{3283682400 43200 0 FJT}
{3308479200 46800 1 FJST}
@@ -142,11 +142,11 @@ set TZData(:Pacific/Fiji) {
{3339928800 46800 1 FJST}
{3346581600 43200 0 FJT}
{3371378400 46800 1 FJST}
- {3378636000 43200 0 FJT}
+ {3378031200 43200 0 FJT}
{3403432800 46800 1 FJST}
- {3410085600 43200 0 FJT}
+ {3409480800 43200 0 FJT}
{3434882400 46800 1 FJST}
- {3441535200 43200 0 FJT}
+ {3440930400 43200 0 FJT}
{3466332000 46800 1 FJST}
{3472984800 43200 0 FJT}
{3497781600 46800 1 FJST}
@@ -154,9 +154,9 @@ set TZData(:Pacific/Fiji) {
{3529231200 46800 1 FJST}
{3535884000 43200 0 FJT}
{3560680800 46800 1 FJST}
- {3567938400 43200 0 FJT}
+ {3567333600 43200 0 FJT}
{3592735200 46800 1 FJST}
- {3599388000 43200 0 FJT}
+ {3598783200 43200 0 FJT}
{3624184800 46800 1 FJST}
{3630837600 43200 0 FJT}
{3655634400 46800 1 FJST}
@@ -166,9 +166,9 @@ set TZData(:Pacific/Fiji) {
{3718533600 46800 1 FJST}
{3725186400 43200 0 FJT}
{3750588000 46800 1 FJST}
- {3757240800 43200 0 FJT}
+ {3756636000 43200 0 FJT}
{3782037600 46800 1 FJST}
- {3788690400 43200 0 FJT}
+ {3788085600 43200 0 FJT}
{3813487200 46800 1 FJST}
{3820140000 43200 0 FJT}
{3844936800 46800 1 FJST}
@@ -176,11 +176,11 @@ set TZData(:Pacific/Fiji) {
{3876386400 46800 1 FJST}
{3883039200 43200 0 FJT}
{3907836000 46800 1 FJST}
- {3915093600 43200 0 FJT}
+ {3914488800 43200 0 FJT}
{3939890400 46800 1 FJST}
- {3946543200 43200 0 FJT}
+ {3945938400 43200 0 FJT}
{3971340000 46800 1 FJST}
- {3977992800 43200 0 FJT}
+ {3977388000 43200 0 FJT}
{4002789600 46800 1 FJST}
{4009442400 43200 0 FJT}
{4034239200 46800 1 FJST}
diff --git a/library/tzdata/Pacific/Norfolk b/library/tzdata/Pacific/Norfolk
index a8fac15..b12ab8c 100644
--- a/library/tzdata/Pacific/Norfolk
+++ b/library/tzdata/Pacific/Norfolk
@@ -4,4 +4,7 @@ set TZData(:Pacific/Norfolk) {
{-9223372036854775808 40312 0 LMT}
{-2177493112 40320 0 NMT}
{-599656320 41400 0 NFT}
+ {152029800 45000 1 NFST}
+ {162912600 41400 0 NFT}
+ {1443882600 39600 0 NFT}
}
diff --git a/tests/platform.test b/tests/platform.test
index ab82d07..51b9067 100644
--- a/tests/platform.test
+++ b/tests/platform.test
@@ -1,4 +1,4 @@
-# The file tests the tcl_platform variable
+# The file tests the tcl_platform variable and platform package.
#
# This file contains a collection of tests for one or more of the Tcl
# built-in commands. Sourcing this file into Tcl runs the tests and
@@ -54,6 +54,17 @@ test platform-3.1 {CPU ID on Windows/UNIX} \
-match regexp \
-result {^(?:AuthenticAMD|CentaurHauls|CyrixInstead|GenuineIntel)$}
+# The platform package makes very few promises, but does promise that the
+# format of string it produces consists of two non-empty words separated by a
+# hyphen.
+package require platform
+test platform-4.1 {format of platform::identify result} -match regexp -body {
+ platform::identify
+} -result {^([^-]+-)+[^-]+$}
+test platform-4.2 {format of platform::generic result} -match regexp -body {
+ platform::generic
+} -result {^([^-]+-)+[^-]+$}
+
# cleanup
cleanupTests
diff --git a/unix/configure b/unix/configure
index 98c2bba..9ab51f0 100755
--- a/unix/configure
+++ b/unix/configure
@@ -857,8 +857,6 @@ Optional Features:
--enable-load allow dynamic loading and "load" command (default:
on)
--enable-symbols build with debugging symbols (default: off)
- --enable-usleep use usleep if possible to sleep, otherwise use
- Tcl_Sleep (default: on)
--enable-langinfo use nl_langinfo if possible to determine encoding at
startup, otherwise use old heuristic (default: on)
--enable-dll-unloading enable the 'unload' command (default: on)
@@ -16434,235 +16432,6 @@ _ACEOF
fi
#--------------------------------------------------------------------
-# Check for support of usleep function
-#--------------------------------------------------------------------
-
-
- # Check whether --enable-usleep or --disable-usleep was given.
-if test "${enable_usleep+set}" = set; then
- enableval="$enable_usleep"
- usleep_ok=$enableval
-else
- usleep_ok=yes
-fi;
-
- HAVE_USLEEP=0
- if test "$usleep_ok" = "yes"; then
- if test "${ac_cv_header_unistd_h+set}" = set; then
- echo "$as_me:$LINENO: checking for unistd.h" >&5
-echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6
-if test "${ac_cv_header_unistd_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_unistd_h" >&5
-echo "${ECHO_T}$ac_cv_header_unistd_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking unistd.h usability" >&5
-echo $ECHO_N "checking unistd.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <unistd.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking unistd.h presence" >&5
-echo $ECHO_N "checking unistd.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <unistd.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: unistd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: unistd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: unistd.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: unistd.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: unistd.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: unistd.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: unistd.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: unistd.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: unistd.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: unistd.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: unistd.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to the tcl lists. ##
-## ------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for unistd.h" >&5
-echo $ECHO_N "checking for unistd.h... $ECHO_C" >&6
-if test "${ac_cv_header_unistd_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_unistd_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_unistd_h" >&5
-echo "${ECHO_T}$ac_cv_header_unistd_h" >&6
-
-fi
-if test $ac_cv_header_unistd_h = yes; then
- usleep_ok=yes
-else
- usleep_ok=no
-fi
-
-
- fi
- echo "$as_me:$LINENO: checking whether to use usleep" >&5
-echo $ECHO_N "checking whether to use usleep... $ECHO_C" >&6
- if test "$usleep_ok" = "yes"; then
- if test "${tcl_cv_usleep_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <unistd.h>
-int
-main ()
-{
-usleep(0);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- tcl_cv_usleep_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_usleep_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- echo "$as_me:$LINENO: result: $tcl_cv_usleep_h" >&5
-echo "${ECHO_T}$tcl_cv_usleep_h" >&6
- if test $tcl_cv_usleep_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_USLEEP 1
-_ACEOF
-
- fi
- else
- echo "$as_me:$LINENO: result: $usleep_ok" >&5
-echo "${ECHO_T}$usleep_ok" >&6
- fi
-
-
-#--------------------------------------------------------------------
# Check for support of nl_langinfo function
#--------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index ed895d9..e4255b6 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -479,12 +479,6 @@ if test $tcl_cv_putenv_copy = yes; then
fi
#--------------------------------------------------------------------
-# Check for support of usleep function
-#--------------------------------------------------------------------
-
-SC_ENABLE_USLEEP
-
-#--------------------------------------------------------------------
# Check for support of nl_langinfo function
#--------------------------------------------------------------------
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index d7d6a7b..7a0b677 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -808,48 +808,6 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
])
#------------------------------------------------------------------------
-# SC_ENABLE_USLEEP --
-#
-# Allows use of usleep function.
-# This is only relevant for Unix.
-#
-# Arguments:
-# none
-#
-# Results:
-#
-# Adds the following arguments to configure:
-# --enable-usleep=yes|no (default is yes)
-#
-# Defines the following vars:
-# HAVE_USLEEP Triggers use of usleep if defined.
-#------------------------------------------------------------------------
-
-AC_DEFUN([SC_ENABLE_USLEEP], [
- AC_ARG_ENABLE(usleep,
- AC_HELP_STRING([--enable-usleep],
- [use usleep if possible to sleep, otherwise use Tcl_Sleep (default: on)]),
- [usleep_ok=$enableval], [usleep_ok=yes])
-
- HAVE_USLEEP=0
- if test "$usleep_ok" = "yes"; then
- AC_CHECK_HEADER(unistd.h,[usleep_ok=yes],[usleep_ok=no])
- fi
- AC_MSG_CHECKING([whether to use usleep])
- if test "$usleep_ok" = "yes"; then
- AC_CACHE_VAL(tcl_cv_usleep_h, [
- AC_TRY_COMPILE([#include <unistd.h>], [usleep(0);],
- [tcl_cv_usleep_h=yes],[tcl_cv_usleep_h=no])])
- AC_MSG_RESULT([$tcl_cv_usleep_h])
- if test $tcl_cv_usleep_h = yes; then
- AC_DEFINE(HAVE_USLEEP, 1, [Do we have usleep()?])
- fi
- else
- AC_MSG_RESULT([$usleep_ok])
- fi
-])
-
-#------------------------------------------------------------------------
# SC_ENABLE_LANGINFO --
#
# Allows use of modern nl_langinfo check for better l10n.