X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ferror.m4;h=29e6fdc9c209a16eb78e678d3fd2a4156674b5c5;hb=9f15e6702a27649a59263a7ed571805a979d9e70;hp=bf80802430e2d7b1a0dd99fe1332718a4c9fa343;hpb=f32d4251d83c934d557c41562052eaf4b6b19e38;p=gnulib.git

diff --git a/m4/error.m4 b/m4/error.m4
index bf8080243..29e6fdc9c 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,8 +1,27 @@
-#serial 1
+#serial 14
 
-dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+# Copyright (C) 1996-1998, 2001-2004, 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_ERROR],
+[
+  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
+  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
+  AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <error.h>]],
+          [[error_at_line (0, 0, "", 0, "an error occurred");]])],
+       [ac_cv_lib_error_at_line=yes],
+       [ac_cv_lib_error_at_line=no])])
+])
+
+# Prerequisites of lib/error.c.
+AC_DEFUN([gl_PREREQ_ERROR],
 [
-  AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
-  AC_HEADER_STDC
+  AC_REQUIRE([AC_FUNC_STRERROR_R])
+  :
 ])