--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-06  Paul Eggert  <eggert@twinsun.com>
+
+	Undo the 2001-07-02 change for jm-glibc-io, as it was too much of
+	a pain in practice to deal with generated m4 files.  This change
+	goes together with the 2002-12-04 unlocked-io.h change in ../lib.
+
+	* Makefile.am.in (Makefile.am): Don't mention jm-glibc-io.m4n
+	and jm-glibc-io.m4, as they are no longer a special case.
+	* jm-glibc-io.m4: New file.
+	* jm-glibc-io.m4n: Remove.
+
 2002-07-06  Jim Meyering  <meyering@lucent.com>
 
 	* README: Don't mention Makefile.am.in.

--- a/m4/Makefile.am.in
+++ b/m4/Makefile.am.in
@@ -7,7 +7,7 @@
 	rm -f $@ $@t
 	sed -n '1,/^##m4-files-begin/p' $< > $@t
 	(((echo EXTRA_DIST =; \
-	   echo "  README jm-glibc-io.m4 jm-glibc-io.m4n Makefile.am.in" \
+	   echo "  README Makefile.am.in" \
 	  ) | tr '\012' @); \
 	  (echo *.m4|tr ' ' @) ) \
 	  |sed 's/@$$/%/;s/@/ \\@/g' |tr @% '\012\012' \

new file mode 100644
--- /dev/null
+++ b/m4/jm-glibc-io.m4
@@ -0,0 +1,14 @@
+#serial 7 -*- autoconf -*-
+
+dnl From Jim Meyering.
+dnl
+dnl See if the glibc *_unlocked I/O macros are available.
+dnl Use only those *_unlocked macros that are declared.
+dnl
+
+AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
+  [AC_CHECK_DECLS(
+     [clearerr_unlocked, feof_unlocked, ferror_unlocked,
+      fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked,
+      fread_unlocked, fwrite_unlocked, getc_unlocked,
+      getchar_unlocked, putc_unlocked, putchar_unlocked])])