diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-02-11 21:12:00 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-02-11 21:12:00 +0100 |
| commit | 8e3b4ac39b421fdd0a9083b6cae06fd6fadd8f63 (patch) | |
| tree | 96fc8d696c745f8108a49af1c4cf1364aa04e6ed /m4 | |
| parent | a4f85089e30f89dcb3c0da59ac8a70115d529f72 (diff) | |
| download | gnulib-8e3b4ac39b421fdd0a9083b6cae06fd6fadd8f63.tar.gz | |
error-h: Make less fragile.
* lib/error.in.h: Use #include_next if the system has an <error.h>. Use
a split double-inclusion guard.
* m4/error_h.m4 (gl_ERROR_H): Invoke gl_CHECK_NEXT_HEADERS. Set
HAVE_ERROR_H.
* modules/error-h (Makefile.am): Substitute GUARD_PREFIX, HAVE_ERROR_H,
INCLUDE_NEXT, PRAGMA_SYSTEM_HEADER, NEXT_ERROR_H.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/error_h.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/m4/error_h.m4 b/m4/error_h.m4 index 15b5112309..f38e4ead13 100644 --- a/m4/error_h.m4 +++ b/m4/error_h.m4 @@ -1,4 +1,4 @@ -# error_h.m4 serial 2 +# error_h.m4 serial 3 dnl Copyright (C) 1996-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,14 @@ AC_DEFUN_ONCE([gl_ERROR_H], [ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + gl_CHECK_NEXT_HEADERS([error.h]) + if test $ac_cv_header_error_h = yes; then + HAVE_ERROR_H=1 + else + HAVE_ERROR_H=0 + fi + AC_SUBST([HAVE_ERROR_H]) + REPLACE_ERROR=0 gl_CHECK_FUNCS_ANDROID([error], [[#include <error.h>]]) |