diff --git a/m4/error.m4 b/m4/error.m4 index 717725d61..14e23a71f 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,14 +1,18 @@ -#serial 5 +#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. +# Prerequisites of lib/error.c. AC_DEFUN([jm_PREREQ_ERROR], [ - AC_CHECK_FUNCS(strerror vprintf doprnt) + AC_REQUIRE([AC_HEADER_STDC]) + AC_REQUIRE([AC_FUNC_VPRINTF]) + AC_CHECK_FUNCS(strerror) AC_CHECK_DECLS([strerror]) - AC_CHECK_HEADERS([libintl.h]) AC_FUNC_STRERROR_R - AC_HEADER_STDC ])