diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 12 | ||||
| -rw-r--r-- | m4/absolute-header.m4 | 7 | ||||
| -rw-r--r-- | m4/backupfile.m4 | 3 | ||||
| -rw-r--r-- | m4/d-ino.m4 | 10 | ||||
| -rw-r--r-- | m4/d-type.m4 | 10 | ||||
| -rw-r--r-- | m4/dirfd.m4 | 24 | ||||
| -rw-r--r-- | m4/fts.m4 | 4 | ||||
| -rw-r--r-- | m4/getcwd.m4 | 1 | ||||
| -rw-r--r-- | m4/savedir.m4 | 5 |
9 files changed, 33 insertions, 43 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index cb3bdaea5..abeddd220 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,15 @@ +2006-07-11 Eric Blake <ebb9@byu.net> + + * absolute-header.m4: Fix comments to match recent change. + +2006-07-10 Derek R. Price <derek@ximbiot.com> + and Paul Eggert <eggert@cs.ucla.edu> + + * backupfile.m4, d-ino.m4, d-type.m4, dirfd.m4, fts.m4, getcwd.m4: + * savedir.m4: + Ignore the obsolescent !HAVE_DIRENT_H case. Consolidate NAMLEN + macros into the GNU _D_EXACT_NAMLEN. + 2006-07-10 Paul Eggert <eggert@cs.ucla.edu> * stdint.m4 (gl_STDINT_H): Like yesterday's change to diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index 6f0fd2aa7..c649df084 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,4 +1,4 @@ -# absolute-header.m4 serial 5 +# absolute-header.m4 serial 6 dnl Copyright (C) 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,11 +10,12 @@ dnl From Derek Price. # --------------------------------------- # Find the absolute name of a header file, assuming the header exists. # If the header were sys/inttypes.h, this macro would define -# ABSOLUTE_SYS_INTTYPES_H to the `<>' quoted absolute name of sys/inttypes.h +# ABSOLUTE_SYS_INTTYPES_H to the `""' quoted absolute name of sys/inttypes.h # in config.h -# (e.g. `#define ABSOLUTE_SYS_INTTYPES_H <///usr/include/sys/inttypes.h>'). +# (e.g. `#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"'). # The three "///" are to pacify Sun C 5.8, which otherwise would say # "warning: #include of /usr/include/... may be non-portable". +# Use `""', not `<>', so that the /// cannot be confused with a C99 comment. AC_DEFUN([gl_ABSOLUTE_HEADER], [AC_LANG_PREPROC_REQUIRE()dnl AC_FOREACH([gl_HEADER_NAME], [$1], diff --git a/m4/backupfile.m4 b/m4/backupfile.m4 index 04b255626..6e08f72c5 100644 --- a/m4/backupfile.m4 +++ b/m4/backupfile.m4 @@ -1,4 +1,4 @@ -# backupfile.m4 serial 10 +# backupfile.m4 serial 11 dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,6 @@ AC_DEFUN([gl_BACKUPFILE], AC_LIBOBJ([backupfile]) dnl Prerequisites of lib/backupfile.c. - AC_CHECK_HEADERS_ONCE([dirent.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO]) AC_REQUIRE([gl_AC_DOS]) AC_REQUIRE([AC_SYS_LONG_FILE_NAMES]) diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index c86f7bb42..d87b4dbe0 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -13,18 +13,12 @@ dnl # with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], - [AC_CHECK_HEADERS_ONCE([dirent.h])dnl - AC_CACHE_CHECK([for d_ino member in directory struct], + [AC_CACHE_CHECK([for d_ino member in directory struct], jm_cv_struct_dirent_d_ino, [AC_TRY_LINK(dnl [ #include <sys/types.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#else -# define dirent direct -# include <ndir.h> -#endif +#include <dirent.h> ], [struct dirent dp; dp.d_ino = 0;], diff --git a/m4/d-type.m4 b/m4/d-type.m4 index f4be1ce62..7675dd2b0 100644 --- a/m4/d-type.m4 +++ b/m4/d-type.m4 @@ -13,18 +13,12 @@ dnl # with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE], - [AC_CHECK_HEADERS_ONCE([dirent.h])dnl - AC_CACHE_CHECK([for d_type member in directory struct], + [AC_CACHE_CHECK([for d_type member in directory struct], jm_cv_struct_dirent_d_type, [AC_TRY_LINK(dnl [ #include <sys/types.h> -#ifdef HAVE_DIRENT_H -# include <dirent.h> -#else -# define dirent direct -# include <ndir.h> -#endif +#include <dirent.h> ], [struct dirent dp; dp.d_type = 0;], diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 9e26d5210..c377b87a3 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,4 +1,4 @@ -#serial 12 -*- Autoconf -*- +#serial 13 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. @@ -17,22 +17,16 @@ AC_DEFUN([gl_FUNC_DIRFD], dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57. AC_REQUIRE([AC_PROG_CPP]) AC_REQUIRE([AC_PROG_EGREP]) - AC_CHECK_HEADERS_ONCE([dirent.h])dnl - - dirfd_headers=' -#if HAVE_DIRENT_H -# include <dirent.h> -#else -# define dirent direct -# include <ndir.h> -#endif -' AC_CHECK_FUNCS(dirfd) - AC_CHECK_DECLS([dirfd], , , $dirfd_headers) + AC_CHECK_DECLS([dirfd], , , + [#include <sys/types.h> + #include <dirent.h>]) AC_CACHE_CHECK([whether dirfd is a macro], gl_cv_func_dirfd_macro, - [AC_EGREP_CPP([dirent_header_defines_dirfd], [$dirfd_headers + [AC_EGREP_CPP([dirent_header_defines_dirfd], [ +#include <sys/types.h> +#include <dirent.h> #ifdef dirfd dirent_header_defines_dirfd #endif], @@ -53,8 +47,8 @@ AC_DEFUN([gl_FUNC_DIRFD], CFLAGS="$CFLAGS -DDIR_FD_MEMBER_NAME=$ac_expr" AC_TRY_COMPILE( - [$dirfd_headers - ], + [#include <sys/types.h> + #include <dirent.h>], [DIR *dir_p = opendir("."); (void) dir_p->DIR_FD_MEMBER_NAME;], dir_fd_found=yes ) @@ -1,4 +1,4 @@ -#serial 8 +#serial 10 dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,5 +30,5 @@ AC_DEFUN([gl_FUNC_FTS_CORE], AC_REQUIRE([gl_FUNC_OPENAT]) # Checks for header files. - AC_CHECK_HEADERS_ONCE([dirent.h sys/param.h])dnl + AC_CHECK_HEADERS_ONCE([sys/param.h])dnl ]) diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 730ed42e2..2a19a083a 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -61,7 +61,6 @@ AC_DEFUN([gl_FUNC_GETCWD], AC_DEFUN([gl_PREREQ_GETCWD], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_HEADERS_ONCE([dirent.h])dnl AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO]) : ]) diff --git a/m4/savedir.m4 b/m4/savedir.m4 index e20712353..b6968ebaa 100644 --- a/m4/savedir.m4 +++ b/m4/savedir.m4 @@ -1,4 +1,4 @@ -# savedir.m4 serial 7 +# savedir.m4 serial 8 dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,7 +8,4 @@ AC_DEFUN([gl_SAVEDIR], [ AC_LIBSOURCES([savedir.c, savedir.h]) AC_LIBOBJ([savedir]) - - dnl Prerequisites of lib/savedir.c. - AC_CHECK_HEADERS_ONCE([dirent.h])dnl ]) |