Re: AC_HEADER

bug-gnulib
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: AC_HEADER_DIRENT

From:	Paul Eggert
Subject:	Re: AC_HEADER_DIRENT
Date:	Thu, 06 Jul 2006 16:35:07 -0700
User-agent:	Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux)
"Derek R. Price" <address@hidden> writes:

> Thanks, Bruno.  I've attached a patch that replaces all the references
> to AC_HEADER_DIRENT with calls to AC_CHECK_HEADERS_ONCE([dirent.h
> ndir.h]) and makes the accompanying changes in lib/*.  This patch does
> simplify, though not quite as much as I was originally hoping, since I
> had to leave in the <ndir.h> support for Windows.

Can the Windows guys supply a dirent.h substitute module?  That would
let you do the futher simplification.

> Is OpenVMS the only practical VMS target left?

Yes.  For now, let's remove the vmsdir.h stuff since I don't think
anybody uses it now.  If it's necessary the VMS guys can supply
a substitude dirent.h as well.

Also, we should use "__VMS" rather than "VMS" since the latter symbol
is no longer defined when compiling pedantically.

I found a few other opportunities for simplification and installed
the following.

Thanks.

2006-07-06  Paul Eggert  <address@hidden>

        * lib/getloadavg.c: Use __VMS, not VMS.
        * lib/getopt.c: Likewise.
        * lib/getpagesize.h: Likewise.
        * lib/glob.c: Remove most VMS cruft; it hasn't been tested for
        a while and probably does not work.

2006-07-06  Derek R. Price  <address@hidden>
        and Paul Eggert  <address@hidden>

        * lib/backupfile.c [HAVE_DIRENT_H && ! HAVE_NDIR_H]:
        Don't worry about this obsolete case any more.
        (HAVE_DIR): Remove.  All uses removed; we now assume you can read
        directories.
        * lib/dirfd.h [HAVE_DIRENT_H && ! HAVE_NDIR_H]: Don't
        worry about this obsolete case any more.
        * lib/fts.c: Likewise.
        * lib/getcwd.c: Likewise.
        * lib/glob.h: Likewise.
        * lib/savedir.c: Likewise.

        * m4/backupfile.m4 (gl_BACKUPFILE): Check for dirent.h, instead
        of invoking obsolescent AC_HEADER_DIRENT macro.
        * m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise.
        * m4/d-type.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE): Likewise.
        * m4/dirfd.m4 (gl_FUNC_DIRFD): Likewise.
        * m4/fts.m4 (gl_FUNC_FTS_CORE): Likewise.
        * m4/getcwd.m4 (gl_PREREQ_GETCWD): Likewise.
        * m4/glob.m4 (gl_PREREQ_GLOB): Likewise.
        * m4/savedir.m4 (gl_SAVEDIR): Likewise.
        * m4/readdir.m4: Remove; no longer needed.

Index: lib/backupfile.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/backupfile.c,v
retrieving revision 1.49
diff -p -u -r1.49 backupfile.c
--- lib/backupfile.c    6 Jul 2006 21:51:29 -0000       1.49
+++ lib/backupfile.c    6 Jul 2006 23:27:27 -0000
@@ -47,21 +47,7 @@
 #else
 # define dirent direct
 # define NLENGTH(direct) ((size_t) (direct)->d_namlen)
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-
-#if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H
-# define HAVE_DIR 1
-#else
-# define HAVE_DIR 0
+# include <ndir.h>
 #endif
 
 #if D_INO_IN_DIRENT
@@ -166,8 +152,6 @@ check_extension (char *file, size_t file
     }
 }
 
-#if HAVE_DIR
-
 /* Returned values for NUMBERED_BACKUP.  */
 
 enum numbered_backup_result
@@ -282,7 +266,6 @@ numbered_backup (char **buffer, size_t b
   *buffer = buf;
   return result;
 }
