X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ferror.m4;h=6ea75ac02935f5f817983b072903eb2b6c838f3e;hb=ce38c27828c6a3286e99e312d50fe140a1ec334b;hp=99e9cf0031ffd13c85a6abdd2471827ae3071917;hpb=e059c2358aad79ce8dfd9581dd6f12ce8503dc63;p=gnulib.git

diff --git a/m4/error.m4 b/m4/error.m4
index 99e9cf003..6ea75ac02 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,20 +1,39 @@
-#serial 5
+#serial 13
+
+# Copyright (C) 1996-1998, 2001-2004, 2009-2011 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],
 [
   AC_FUNC_ERROR_AT_LINE
   dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
+  gl_PREREQ_ERROR
+])
+
+# Redefine AC_FUNC_ERROR_AT_LINE, because it is no longer maintained in
+# Autoconf.
+AC_DEFUN([AC_FUNC_ERROR_AT_LINE],
+[
+  AC_LIBSOURCES([error.h, error.c])dnl
+  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])])
   if test $ac_cv_lib_error_at_line = no; then
-    jm_PREREQ_ERROR
+    AC_LIBOBJ([error])
   fi
 ])
 
 # Prerequisites of lib/error.c.
-AC_DEFUN([jm_PREREQ_ERROR],
+AC_DEFUN([gl_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
+  AC_REQUIRE([AC_FUNC_STRERROR_R])
+  AC_REQUIRE([AC_C_INLINE])
+  :
 ])