X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ferror.m4;h=3fddb5c1115509baa246f7db9518c180c5976deb;hb=cbe1db166ca76ef3571be8fe34fc10374b68c282;hp=bf80802430e2d7b1a0dd99fe1332718a4c9fa343;hpb=f32d4251d83c934d557c41562052eaf4b6b19e38;p=gnulib.git

diff --git a/m4/error.m4 b/m4/error.m4
index bf8080243..3fddb5c11 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,8 +1,13 @@
-#serial 1
+#serial 4
+
+dnl FIXME: put these prerequisite-only *.m4 files in a separate
+dnl directory -- otherwise, they'll conflict with existing files.
 
 dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+AC_DEFUN([jm_PREREQ_ERROR],
 [
-  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
+  AC_CHECK_FUNCS(strerror vprintf doprnt)
+  AC_CHECK_DECLS([strerror])
+  AC_FUNC_STRERROR_R
   AC_HEADER_STDC
 ])