diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-10-20 15:22:21 +0200 |
| commit | 1d8b9e17ea13630aec475484da09ebba0366f7c8 (patch) | |
| tree | 0c801f68561bfb0930a4ade80d7ca3a7940887ab /gnulib-m4/error_h.m4 | |
| parent | 84e26c587987e8484d55db4165f188b40c09e94b (diff) | |
| parent | 630f99f29bd31a76d8d24da2975a045452c763ef (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/error_h.m4')
| -rw-r--r-- | gnulib-m4/error_h.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gnulib-m4/error_h.m4 b/gnulib-m4/error_h.m4 index 006770c4..91a8fc68 100644 --- a/gnulib-m4/error_h.m4 +++ b/gnulib-m4/error_h.m4 @@ -1,4 +1,5 @@ -# error_h.m4 serial 4 +# error_h.m4 +# serial 5 dnl Copyright (C) 1996-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -110,12 +111,15 @@ AC_DEFUN_ONCE([gl_ERROR_H], esac fi - if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ - || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then - COMPILE_ERROR_C=1 - else - COMPILE_ERROR_C=0 - fi + m4_ifdef([gl_HAVE_MODULE_VERROR], + [COMPILE_ERROR_C=1], + [if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \ + || test $HAVE_ERROR_AT_LINE = 0 \ + || test $REPLACE_ERROR_AT_LINE = 1; then + COMPILE_ERROR_C=1 + else + COMPILE_ERROR_C=0 + fi]) AC_SUBST([HAVE_ERROR]) AC_SUBST([HAVE_ERROR_AT_LINE]) |