X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ferror.m4;h=e7022fe4604309d08fa1eb624fd8826b14f841f2;hb=208e667b5f8c696e723da34171fbaa6f01246f3b;hp=243dbda44da8f4ed930c7ccf54b2d39192b55d76;hpb=c2af86baf6680e54c6e503c7d12957c2e3c283fa;p=gnulib.git

diff --git a/m4/error.m4 b/m4/error.m4
index 243dbda44..e7022fe46 100644
--- a/m4/error.m4
+++ b/m4/error.m4
@@ -1,7 +1,6 @@
-#serial 12
+#serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009 Free Software
-# Foundation, Inc.
+# 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,
@@ -9,9 +8,15 @@
 
 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
+  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.