-#endif /* HAVE_DIR */
 
 /* Return the name of the new backup file for the existing file FILE,
    allocated with malloc.  Report an error and fail if out of memory.
@@ -301,14 +284,13 @@ find_backup_file_name (char const *file,
   size_t simple_backup_suffix_size = strlen (simple_backup_suffix) + 1;
   size_t backup_suffix_size_guess = simple_backup_suffix_size;
   enum { GUESS = sizeof ".~12345~" };
-  if (HAVE_DIR && backup_suffix_size_guess < GUESS)
+  if (backup_suffix_size_guess < GUESS)
     backup_suffix_size_guess = GUESS;
 
   ssize = filelen + backup_suffix_size_guess + 1;
   s = xmalloc (ssize);
   memcpy (s, file, filelen + 1);
 
-#if HAVE_DIR
   if (backup_type != simple_backups)
     switch (numbered_backup (&s, ssize, filelen))
       {
@@ -323,7 +305,6 @@ find_backup_file_name (char const *file,
        simple = (backup_type == numbered_existing_backups);
        break;
       }
-#endif
 
   if (simple)
     memcpy (s + filelen, simple_backup_suffix, simple_backup_suffix_size);
Index: lib/dirfd.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/dirfd.h,v
retrieving revision 1.6
diff -p -u -r1.6 dirfd.h
--- lib/dirfd.h 19 Sep 2005 17:28:14 -0000      1.6
+++ lib/dirfd.h 6 Jul 2006 23:27:27 -0000
@@ -1,5 +1,5 @@
 /* Declare dirfd, if necessary.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,18 +21,10 @@
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
-#else /* not HAVE_DIRENT_H */
+#else
 # define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+# include <ndir.h>
+#endif
 
 #ifndef HAVE_DECL_DIRFD
 "this configure-time declaration test was not run"
Index: lib/fts.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/fts.c,v
retrieving revision 1.11
diff -p -u -r1.11 fts.c
--- lib/fts.c   26 Jan 2006 22:12:26 -0000      1.11
+++ lib/fts.c   6 Jul 2006 23:27:27 -0000
@@ -75,26 +75,17 @@ static char sccsid[] = "@(#)fts.c   8.6 (B
 # include "lstat.h"
 #endif
 
-#if defined _LIBC
+#if HAVE_DIRENT_H || _LIBC
 # include <dirent.h>
-# define NAMLEN(dirent) _D_EXACT_NAMLEN (dirent)
-#else
-# if HAVE_DIRENT_H
-#  include <dirent.h>
-#  define NAMLEN(dirent) strlen ((dirent)->d_name)
+# ifdef _D_EXACT_NAMLEN
+#  define NAMLEN(dirent) _D_EXACT_NAMLEN (dirent)
 # else
-#  define dirent direct
-#  define NAMLEN(dirent) (dirent)->d_namlen
-#  if HAVE_SYS_NDIR_H
-#   include <sys/ndir.h>
-#  endif
-#  if HAVE_SYS_DIR_H
-#   include <sys/dir.h>
-#  endif
-#  if HAVE_NDIR_H
-#   include <ndir.h>
-#  endif
+#  define NAMLEN(dirent) strlen ((dirent)->d_name)
 # endif
+#else
+# define dirent direct
+# define NAMLEN(dirent) (dirent)->d_namlen
+# include <ndir.h>
 #endif
 
 #ifdef _LIBC
Index: lib/getcwd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getcwd.c,v
retrieving revision 1.12
diff -p -u -r1.12 getcwd.c
--- lib/getcwd.c        3 Jul 2006 08:32:46 -0000       1.12
+++ lib/getcwd.c        6 Jul 2006 23:27:27 -0000
@@ -38,23 +38,13 @@
 
 #if HAVE_DIRENT_H || _LIBC
 # include <dirent.h>
-# ifndef _D_EXACT_NAMLEN
-#  define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
-# endif
 #else
 # define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
+# define _D_EXACT_NAMLEN(d) (d)->d_namlen
+# include <ndir.h>
 #endif
 #ifndef _D_EXACT_NAMLEN
-# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
+# define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
 #endif
 #ifndef _D_ALLOC_NAMLEN
 # define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)
Index: lib/getloadavg.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getloadavg.c,v
retrieving revision 1.29
diff -p -u -r1.29 getloadavg.c
--- lib/getloadavg.c    22 Sep 2005 23:15:09 -0000      1.29
+++ lib/getloadavg.c    6 Jul 2006 23:27:27 -0000
@@ -358,7 +358,7 @@
 
 # ifdef LOAD_AVE_TYPE
 
-#  ifndef VMS
+#  ifndef __VMS
 #   ifndef __linux__
 #    ifndef NLIST_STRUCT
 #     include <a.out.h>
@@ -385,7 +385,7 @@
 #    endif /* LDAV_SYMBOL */
 #   endif /* __linux__ */
 
-#  else /* VMS */
+#  else /* __VMS */
 
 #   ifndef eunice
 #    include <iodef.h>
@@ -393,7 +393,7 @@
 #   else /* eunice */
 #    include <vms/iodef.h>
 #   endif /* eunice */
-#  endif /* VMS */
+#  endif /* __VMS */
 
 #  ifndef LDAV_CVT
 #   define LDAV_CVT(n) ((double) (n))
