X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ferror.m4;h=14e23a71f71c5ba5f4df6b0a2f342cb0d8e48fcf;hb=92b5babed0ef62fb044a2b9b7e331b743158c304;hp=91abae39def62dc2bf4a240f37e68cf8db63b240;hpb=cef1ec1099108e3adc426f56f5e1f4088fbbefbd;p=gnulib.git

diff --git a/m4/error.m4 b/m4/error.m4
index 91abae39d..14e23a71f 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,12 +1,18 @@
-#serial 2
+#serial 7
 
-dnl FIXME: put these prerequisite-only *.m4 files in a separate
-dnl directory -- otherwise, they'll conflict with existing files.
+AC_DEFUN([gl_ERROR],
+[
+  AC_FUNC_ERROR_AT_LINE
+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  jm_PREREQ_ERROR
+])
 
-dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+# Prerequisites of lib/error.c.
+AC_DEFUN([jm_PREREQ_ERROR],
 [
-  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_REQUIRE([AC_FUNC_VPRINTF])
+  AC_CHECK_FUNCS(strerror)
+  AC_CHECK_DECLS([strerror])
   AC_FUNC_STRERROR_R
-  AC_HEADER_STDC
 ])