Don't mention stat-macros.h or AC_HEADER_STAT in other

m4 files, since we'll make the stat-macros module a prerequisite.

6 files changed, 21 insertions, 19 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 532b66cbf..c3b59227d 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* stat-macros.m4: New file, from gnulib, except that gl_STAT_MACROS
+	also requires AC_HEADER_STAT.
+	* canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME): Don't
+	mention stat-macros.h or AC_HEADER_STAT, since we'll make
+	the stat-macros module a prerequisite.
+	* file-type.m4 (gl_FILE_TYPE): Likewise.
+	* filemode.m4 (gl_FILEMODE): Likewise.
+	* makepath.m4 (gl_MAKEPATH): Likewise.
+	* modechange.m4 (gl_MODECHANGE): Likewise.
+
 2005-04-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* clock_time.m4 (gl_CLOCK_TIME): Use gl_ rather than fetish_ for
diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4
index b593e9b87..083ee7e98 100644
--- a/m4/canonicalize.m4
+++ b/m4/canonicalize.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -9,11 +9,10 @@
 
 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
-    AC_LIBSOURCES([canonicalize.c, canonicalize.h, stat-macros.h])
+    AC_LIBSOURCES([canonicalize.c, canonicalize.h])
     AC_LIBOBJ([canonicalize])
 
     AC_REQUIRE([AC_HEADER_STDC])
     AC_CHECK_HEADERS(string.h sys/param.h stddef.h)
     AC_CHECK_FUNCS(resolvepath canonicalize_file_name)
-    AC_REQUIRE([AC_HEADER_STAT])
   ])
diff --git a/m4/file-type.m4 b/m4/file-type.m4
index aa456901f..7d1830965 100644
--- a/m4/file-type.m4
+++ b/m4/file-type.m4
@@ -1,4 +1,4 @@
-# file-type.m4 serial 4
+# file-type.m4 serial 5
 dnl Copyright (C) 2002, 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,
@@ -6,9 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FILE_TYPE],
 [
-  AC_LIBSOURCES([file-type.c, file-type.h, stat-macros.h])
+  AC_LIBSOURCES([file-type.c, file-type.h])
   AC_LIBOBJ([file-type])
-
-  dnl Prerequisites of lib/file-type.h.
-  AC_REQUIRE([AC_HEADER_STAT])
 ])
diff --git a/m4/filemode.m4 b/m4/filemode.m4
index 977d4b9ea..3b6ccb924 100644
--- a/m4/filemode.m4
+++ b/m4/filemode.m4
@@ -1,4 +1,4 @@
-# filemode.m4 serial 4
+# filemode.m4 serial 5
 dnl Copyright (C) 2002, 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,
@@ -6,9 +6,6 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FILEMODE],
 [
-  AC_LIBSOURCES([filemode.c, filemode.h, stat-macros.h])
+  AC_LIBSOURCES([filemode.c, filemode.h])
   AC_LIBOBJ([filemode])
-
-  dnl Prerequisites of lib/filemode.c.
-  AC_REQUIRE([AC_HEADER_STAT])
 ])
diff --git a/m4/makepath.m4 b/m4/makepath.m4
index 2efb67cee..b7408430a 100644
--- a/m4/makepath.m4
+++ b/m4/makepath.m4
@@ -1,4 +1,4 @@
-# makepath.m4 serial 6
+# makepath.m4 serial 7
 dnl Copyright (C) 2002, 2003, 2004, 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,
@@ -6,12 +6,11 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_MAKEPATH],
 [
-  AC_LIBSOURCES([makepath.c, makepath.h, stat-macros.h])
+  AC_LIBSOURCES([makepath.c, makepath.h])
   AC_LIBOBJ([makepath])
 
   dnl Prerequisites of lib/makepath.c.
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_CHECK_HEADERS_ONCE(unistd.h)
-  AC_REQUIRE([AC_HEADER_STAT])
   AC_REQUIRE([gl_AFS])
 ])
diff --git a/m4/modechange.m4 b/m4/modechange.m4
index 8ecf4daaf..c703e94f5 100644
--- a/m4/modechange.m4
+++ b/m4/modechange.m4
@@ -1,4 +1,4 @@
-# modechange.m4 serial 4
+# modechange.m4 serial 5
 dnl Copyright (C) 2002, 2003, 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,
@@ -8,6 +8,4 @@ AC_DEFUN([gl_MODECHANGE],
 [
   AC_LIBSOURCES([modechange.c, modechange.h])
   AC_LIBOBJ([modechange])
-
-  AC_REQUIRE([AC_HEADER_STAT])
 ])