@@ -473,9 +473,9 @@ static bool getloadavg_initialized;
 /* Offset in kmem to seek to read load average, or 0 means invalid.  */
 static long offset;
 
-#  if !defined (VMS) && !defined (sgi) && !defined (__linux__)
+#  if ! defined __VMS && ! defined sgi && ! defined __linux__
 static struct nlist nl[2];
-#  endif /* Not VMS or sgi */
+#  endif
 
 #  ifdef SUNOS_5
 static kvm_t *kd;
@@ -813,7 +813,7 @@ getloadavg (double loadavg[], int nelem)
         : (load_ave.tl_avenrun.l[elem] / (double) load_ave.tl_lscale));
 # endif /* OSF_ALPHA */
 
-# if !defined (LDAV_DONE) && defined (VMS)
+# if ! defined LDAV_DONE && defined __VMS
   /* VMS specific code -- read from the Load Ave driver.  */
 
   LOAD_AVE_TYPE load_ave[3];
@@ -851,9 +851,9 @@ getloadavg (double loadavg[], int nelem)
 
   if (!getloadavg_initialized)
     return -1;
-# endif /* VMS */
+# endif /* ! defined LDAV_DONE && defined __VMS */
 
-# if !defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) && !defined (VMS)
+# if ! defined LDAV_DONE && defined LOAD_AVE_TYPE && ! defined __VMS
 
   /* UNIX-specific code -- read the average from /dev/kmem.  */
 
@@ -953,7 +953,7 @@ getloadavg (double loadavg[], int nelem)
 
   if (offset == 0 || !getloadavg_initialized)
     return -1;
-# endif /* LOAD_AVE_TYPE and not VMS */
+# endif /* ! defined LDAV_DONE && defined LOAD_AVE_TYPE && ! defined __VMS */
 
 # if !defined (LDAV_DONE) && defined (LOAD_AVE_TYPE) /* Including VMS.  */
   if (nelem > 0)
Index: lib/getopt.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getopt.c,v
retrieving revision 1.48
diff -p -u -r1.48 getopt.c
--- lib/getopt.c        24 Jan 2006 07:40:58 -0000      1.48
+++ lib/getopt.c        6 Jul 2006 23:27:27 -0000
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifdef VMS
+#ifdef __VMS
 # include <unixlib.h>
 #endif
 
Index: lib/getpagesize.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getpagesize.h,v
retrieving revision 1.9
diff -p -u -r1.9 getpagesize.h
--- lib/getpagesize.h   23 Sep 2005 04:15:13 -0000      1.9
+++ lib/getpagesize.h   6 Jul 2006 23:27:27 -0000
@@ -21,12 +21,12 @@
 #include <unistd.h>
 
 #if !defined getpagesize && defined _SC_PAGESIZE
-# if !(defined VMS && __VMS_VER < 70000000)
+# if ! (defined __VMS && __VMS_VER < 70000000)
 #  define getpagesize() sysconf (_SC_PAGESIZE)
 # endif
 #endif
 
-#if !defined getpagesize && defined VMS
+#if !defined getpagesize && defined __VMS
 # ifdef __ALPHA
 #  define getpagesize() 8192
 # else
Index: lib/glob.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/glob.c,v
retrieving revision 1.6
diff -p -u -r1.6 glob.c
--- lib/glob.c  22 Jun 2006 23:40:20 -0000      1.6
+++ lib/glob.c  6 Jul 2006 23:27:27 -0000
@@ -53,18 +53,7 @@
 #else
 # define dirent direct
 # define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-# ifdef HAVE_VMSDIR_H
-#  include "vmsdir.h"
-# endif /* HAVE_VMSDIR_H */
+# include <ndir.h>
 #endif
 
 
@@ -511,7 +500,6 @@ glob (pattern, flags, errfunc, pglob)
 
   oldcount = pglob->gl_pathc + pglob->gl_offs;
 
-#ifndef VMS
   if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
     {
       if (dirname[1] == '\0' || dirname[1] == '/')
@@ -679,7 +667,6 @@ glob (pattern, flags, errfunc, pglob)
        }
 # endif        /* Not Amiga && not WINDOWS32.  */
     }
-#endif /* Not VMS.  */
 
   /* Now test whether we looked for "~" or "~NAME".  In this case we
      can give the answer now.  */
