diff options
| author | Jim Meyering <jim@meyering.net> | 1999-01-10 22:48:12 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1999-01-10 22:48:12 +0000 |
| commit | 4d57863e6328fc8742372a905d0670b5a39ebf23 (patch) | |
| tree | 18e4d66304ea353cbed228a592fcd204c2c1e7e1 | |
| parent | d6c548c7831b2767f394637be500244a51a4c32b (diff) | |
| download | coreutils-4d57863e6328fc8742372a905d0670b5a39ebf23.tar.xz | |
Use the new 3-arg form of AC_DEFINE instead of my gross kludge.
| -rw-r--r-- | m4/lstat.m4 | 22 | ||||
| -rw-r--r-- | m4/readdir.m4 | 14 |
2 files changed, 8 insertions, 28 deletions
diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 3b7bdfbc6..8378645c9 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,4 +1,4 @@ -#serial 2 +#serial 3 dnl From Jim Meyering. dnl Determine whether lstat has the bug that it succeeds when given the @@ -30,22 +30,10 @@ AC_DEFUN(jm_FUNC_LSTAT, jm_cv_func_lstat_empty_string_bug=yes) ]) if test $jm_cv_func_lstat_empty_string_bug = yes; then - LIBOBJS="$LIBOBJS lstat.o" - - if test $jm_cv_func_lstat_empty_string_bug = 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(LSTAT_EMPTY_STRING_BUG) - 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_LSTAT_EMPTY_STRING_BUG - AC_DEFINE_UNQUOTED($ac_kludge) - fi + AC_DEFINE_UNQUOTED(HAVE_LSTAT_EMPTY_STRING_BUG, 1, +[Define if lstat has the bug that it succeeds when given the zero-length + file name argument. The lstat from SunOS4.1.4 and the Hurd as of 1998-11-01) + do this. ]) fi ]) diff --git a/m4/readdir.m4 b/m4/readdir.m4 index d2b1a557e..74616d462 100644 --- a/m4/readdir.m4 +++ b/m4/readdir.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 dnl SunOS's readdir is broken in such a way that rm.c has to add extra code dnl to test whether a NULL return value really means there are no more files @@ -126,16 +126,8 @@ AC_CACHE_CHECK([for working readdir], jm_cv_func_working_readdir, jm_cv_func_working_readdir=no, jm_cv_func_working_readdir=no)]) - if test x = y; then - dnl This code is deliberately never run via ./configure. - dnl FIXME: this is a gross hack to make autoheader put an entry - dnl for this HAVE_-prefixed symbol in config.h.in. - AC_CHECK_FUNCS(WORKING_READDIR) - fi - - if test $jm_cv_func_working_readdir = yes; then - ac_kludge=HAVE_WORKING_READDIR - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_WORKING_READDIR, 1, +[Define if readdir is found to work properly in some unusual cases. ]) fi ]) |