Use new documented autoconf macros.

[gnulib.git] / m4 / error.m4

diff --git a/m4/error.m4 b/m4/error.m4
index bf80802..99e9cf0 100644 (file)
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,8 +1,20 @@
-#serial 1
+#serial 5
 
-dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+AC_DEFUN([gl_ERROR],
 [
-  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
-  AC_HEADER_STDC
+  AC_FUNC_ERROR_AT_LINE
+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  if test $ac_cv_lib_error_at_line = no; then
+    jm_PREREQ_ERROR
+  fi
+])
+
+# Prerequisites of lib/error.c.
+AC_DEFUN([jm_PREREQ_ERROR],
+[
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_FUNCS_ONCE(doprnt vprintf)
+  AC_CHECK_FUNCS(strerror)
+  AC_CHECK_DECLS([strerror])
+  AC_FUNC_STRERROR_R
 ])