* modules/fts (Files): Remove m4/inttypes-pri.m4.

* modules/fts-lgpl (Depends-on): Remove gettext.
* lib/fts.c: Don't worry about debugging on pre-C99-comopatible hosts;
the configuration hassle isn't worth it.
Include inttypes.h and stdint.h unconditionally if FTS_DEBUG.
(LONGEST_MODIFIER, PRIuMAX): Remove.
* m4/fts.m4 (gl_FUNC_FTS_CORE): Don't check for inttypes.h or stdint.h,
and don't require gt_INTTYPES_PRI.

diff --git a/ChangeLog b/ChangeLog
index b668e7d8d241a48eea3c1824e1924f2343b6492d..d889923f7b5cff30062b0db7ff5dc0c2aad93c89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modules/fts (Files): Remove m4/inttypes-pri.m4.
+       * modules/fts-lgpl (Depends-on): Remove gettext.
+
 2005-05-25  Derek Price  <derek@ximbiot.com>
 
        * MODULES.html.sh: Add getlogin_r to POSIX.2001 support section.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 095cd3952734a4fe70e52b1f3af295b25e365599..3c99eb4e4a43f6f05e84024967b04cb864fce83a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * fts.c: Don't worry about debugging on pre-C99-comopatible hosts;
+       the configuration hassle isn't worth it.
+       Include inttypes.h and stdint.h unconditionally if FTS_DEBUG.
+       (LONGEST_MODIFIER, PRIuMAX): Remove.
+
 2005-05-27  Bruno Haible  <bruno@clisp.org>
 
        * getlogin_r.h: Remove second include of <stddef.h>.

diff --git a/lib/fts.c b/lib/fts.c
index 418e75b2788396069ad7c1bf03f12efdc1da2db3..a9abe0f10c702662cdd7877fa80cb4b3b9612ff5 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -70,23 +70,6 @@ static char sccsid[] = "@(#)fts.c    8.6 (Berkeley) 8/14/94";
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#if ULONG_MAX < ULLONG_MAX
-# define LONGEST_MODIFIER "ll"
-#else
-# define LONGEST_MODIFIER "l"
-#endif
-#if PRI_MACROS_BROKEN
-# undef PRIuMAX
-#endif
-#ifndef PRIuMAX
-# define PRIuMAX LONGEST_MODIFIER "u"
-#endif
 
 #if defined _LIBC
 # include <dirent.h>
@@ -201,8 +184,10 @@ static int fd_safer (int fd) { return fd; }
 #define BREAD          3               /* fts_read */
 
 #if FTS_DEBUG
-bool fts_debug = false;
+# include <inttypes.h>
+# include <stdint.h>
 # include <stdio.h>
+bool fts_debug = false;
 # define Dprintf(x) do { if (fts_debug) printf x; } while (0)
 #else
 # define Dprintf(x)

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 53849a99fce3078e2363902290259f9a71176720..c7d805e235fcac4f4a26129358c91380ada8799f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * fts.m4 (gl_FUNC_FTS_CORE): Don't check for inttypes.h or stdint.h,
+       and don't require gt_INTTYPES_PRI.
+
 2005-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        * extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Define

diff --git a/m4/fts.m4 b/m4/fts.m4
index 94f5e84f7e403e097892d0190056b4aa0e64eb79..1c9703a7660cdcd48ff18a751882ce22ea7f5834 100644 (file)
--- a/m4/fts.m4
+++ b/m4/fts.m4
@@ -1,4 +1,4 @@
-#serial 4
+#serial 5
 dnl Copyright (C) 2005 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,12 +30,8 @@ AC_DEFUN([gl_FUNC_FTS_CORE],
 
   # Checks for header files.
   AC_REQUIRE([AC_HEADER_DIRENT])
-  AC_CHECK_HEADERS_ONCE([inttypes.h stdint.h])
   AC_CHECK_HEADERS_ONCE([sys/param.h])
 
-  # Checks for typedefs, structures, and compiler characteristics.
-  AC_REQUIRE([gt_INTTYPES_PRI])
-
   # Checks for library functions.
   AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
 ])

diff --git a/modules/fts b/modules/fts
index 75f6fe2f4753542afb2e34838518596659c7f634..434ce1feea4864cdbaa453634632688380c4ca6b 100644 (file)
--- a/modules/fts
+++ b/modules/fts
@@ -6,7 +6,6 @@ lib/fts_.h
 lib/fts.c
 lib/fts-cycle.c
 m4/fts.m4
-m4/inttypes-pri.m4
 
 Depends-on:
 cycle-check

diff --git a/modules/fts-lgpl b/modules/fts-lgpl
index ed68cd38ffaa210814a442e609bd062cc5895298..215359c03c9f14d2185a359f201ba745b6116680 100644 (file)
--- a/modules/fts-lgpl
+++ b/modules/fts-lgpl
@@ -9,7 +9,6 @@ m4/fts.m4
 Depends-on:
 dirfd
 stdbool
-gettext
 
 configure.ac:
 gl_FUNC_FTS_LGPL