.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 1066f35c7bb8e6c76b74ad5716fd4d3d6473ad38..ec74e72d51c7bb50c8b3cca14b8295cda40e4b7d 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -10,10 +10,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Generate this list with
-# find . -type f -name '*.m4' -printf '%f\n'|sort |fmt |tr '\012' @ \
-#   |sed 's/@$/%/;s/@/ \\@/g' |tr @% '\012\012'
-
 
 SHELL = /bin/sh
 
@@ -92,12 +88,12 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-EXTRA_DIST = README \
-assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 d-type.m4 decl.m4 \
-error.m4 getgroups.m4 getline.m4 getloadavg.m4 inttypes_h.m4 isc-posix.m4 \
-jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 jm-winsz2.m4 lfs.m4 lstat.m4 \
-malloc.m4 memcmp.m4 perl.m4 prereq.m4 putenv.m4 readdir.m4 realloc.m4 \
-ssize_t.m4 stat.m4 strftime.m4 uintmax_t.m4 uptime.m4 utimbuf.m4
+EXTRA_DIST = README assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 \
+d-type.m4 decl.m4 error.m4 getgroups.m4 getline.m4 getloadavg.m4 \
+inttypes_h.m4 isc-posix.m4 jm-macros.m4 jm-mktime.m4 jm-winsz1.m4 \
+jm-winsz2.m4 lchown.m4 lfs.m4 lstat.m4 malloc.m4 memcmp.m4 perl.m4 \
+prereq.m4 putenv.m4 readdir.m4 realloc.m4 ssize_t.m4 stat.m4 strftime.m4 \
+uintmax_t.m4 uptime.m4 utimbuf.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -190,6 +186,18 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
+Makefile.am: Makefile.am.in
+       rm -f $@ $@t
+       sed -n '1,/^##m4-files-begin/p' $< > $@t
+       ( echo EXTRA_DIST = README; \
+         find . -type f -name '*.m4' -print |sed s/..// |sort ) \
+           |fmt | (tr '\012' @; echo) \
+           |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
+         >> $@t
+       sed -n '/^##m4-files-end/,$$p' $< >> $@t
+       chmod a-w $@t
+       mv $@t $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/m4/lchown.m4 b/m4/lchown.m4
new file mode 100644 (file)
index 0000000..68398ed
--- /dev/null
+++ b/m4/lchown.m4
@@ -0,0 +1,10 @@
+#serial 1
+
+dnl From Jim Meyering.
+dnl Provide lchown on systems that lack it.
+
+AC_DEFUN(jm_FUNC_LCHOWN,
+[
+  AC_REQUIRE([AC_TYPE_UID_T])
+  AC_REPLACE_FUNCS(lchown)
+])