From: Jim Meyering <jim@meyering.net>
Date: Tue, 5 Aug 2003 17:10:58 +0000 (+0000)
Subject: Sync from gnulib.
X-Git-Tag: CPPI-1_11~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f790a86fdebdf31e81662e85cf958705b2b7c567;p=thirdparty%2Fcoreutils.git

Sync from gnulib.
---

diff --git a/m4/error.m4 b/m4/error.m4
index 717725d619..14e23a71f7 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
 ])