Menu
▾
▴
Re: obsolete autoconf macros: AC_HEADER_TIME
|
From: Bruno H. <br...@cl...> - 2008-05-31 21:27:49
|
AC_HEADER_TIME is also obsolete. (It was needed on Sun386, SunOS 4.1.x.)
2008-05-31 Bruno Haible <br...@cl...>
* configure.in: Remove AC_HEADER_TIME invocation. Instead simply test
for <time.h> and <sys/time.h>.
* m4/general.m4 (CL_MODULE_COMMON_CHECKS): Likewise.
* unix.d: Don't test TIME_WITH_SYS_TIME. Assume <time.h> and
<sys/time.h> are compatible.
* modules/berkeley-db/bdb.c: Likewise.
* modules/clx/new-clx/clx.f: Likewise.
* modules/rawsock/rawsock.c: Likewise.
* modules/syscalls/calls.c: Likewise.
diff -c -3 -r1.117 bdb.c
*** modules/berkeley-db/bdb.c 22 Apr 2008 17:31:27 -0000 1.117
--- modules/berkeley-db/bdb.c 31 May 2008 21:23:49 -0000
***************
*** 35,49 ****
# endif
#endif
! #if defined(TIME_WITH_SYS_TIME)
# include <sys/time.h>
# include <time.h>
- #else
- # if defined(HAVE_SYS_TIME_H)
- # include <sys/time.h>
- # elif defined(HAVE_TIME_H)
- # include <time.h>
- # endif
#endif
#include <string.h> /* for memset() */
--- 35,45 ----
# endif
#endif
! #if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
+ #endif
+ #if defined(HAVE_TIME_H)
# include <time.h>
#endif
#include <string.h> /* for memset() */
diff -c -3 -r2.110 clx.f
*** modules/clx/new-clx/clx.f 28 May 2008 18:30:41 -0000 2.110
--- modules/clx/new-clx/clx.f 31 May 2008 21:23:53 -0000
***************
*** 414,428 ****
#include <stdio.h> /* sprintf() */
#include <string.h> /* memcpy(), strchr(), strcpy() */
#include "config.h"
! #if defined(TIME_WITH_SYS_TIME)
# include <sys/time.h>
# include <time.h>
- #else
- # if defined(HAVE_SYS_TIME_H)
- # include <sys/time.h>
- # elif defined(HAVE_TIME_H)
- # include <time.h>
- # endif
#endif
#if defined(HAVE_SYS_SOCKET_H)
# include <sys/socket.h>
--- 414,424 ----
#include <stdio.h> /* sprintf() */
#include <string.h> /* memcpy(), strchr(), strcpy() */
#include "config.h"
! #if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
+ #endif
+ #if defined(HAVE_TIME_H)
# include <time.h>
#endif
#if defined(HAVE_SYS_SOCKET_H)
# include <sys/socket.h>
diff -c -3 -r1.97 rawsock.c
*** modules/rawsock/rawsock.c 31 May 2008 11:35:47 -0000 1.97
--- modules/rawsock/rawsock.c 31 May 2008 21:23:54 -0000
***************
*** 15,29 ****
#include "config.h"
! #if defined(TIME_WITH_SYS_TIME)
# include <sys/time.h>
# include <time.h>
- #else
- # if defined(HAVE_SYS_TIME_H)
- # include <sys/time.h>
- # elif defined(HAVE_TIME_H)
- # include <time.h>
- # endif
#endif
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
--- 15,25 ----
#include "config.h"
! #if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
+ #endif
+ #if defined(HAVE_TIME_H)
# include <time.h>
#endif
#if defined(HAVE_SYS_TYPES_H)
# include <sys/types.h>
diff -c -3 -r1.212 calls.c
*** modules/syscalls/calls.c 21 May 2008 17:23:32 -0000 1.212
--- modules/syscalls/calls.c 31 May 2008 21:23:57 -0000
***************
*** 20,34 ****
#include "clisp.h"
#include "config.h"
! #if defined(TIME_WITH_SYS_TIME)
# include <sys/time.h>
# include <time.h>
- #else
- # if defined(HAVE_SYS_TIME_H)
- # include <sys/time.h>
- # elif defined(HAVE_TIME_H)
- # include <time.h>
- # endif
#endif
#if defined(HAVE_UNISTD_H)
# include <unistd.h>
--- 20,30 ----
#include "clisp.h"
#include "config.h"
! #if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
+ #endif
+ #if defined(HAVE_TIME_H)
# include <time.h>
#endif
#if defined(HAVE_UNISTD_H)
# include <unistd.h>
diff -c -3 -r1.153 configure.in
*** src/configure.in 31 May 2008 21:16:16 -0000 1.153
--- src/configure.in 31 May 2008 21:23:57 -0000
***************
*** 76,82 ****
AC_TYPE_LONG_LONG_INT dnl HAVE_LONG_LONG_INT
dnl
BOLD_MSG([checks for header files])
! AC_CHECK_HEADERS(sys/inttypes.h unistd.h sys/file.h)
CL_UTSNAME dnl DEFS HAVE_SYS_UTSNAME_H
CL_SHM_H dnl DEFS HAVE_SYS_IPC_H, HAVE_SYS_SHM_H
CL_TERM dnl DEFS HAVE_TERMIOS_H, HAVE_TERMIO_H, ..., HAVE_SGTTY_H
--- 76,82 ----
AC_TYPE_LONG_LONG_INT dnl HAVE_LONG_LONG_INT
dnl
BOLD_MSG([checks for header files])
! AC_CHECK_HEADERS(sys/inttypes.h unistd.h sys/file.h time.h sys/time.h)
CL_UTSNAME dnl DEFS HAVE_SYS_UTSNAME_H
CL_SHM_H dnl DEFS HAVE_SYS_IPC_H, HAVE_SYS_SHM_H
CL_TERM dnl DEFS HAVE_TERMIOS_H, HAVE_TERMIO_H, ..., HAVE_SGTTY_H
***************
*** 115,121 ****
CL_WAITPID dnl DEFS PID_T
CL_RUSAGE dnl DEFS HAVE_SYS_RESOURCE_H, HAVE_GETRUSAGE, RUSAGE_WHO_T, HAVE_SYS_TIMES_H
AC_HEADER_STAT dnl DEFS STAT_MACROS_BROKEN
- AC_HEADER_TIME
CL_STAT dnl DEFS HAVE_LSTAT etc
CL_ELOOP dnl DEFS ELOOP_VALUE
CL_CLOSEDIR dnl DEFS VOID_CLOSEDIR
--- 115,120 ----
diff -c -3 -r1.93 unix.d
*** src/unix.d 31 May 2008 20:26:00 -0000 1.93
--- src/unix.d 31 May 2008 21:23:57 -0000
***************
*** 17,31 ****
/* Declaration of types of I/O parameters of operating system functions */
#include <stdlib.h>
#include <sys/types.h> /* declares pid_t, uid_t */
! #if defined(TIME_WITH_SYS_TIME)
#include <sys/time.h>
#include <time.h>
- #else
- #if defined(HAVE_SYS_TIME_H)
- #include <sys/time.h>
- #elif defined(HAVE_TIME_H)
- #include <time.h>
- #endif
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
--- 17,27 ----
/* Declaration of types of I/O parameters of operating system functions */
#include <stdlib.h>
#include <sys/types.h> /* declares pid_t, uid_t */
! #ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
+ #endif
+ #ifdef HAVE_TIME_H
#include <time.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
diff -c -3 -r1.23 general.m4
*** src/m4/general.m4 31 May 2008 14:55:50 -0000 1.23
--- src/m4/general.m4 31 May 2008 21:23:57 -0000
***************
*** 23,29 ****
AC_REQUIRE([AC_PROG_CPP])dnl
AC_REQUIRE([AC_GNU_SOURCE])dnl
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])dnl
! AC_REQUIRE([AC_HEADER_TIME])dnl
])
AC_DEFUN([CL_FFCALL_COMMON_LIBTOOL],
--- 23,29 ----
AC_REQUIRE([AC_PROG_CPP])dnl
AC_REQUIRE([AC_GNU_SOURCE])dnl
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])dnl
! AC_CHECK_HEADERS(time.h sys/time.h)
])
AC_DEFUN([CL_FFCALL_COMMON_LIBTOOL],
|