From 74fcbe75cafec3ca219bb000e30f7aaddda69abb Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 14 May 1998 16:03:15 +0000 Subject: [PATCH] . --- m4/ChangeLog | 6 ++++++ m4/Makefile.am | 10 +++++----- m4/Makefile.in | 10 +++++----- m4/jm-macros.m4 | 30 ++++++++++++++++++++++++++++++ m4/utimbuf.m4 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 m4/jm-macros.m4 create mode 100644 m4/utimbuf.m4 diff --git a/m4/ChangeLog b/m4/ChangeLog index 2799868732..8d3c0d36c8 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +1998-05-14 Jim Meyering + + * Makefile.am (EXTRA_DIST): Add them. + * jm-macros.m4: New file. + * utimbuf.m4: New file. + 1998-05-12 Jim Meyering * Makefile.am (EXTRA_DIST): Add isc-posix.m4. diff --git a/m4/Makefile.am b/m4/Makefile.am index 6d11eadddf..06f317225a 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -4,8 +4,8 @@ # find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \ # |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012' EXTRA_DIST = README \ -isc-posix.m4 \ -assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 \ -getgroups.m4 getline.m4 getloadavg.m4 inttypes_h.m4 jm-mktime.m4 jm-winsz1.m4 \ -jm-winsz2.m4 lfs.m4 lstat.m4 malloc.m4 memcmp.m4 perl.m4 prereq.m4 putenv.m4 \ -readdir.m4 realloc.m4 ssize_t.m4 stat.m4 strftime.m4 uintmax_t.m4 uptime.m4 +assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 \ +error.m4 getgroups.m4 getline.m4 getloadavg.m4 inttypes_h.m4 isc-posix.m4 \ +jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 jm-winsz2.m4 lfs.m4 lstat.m4 \ +malloc.m4 memcmp.m4 perl.m4 prereq.m4 putenv.m4 readdir.m4 realloc.m4 \ +ssize_t.m4 stat.m4 strftime.m4 uintmax_t.m4 uptime.m4 utimbuf.m4 diff --git a/m4/Makefile.in b/m4/Makefile.in index 17c2551043..a8ffce36c4 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -95,11 +95,11 @@ YACC = @YACC@ l = @l@ EXTRA_DIST = README \ -isc-posix.m4 \ -assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 error.m4 \ -getgroups.m4 getline.m4 getloadavg.m4 inttypes_h.m4 jm-mktime.m4 jm-winsz1.m4 \ -jm-winsz2.m4 lfs.m4 lstat.m4 malloc.m4 memcmp.m4 perl.m4 prereq.m4 putenv.m4 \ -readdir.m4 realloc.m4 ssize_t.m4 stat.m4 strftime.m4 uintmax_t.m4 uptime.m4 +assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 \ +error.m4 getgroups.m4 getline.m4 getloadavg.m4 inttypes_h.m4 isc-posix.m4 \ +jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 jm-winsz2.m4 lfs.m4 lstat.m4 \ +malloc.m4 memcmp.m4 perl.m4 prereq.m4 putenv.m4 readdir.m4 realloc.m4 \ +ssize_t.m4 stat.m4 strftime.m4 uintmax_t.m4 uptime.m4 utimbuf.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 new file mode 100644 index 0000000000..fad972798e --- /dev/null +++ b/m4/jm-macros.m4 @@ -0,0 +1,30 @@ +#serial 1 + +dnl Misc type-related macros for fileutils, sh-utils, textutils. + +AC_DEFUN(jm_MACROS, +[ + dnl This macro actually runs replacement code. See isc-posix.m4. + AC_REQUIRE([AC_ISC_POSIX])dnl + + AC_REQUIRE([jm_ASSERT]) + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) + AC_REQUIRE([jm_TYPE_SSIZE_T]) + AC_REQUIRE([jm_STRUCT_UTIMBUF]) + AC_REQUIRE([jm_STRUCT_DIRENT_D_TYPE]) + AC_REQUIRE([jm_STRUCT_DIRENT_D_INO]) + AC_REQUIRE([jm_CHECK_DECLS]) + + AC_REQUIRE([jm_PREREQ]) + + AC_REQUIRE([jm_FUNC_CHOWN]) + AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) + AC_REQUIRE([jm_FUNC_MKTIME]) + AC_REQUIRE([jm_FUNC_LSTAT]) + AC_REQUIRE([jm_FUNC_STAT]) + AC_REQUIRE([jm_FUNC_REALLOC]) + AC_REQUIRE([jm_FUNC_MALLOC]) + AC_REQUIRE([jm_FUNC_READDIR]) + AC_REQUIRE([jm_FUNC_MEMCMP]) +]) diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 new file mode 100644 index 0000000000..7af3d1470b --- /dev/null +++ b/m4/utimbuf.m4 @@ -0,0 +1,49 @@ +#serial 1 + +dnl From Jim Meyering + +dnl Define HAVE_STRUCT_UTIMBUF if `struct utimbuf' is declared -- +dnl usually in . +dnl Some systems have utime.h but don't declare the struct anywhere. + +AC_DEFUN(jm_STRUCT_UTIMBUF, +[ + AC_CHECK_HEADERS(utime.h) + AC_REQUIRE([AC_HEADER_TIME]) + AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf, + [AC_TRY_COMPILE( + [ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif +#ifdef HAVE_UTIME_H +# include +#endif + ], + [static struct utimbuf x; x.actime = x.modtime;], + fu_cv_sys_struct_utimbuf=yes, + fu_cv_sys_struct_utimbuf=no) + ]) + + if test $fu_cv_sys_struct_utimbuf = yes; then + if test x = y; then + # This code is deliberately never run via ./configure. + # FIXME: this is a hack to make autoheader put the corresponding + # HAVE_* undef for this symbol in config.h.in. This saves me the + # trouble of having to maintain the #undef in acconfig.h manually. + AC_CHECK_FUNCS(STRUCT_UTIMBUF) + fi + # Defining it this way (rather than via AC_DEFINE) short-circuits the + # autoheader check -- autoheader doesn't know it's already been taken + # care of by the hack above. + ac_kludge=HAVE_STRUCT_UTIMBUF + AC_DEFINE_UNQUOTED($ac_kludge) + fi +]) -- 2.30.2