* m4/error.m4: Do not put under dynamic conditions some code which

[bison.git] / m4 / error.m4

diff --git a/m4/error.m4 b/m4/error.m4
index eb0f776bbaff46ee3d7ddc96c16ee9ce75bcd620..560ca8fb967677c8eda28e9e80dd2048cb8c7bba 100644 (file)
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,11 +1,18 @@
-#serial 1
+#serial 6
 
-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_HEADER_STDC
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_FUNCS_ONCE(doprnt vprintf)
+  AC_CHECK_FUNCS(strerror)
+  AC_CHECK_DECLS([strerror])
+  AC_FUNC_STRERROR_R
 ])