--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,8 @@
 1998-05-19  Jim Meyering  <meyering@ascend.com>
 
+	* jm-macros.m4: Add jm_FUNC_LCHOWN.
+	* lchown.m4: New file.
+
 	* Makefile.am.in: New file.
 	* Makefile.am (Makefile.am): Depend on Makefile.am.in.
 

--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -14,7 +14,7 @@
 	rm -f $@ $@t
 	sed -n '1,/^##m4-files-begin/p' $< > $@t
 	( echo EXTRA_DIST = README; \
-	  find . -type f -name '*.m4' -print |sed s/..// |sort ) \
+	  find . -type f -name '*.m4' -print |sed s,^\./,, |sort ) \
 	    |fmt | (tr '\012' @; echo) \
 	    |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
 	  >> $@t

--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -62,6 +62,7 @@
 CC = @CC@
 CPP = @CPP@
 DATADIRNAME = @DATADIRNAME@
+DF_PROG = @DF_PROG@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
@@ -76,16 +77,17 @@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
+MVDIR_PROG = @MVDIR_PROG@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
-POW_LIBM = @POW_LIBM@
 RANLIB = @RANLIB@
 U = @U@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+YACC = @YACC@
 l = @l@
 
 EXTRA_DIST = README assert.m4 check-decl.m4 chown.m4 const.m4 d-ino.m4 \
@@ -190,7 +192,7 @@
 	rm -f $@ $@t
 	sed -n '1,/^##m4-files-begin/p' $< > $@t
 	( echo EXTRA_DIST = README; \
-	  find . -type f -name '*.m4' -print |sed s/..// |sort ) \
+	  find . -type f -name '*.m4' -print |sed s,^\./,, |sort ) \
 	    |fmt | (tr '\012' @; echo) \
 	    |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \
 	  >> $@t

new file mode 100644
--- /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)
+])