diff options
| -rw-r--r-- | m4/fstypename.m4 | 16 | ||||
| -rw-r--r-- | m4/inttypes_h.m4 | 13 | ||||
| -rw-r--r-- | m4/lstat.m4 | 22 | ||||
| -rw-r--r-- | m4/malloc.m4 | 12 | ||||
| -rw-r--r-- | m4/readdir.m4 | 14 | ||||
| -rw-r--r-- | m4/realloc.m4 | 12 | ||||
| -rw-r--r-- | m4/st_dm_mode.m4 | 16 | ||||
| -rw-r--r-- | m4/stat.m4 | 22 | ||||
| -rw-r--r-- | m4/utimbuf.m4 | 17 | ||||
| -rw-r--r-- | m4/utimes.m4 | 19 |
10 files changed, 39 insertions, 124 deletions
diff --git a/m4/fstypename.m4 b/m4/fstypename.m4 index 87569f8d36..70abc12b38 100644 --- a/m4/fstypename.m4 +++ b/m4/fstypename.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 dnl From Jim Meyering. dnl @@ -25,18 +25,8 @@ AC_DEFUN(jm_FSTYPENAME, ) if test $fu_cv_sys_f_fstypename_in_statfs = 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(F_FSTYPENAME_IN_STATFS) - 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_F_FSTYPENAME_IN_STATFS - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_F_FSTYPENAME_IN_STATFS, 1, + [Define if struct statfs has the f_fstypename member.]) fi ] ) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 4ccd7ce4dc..750639d6fd 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,4 +1,4 @@ -#serial 2 +#serial 3 dnl From Paul Eggert. @@ -7,12 +7,6 @@ dnl From Paul Eggert. AC_DEFUN(jm_AC_HEADER_INTTYPES_H, [ - 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 `HAVE_INTTYPES_H' in config.h.in. - AC_CHECK_FUNCS(INTTYPES_H) - fi AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, [AC_TRY_COMPILE( [#include <sys/types.h> @@ -21,7 +15,8 @@ AC_DEFUN(jm_AC_HEADER_INTTYPES_H, jm_ac_cv_header_inttypes_h=yes, jm_ac_cv_header_inttypes_h=no)]) if test $jm_ac_cv_header_inttypes_h = yes; then - ac_kludge=HAVE_INTTYPES_H - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, +[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, + and declares uintmax_t. ]) fi ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 3b7bdfbc61..8378645c9d 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/malloc.m4 b/m4/malloc.m4 index bd3cad4666..85d62efa82 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 dnl From Jim Meyering. dnl Determine whether malloc accepts 0 as its argument. @@ -12,16 +12,10 @@ dnl AC_DEFUN(jm_FUNC_MALLOC, [ - 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 symbol in config.h.in. - AC_CHECK_FUNCS(DONE_WORKING_MALLOC_CHECK) - fi dnl xmalloc.c requires that this symbol be defined so it doesn't dnl mistakenly use a broken malloc -- as it might if this test were omitted. - ac_kludge=HAVE_DONE_WORKING_MALLOC_CHECK - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1, + [Define if the malloc check has been performed. ]) AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc, [AC_TRY_RUN([ diff --git a/m4/readdir.m4 b/m4/readdir.m4 index d2b1a557e1..74616d462b 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 ]) diff --git a/m4/realloc.m4 b/m4/realloc.m4 index aba1984064..5166ad4df2 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,4 +1,4 @@ -#serial 1 +#serial 2 dnl From Jim Meyering. dnl Determine whether realloc works when both arguments are 0. @@ -12,16 +12,10 @@ dnl AC_DEFUN(jm_FUNC_REALLOC, [ - 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 symbol in config.h.in. - AC_CHECK_FUNCS(DONE_WORKING_REALLOC_CHECK) - fi dnl xmalloc.c requires that this symbol be defined so it doesn't dnl mistakenly use a broken realloc -- as it might if this test were omitted. - ac_kludge=HAVE_DONE_WORKING_REALLOC_CHECK - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1, + [Define if the realloc check has been performed. ]) AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc, [AC_TRY_RUN([ diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index 823f9ed018..625ea94aa3 100644 --- a/m4/st_dm_mode.m4 +++ b/m4/st_dm_mode.m4 @@ -1,3 +1,5 @@ +#serial 2 + # Define HAVE_ST_DM_MODE if struct stat has an st_dm_mode member. AC_DEFUN(AC_STRUCT_ST_DM_MODE, @@ -8,18 +10,8 @@ AC_DEFUN(AC_STRUCT_ST_DM_MODE, ac_cv_struct_st_dm_mode=no)]) if test $ac_cv_struct_st_dm_mode = 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 add the #undef in acconfig.h manually. - AC_CHECK_FUNCS(ST_DM_MODE) - 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_ST_DM_MODE - AC_DEFINE_UNQUOTED($ac_kludge) + AC_DEFINE_UNQUOTED(HAVE_ST_DM_MODE, 1, + [Define if struct stat has an st_dm_mode member. ]) fi ] ) diff --git a/m4/stat.m4 b/m4/stat.m4 index c232df9a32..767b9a5d7b 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,4 +1,4 @@ -#serial 2 +#serial 3 dnl From Jim Meyering. dnl Determine whether stat has the bug that it succeeds when given the @@ -30,22 +30,10 @@ AC_DEFUN(jm_FUNC_STAT, jm_cv_func_stat_empty_string_bug=yes) ]) if test $jm_cv_func_stat_empty_string_bug = yes; then - LIBOBJS="$LIBOBJS stat.o" - - if test $jm_cv_func_stat_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(STAT_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_STAT_EMPTY_STRING_BUG - AC_DEFINE_UNQUOTED($ac_kludge) - fi + AC_DEFINE_UNQUOTED(HAVE_STAT_EMPTY_STRING_BUG, 1, +[Define if stat has the bug that it succeeds when given the zero-length + file name argument. The stat from SunOS4.1.4 and the Hurd as of 1998-11-01) + do this. ]) fi ]) diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 7af3d1470b..14d777259b 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 ce9f86bf7b..f91e6885aa 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 ] ) |