diff options
author | Jim Meyering <jim@meyering.net> | 1999-01-10 22:51:01 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-01-10 22:51:01 +0000 |
commit | 51f90506bafca78922444a59c54c99f37f4e712e (patch) | |
tree | 3bbfcf4ce98b140174111c1988e2af90b78f63b3 /m4 | |
parent | 4a0813fecb539e130a485327a23254b3b3aafd55 (diff) | |
download | coreutils-51f90506bafca78922444a59c54c99f37f4e712e.tar.xz |
Use the new 3-arg form of AC_DEFINE instead of my gross kludge.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/utimbuf.m4 | 17 | ||||
-rw-r--r-- | m4/utimes.m4 | 19 |
2 files changed, 9 insertions, 27 deletions
diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 7af3d1470..14d777259 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 dnl From Jim Meyering @@ -33,17 +33,8 @@ AC_DEFUN(jm_STRUCT_UTIMBUF, ]) 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) + AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1, +[Define if struct utimbuf is declared -- usually in <utime.h>. + Some systems have utime.h but don't declare the struct anywhere. ]) fi ]) diff --git a/m4/utimes.m4 b/m4/utimes.m4 index ce9f86bf7..f91e6885a 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,6 +1,7 @@ -#serial 2 +#serial 3 -dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL. +dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL, +dnl then do case-insensitive s/utime/utimes/. AC_DEFUN(jm_FUNC_UTIMES_NULL, [AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null, @@ -22,18 +23,8 @@ exit(!(stat ("conftestdata", &s) == 0 && utimes("conftestdata", (long *)0) == 0 rm -f core core.* *.core]) if test $ac_cv_func_utimes_null = 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(UTIMES_NULL) - 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_UTIMES_NULL - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_UTIMES_NULL, 1, + [Define if utimes accepts a null argument]) fi ] ) |