summaryrefslogtreecommitdiffstats
path: root/unix/configure.ac
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-05 17:13:12 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-05 17:13:12 (GMT)
commit1754a52a4c38bb15ff6ceb6ac64514442ebbd989 (patch)
tree36079653dcbec2b242fc1740ef1cccb0a267b3b3 /unix/configure.ac
parent2ed7b2445254d6562a5865e3b4c2a7b24ebae6d4 (diff)
parent3894ab823502a1084f774d6c89c0438cbde2fc81 (diff)
downloadtk-1754a52a4c38bb15ff6ceb6ac64514442ebbd989.zip
tk-1754a52a4c38bb15ff6ceb6ac64514442ebbd989.tar.gz
tk-1754a52a4c38bb15ff6ceb6ac64514442ebbd989.tar.bz2
Merge 8.7. TIME_WITH_SYS_TIME is now obsolete (due to autoconf-2.70)
Diffstat (limited to 'unix/configure.ac')
-rw-r--r--unix/configure.ac17
1 files changed, 2 insertions, 15 deletions
diff --git a/unix/configure.ac b/unix/configure.ac
index 6aa0972..b5f840a 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -17,8 +17,9 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
/* Undef unused package specific autoheader defines so that we can
* include both tclConfig.h and tkConfig.h at the same time: */
/* override */ #undef PACKAGE_NAME
- /* override */ #undef PACKAGE_STRING
/* override */ #undef PACKAGE_TARNAME
+ /* override */ #undef PACKAGE_VERSION
+ /* override */ #undef PACKAGE_STRING
#endif /* _TKCONFIG */])
])
@@ -178,21 +179,7 @@ fi
# Find out all about time handling differences.
#------------------------------------------------------------------------------
-AC_CHECK_HEADERS(sys/time.h)
-m4_warn([obsolete],
-[Update your code to rely only on HAVE_SYS_TIME_H,
-then remove this warning and the obsolete code below it.
-All current systems provide time.h; it need not be checked for.
-Not all systems provide sys/time.h, but those that do, all allow
-you to include it and time.h simultaneously.])dnl
AC_CHECK_HEADERS_ONCE([sys/time.h])
-# Obsolete code to be removed.
-if test $ac_cv_header_sys_time_h = yes; then
- AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
- and <time.h>. This macro is obsolete.])
-fi
-# End of obsolete code.
-
#--------------------------------------------------------------------
# Check for various typedefs and provide substitutes if