@@ -1132,7 +1119,7 @@ glob_in_dir (const char *pattern, const 
            {
              int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
                               | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
-#if defined _AMIGA || defined VMS
+#if defined _AMIGA || defined __VMS
                               | FNM_CASEFOLD
 #endif
                               );
Index: lib/savedir.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/savedir.c,v
retrieving revision 1.29
diff -p -u -r1.29 savedir.c
--- lib/savedir.c       28 Jun 2006 22:25:49 -0000      1.29
+++ lib/savedir.c       6 Jul 2006 23:27:27 -0000
@@ -33,15 +33,7 @@
 # include <dirent.h>
 #else
 # define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
+# include <ndir.h>
 #endif
 
 #include <stddef.h>
Index: m4/backupfile.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/backupfile.m4,v
retrieving revision 1.10
diff -p -u -r1.10 backupfile.m4
--- m4/backupfile.m4    23 Sep 2005 04:15:13 -0000      1.10
+++ m4/backupfile.m4    6 Jul 2006 23:27:27 -0000
@@ -1,5 +1,5 @@
-# backupfile.m4 serial 9
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# backupfile.m4 serial 10
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@ AC_DEFUN([gl_BACKUPFILE],
   AC_LIBOBJ([backupfile])
 
   dnl Prerequisites of lib/backupfile.c.
-  AC_REQUIRE([AC_HEADER_DIRENT])
+  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])
Index: m4/d-ino.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/d-ino.m4,v
retrieving revision 1.8
diff -p -u -r1.8 d-ino.m4
--- m4/d-ino.m4 23 Jan 2005 08:06:57 -0000      1.8
+++ m4/d-ino.m4 6 Jul 2006 23:27:27 -0000
@@ -1,11 +1,11 @@
-#serial 7
+#serial 8
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_ino.
 dnl
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004 Free Software
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2006 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
@@ -13,7 +13,7 @@ dnl
 # with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO],
