Mercurial > hg > octave-nkf > gnulib-hg
changeset 8043:d12a7f6db481
* modules/sys_time (Makefile.am): Build sys/time.h only when it's the
value of $(SYS_TIME_H).
[MOSTLYCLEANFILES]: Now that sys/time.h is created only when needed,
remove it conditionally, too.
* m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_BODY): Set SYS_TIME_H.
* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY):
(gl_FUNC_GETTIMEOFDAY_CLOBBER): Set SYS_TIME_H when setting
GETTIMEOFDAY_REPLACEMENT to 1.
2007-01-28 Bruno Haible <bruno@clisp.org>
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sun, 28 Jan 2007 18:55:01 +0000 |
| parents | 8791d13c86ff |
| children | 5b76fb112942 |
| files | ChangeLog m4/gettimeofday.m4 m4/sys_time_h.m4 modules/sys_time |
| diffstat | 4 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-01-28 Bruno Haible <bruno@clisp.org> + + * modules/sys_time (Makefile.am): Build sys/time.h only when it's the + value of $(SYS_TIME_H). + [MOSTLYCLEANFILES]: Now that sys/time.h is created only when needed, + remove it conditionally, too. + * m4/sys_time_h.m4 (gl_HEADER_SYS_TIME_H_BODY): Set SYS_TIME_H. + * m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY): + (gl_FUNC_GETTIMEOFDAY_CLOBBER): Set SYS_TIME_H when setting + GETTIMEOFDAY_REPLACEMENT to 1. + 2007-01-28 Bruno Haible <bruno@clisp.org> * m4/unistd_h.m4 (gl_HEADER_UNISTD_DEFAULTS): New macro.
--- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -32,6 +32,7 @@ if test $gl_cv_func_gettimeofday_posix_signature != yes; then GETTIMEOFDAY_REPLACEMENT=1 + SYS_TIME_H=sys/time.h if test $gl_cv_func_gettimeofday_clobber != yes; then AC_LIBOBJ(gettimeofday) gl_PREREQ_GETTIMEOFDAY @@ -77,6 +78,7 @@ if test $gl_cv_func_gettimeofday_clobber = yes; then GETTIMEOFDAY_REPLACEMENT=1 + SYS_TIME_H=sys/time.h gl_GETTIMEOFDAY_REPLACE_LOCALTIME AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1, [Define if gettimeofday clobbers the localtime buffer.])
--- a/m4/sys_time_h.m4 +++ b/m4/sys_time_h.m4 @@ -52,4 +52,10 @@ dnl Assume POSIX behavior unless another module says otherwise. GETTIMEOFDAY_REPLACEMENT=0 AC_SUBST([GETTIMEOFDAY_REPLACEMENT]) + if test $HAVE_SYS_TIME_H = 0 || test $HAVE_STRUCT_TIMEVAL = 0; then + SYS_TIME_H=sys/time.h + else + SYS_TIME_H= + fi + AC_SUBST([SYS_TIME_H]) ])
--- a/modules/sys_time +++ b/modules/sys_time @@ -13,7 +13,7 @@ AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += sys/time.h +BUILT_SOURCES += $(SYS_TIME_H) # We need the following in order to create <sys/time.h> when the system # doesn't have one that works with the given compiler. @@ -28,7 +28,7 @@ < $(srcdir)/sys_time_.h; \ } > $@-t mv $@-t $@ -MOSTLYCLEANFILES += sys/time.h sys/time.h-t +MOSTLYCLEANFILES += $(SYS_TIME_H) sys/time.h-t Include: #include <sys/time.h>