summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2015-10-25 21:25:11 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2015-10-25 21:25:11 (GMT)
commitb37aff29d9d17d69fea11e35a175a0ea2590486d (patch)
treecc5b631a9f08a123ce620922146ab68c7fc2fc3f
parent82c7f039877d529c4f448ccf6b5e2033022f13eb (diff)
parent29a7a9a9da2823c8c5f9f530084f6820e26dae09 (diff)
downloadtcl-b37aff29d9d17d69fea11e35a175a0ea2590486d.zip
tcl-b37aff29d9d17d69fea11e35a175a0ea2590486d.tar.gz
tcl-b37aff29d9d17d69fea11e35a175a0ea2590486d.tar.bz2
merge trunk
-rw-r--r--unix/configure.in6
-rw-r--r--unix/tcl.m442
2 files changed, 0 insertions, 48 deletions
diff --git a/unix/configure.in b/unix/configure.in
index ce68391..c7b0edc 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -545,12 +545,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 83c3fb1..c9fd9b5 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -774,48 +774,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.