diff options
Diffstat (limited to 'm4/iconv_h.m4')
| -rw-r--r-- | m4/iconv_h.m4 | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/m4/iconv_h.m4 b/m4/iconv_h.m4 index 294098829..584656628 100644 --- a/m4/iconv_h.m4 +++ b/m4/iconv_h.m4 @@ -1,5 +1,5 @@ -# iconv_h.m4 serial 15 -dnl Copyright (C) 2007-2021 Free Software Foundation, Inc. +# iconv_h.m4 serial 16 +dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,8 +8,8 @@ AC_DEFUN_ONCE([gl_ICONV_H], [ AC_REQUIRE([gl_ICONV_H_DEFAULTS]) - dnl Execute this unconditionally, because ICONV_H may be set by other - dnl modules, after this code is executed. + dnl Execute this unconditionally, because GL_GENERATE_ICONV_H may be set to + dnl true by other modules, after this code is executed. gl_CHECK_NEXT_HEADERS([iconv.h]) dnl Check for declarations of anything we want to poison if the @@ -25,8 +25,7 @@ dnl Unconditionally enables the replacement of <iconv.h>. AC_DEFUN([gl_REPLACE_ICONV_H], [ gl_ICONV_H_REQUIRE_DEFAULTS - ICONV_H='iconv.h' - AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) + GL_GENERATE_ICONV_H=true ]) # gl_ICONV_MODULE_INDICATOR([modulename]) @@ -60,13 +59,12 @@ AC_DEFUN([gl_ICONV_H_DEFAULTS], REPLACE_ICONV=0; AC_SUBST([REPLACE_ICONV]) REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN]) REPLACE_ICONV_UTF=0; AC_SUBST([REPLACE_ICONV_UTF]) - ICONV_H=''; AC_SUBST([ICONV_H]) + GL_GENERATE_ICONV_H=false m4_ifdef([gl_POSIXCHECK], - [ICONV_H='iconv.h'], + [GL_GENERATE_ICONV_H=true], [if m4_ifdef([gl_ANSI_CXX], [test "$CXX" != no], [false]); then dnl Override <fnmatch.h> always, to support the C++ GNULIB_NAMESPACE. - ICONV_H='iconv.h' + GL_GENERATE_ICONV_H=true fi ]) - AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"]) ]) |