X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ferror.m4;h=9f1307a428e297d89b8ef96a9affe82dcf091384;hb=eb6dce1d3a40d4d24422ab59856a6dd193b79de5;hp=71a79f7ea8077d2b5216c10e56f3d1dd9fc0120c;hpb=6e411d217a9b4234f3b28d61c065cfb8076e8387;p=gnulib.git

diff --git a/m4/error.m4 b/m4/error.m4
index 71a79f7ea..9f1307a42 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,20 +1,22 @@
-#serial 6
+#serial 12
+
+# Copyright (C) 1996-1998, 2001-2004, 2009-2010 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]).
-  if test $ac_cv_lib_error_at_line = no; then
-    jm_PREREQ_ERROR
-  fi
+  gl_PREREQ_ERROR
 ])
 
 # Prerequisites of lib/error.c.
-AC_DEFUN([jm_PREREQ_ERROR],
+AC_DEFUN([gl_PREREQ_ERROR],
 [
-  AC_REQUIRE([AC_HEADER_STDC])
-  AC_REQUIRE([AC_FUNC_VPRINTF])
-  AC_CHECK_FUNCS(strerror)
-  AC_CHECK_DECLS([strerror])
-  AC_FUNC_STRERROR_R
+  AC_REQUIRE([AC_FUNC_STRERROR_R])
+  AC_REQUIRE([AC_C_INLINE])
+  :
 ])