-  [AC_REQUIRE([AC_HEADER_DIRENT])dnl
+  [AC_CHECK_HEADERS_ONCE([dirent.h])dnl
    AC_CACHE_CHECK([for d_ino member in directory struct],
                  jm_cv_struct_dirent_d_ino,
      [AC_TRY_LINK(dnl
@@ -21,18 +21,10 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_
 #include <sys/types.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
-#else /* not HAVE_DIRENT_H */
+#else
 # define dirent direct
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+# include <ndir.h>
+#endif
        ],
        [struct dirent dp; dp.d_ino = 0;],
 
Index: m4/d-type.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/d-type.m4,v
retrieving revision 1.9
diff -p -u -r1.9 d-type.m4
--- m4/d-type.m4        23 Jan 2005 08:06:57 -0000      1.9
+++ m4/d-type.m4        6 Jul 2006 23:27:27 -0000
@@ -1,11 +1,11 @@
-#serial 8
+#serial 9
 
 dnl From Jim Meyering.
 dnl
 dnl Check whether struct dirent has a member named d_type.
 dnl
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software
 # Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -13,7 +13,7 @@ dnl
 # with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE],
-  [AC_REQUIRE([AC_HEADER_DIRENT])dnl
+  [AC_CHECK_HEADERS_ONCE([dirent.h])dnl
    AC_CACHE_CHECK([for d_type member in directory struct],
                  jm_cv_struct_dirent_d_type,
      [AC_TRY_LINK(dnl
@@ -21,18 +21,10 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_
 #include <sys/types.h>
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
-#else /* not HAVE_DIRENT_H */
+#else
 # define dirent direct
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+# include <ndir.h>
+#endif
        ],
        [struct dirent dp; dp.d_type = 0;],
 
Index: m4/dirfd.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/dirfd.m4,v
retrieving revision 1.19
diff -p -u -r1.19 dirfd.m4
--- m4/dirfd.m4 15 Mar 2006 21:16:25 -0000      1.19
+++ m4/dirfd.m4 6 Jul 2006 23:27:27 -0000
@@ -1,4 +1,4 @@
-#serial 11   -*- Autoconf -*-
+#serial 12   -*- Autoconf -*-
 
 dnl Find out how to get the file descriptor associated with an open DIR*.
 
@@ -17,23 +17,15 @@ 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_REQUIRE([AC_HEADER_DIRENT])
+  AC_CHECK_HEADERS_ONCE([dirent.h])dnl
 
   dirfd_headers='
 #if HAVE_DIRENT_H
 # include <dirent.h>
-#else /* not HAVE_DIRENT_H */
+#else
 # define dirent direct
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+# include <ndir.h>
+#endif
 '
   AC_CHECK_FUNCS(dirfd)
   AC_CHECK_DECLS([dirfd], , , $dirfd_headers)
Index: m4/fts.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/fts.m4,v
retrieving revision 1.6
diff -p -u -r1.6 fts.m4
--- m4/fts.m4   23 Sep 2005 04:15:13 -0000      1.6
+++ m4/fts.m4   6 Jul 2006 23:27:27 -0000
@@ -1,5 +1,5 @@
-#serial 6
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+#serial 7
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -29,6 +29,5 @@ AC_DEFUN([gl_FUNC_FTS_CORE],
   dnl Prerequisites of lib/fts.c.
 
   # Checks for header files.
-  AC_REQUIRE([AC_HEADER_DIRENT])
-  AC_CHECK_HEADERS_ONCE([sys/param.h])
+  AC_CHECK_HEADERS_ONCE([dirent.h sys/param.h])dnl
 ])
Index: m4/getcwd.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getcwd.m4,v
retrieving revision 1.10
diff -p -u -r1.10 getcwd.m4
--- m4/getcwd.m4        3 Jul 2006 08:32:46 -0000       1.10
+++ m4/getcwd.m4        6 Jul 2006 23:27:27 -0000
@@ -61,7 +61,7 @@ AC_DEFUN([gl_FUNC_GETCWD],
 AC_DEFUN([gl_PREREQ_GETCWD],
 [
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
-  AC_REQUIRE([AC_HEADER_DIRENT])
+  AC_CHECK_HEADERS_ONCE([dirent.h])dnl
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
   :
 ])
Index: m4/glob.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/glob.m4,v
retrieving revision 1.5
diff -p -u -r1.5 glob.m4
--- m4/glob.m4  13 Sep 2005 03:47:45 -0000      1.5
+++ m4/glob.m4  6 Jul 2006 23:27:27 -0000
@@ -1,5 +1,5 @@
-# glob.m4 serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# glob.m4 serial 4
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -74,7 +74,7 @@ if (glob ("conf*-globtest", 0, NULL, &fo
 AC_DEFUN([gl_PREREQ_GLOB],
 [ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
   AC_REQUIRE([AC_GNU_SOURCE])dnl
-  AC_REQUIRE([AC_HEADER_DIRENT])dnl
+  AC_CHECK_HEADERS_ONCE([dirent.h])dnl
   AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
   AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
   :])
Index: m4/savedir.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/savedir.m4,v
retrieving revision 1.5
diff -p -u -r1.5 savedir.m4
--- m4/savedir.m4       28 Jun 2006 22:25:49 -0000      1.5
+++ m4/savedir.m4       6 Jul 2006 23:27:27 -0000
@@ -1,4 +1,4 @@
-# savedir.m4 serial 5
+# savedir.m4 serial 7
 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,
@@ -10,5 +10,5 @@ AC_DEFUN([gl_SAVEDIR],
   AC_LIBOBJ([savedir])
 
   dnl Prerequisites of lib/savedir.c.
-  AC_REQUIRE([AC_HEADER_DIRENT])
+  AC_CHECK_HEADERS_ONCE([dirent.h])dnl
 ])
[Prev in Thread]
Current Thread
[Next in Thread]
Re: [bug-gnulib] Last few obsolescent macros, Bruno Haible, 2006/07/04
- AC_HEADER_DIRENT (was Re: [bug-gnulib] Last few obsolescent macros), Derek R. Price, 2006/07/05
  - Re: AC_HEADER_DIRENT (was Re: [bug-gnulib] Last few obsolescent macros), Derek R. Price, 2006/07/05
  - Re: AC_HEADER_DIRENT, Paul Eggert <=
    - Re: AC_HEADER_DIRENT, Derek R. Price, 2006/07/07
    - Re: AC_HEADER_DIRENT, Derek R. Price, 2006/07/07
    - Re: AC_HEADER_DIRENT, Jim Hyslop, 2006/07/07
    - Re: AC_HEADER_DIRENT, Paul Eggert, 2006/07/07
    - Re: AC_HEADER_DIRENT, Jim Hyslop, 2006/07/07
    - Re: AC_HEADER_DIRENT, Derek R. Price, 2006/07/07
    - Re: AC_HEADER_DIRENT, Jim Hyslop, 2006/07/10
    - Re: AC_HEADER_DIRENT, Paul Eggert, 2006/07/10
    - Re: AC_HEADER_DIRENT, Derek R. Price, 2006/07/10
    - Re: AC_HEADER_DIRENT, Paul Eggert, 2006/07/11
Prev by Date: Re: create a big test, collect the fallout
Next by Date: Re: create a big test, collect the fallout
Previous by thread: Re: AC_HEADER_DIRENT (was Re: [bug-gnulib] Last few obsolescent macros)
Next by thread: Re: AC_HEADER_DIRENT
Index(es):
- Date
- Thread