diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-10-24 22:25:44 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-10-24 22:25:44 +0200 |
| commit | cb4186bef1b44691db4221406d001a8d40c65b4b (patch) | |
| tree | 285662381eaa0514f988142bff0c8a9685c84dc0 /gnulib-m4/iconv.m4 | |
| parent | cc0876a2fa9e703b1064992ab535f3eed57e9c71 (diff) | |
| parent | 26112352a774737e1ce5580c93654a26c1e82b39 (diff) | |
Update upstream source from tag 'upstream/1.1'
Update to upstream version '1.1'
with Debian dir acc8a9214de592a0bbbdb680385559210b329d52
Diffstat (limited to 'gnulib-m4/iconv.m4')
| -rw-r--r-- | gnulib-m4/iconv.m4 | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/gnulib-m4/iconv.m4 b/gnulib-m4/iconv.m4 index 00057953..2065c977 100644 --- a/gnulib-m4/iconv.m4 +++ b/gnulib-m4/iconv.m4 @@ -1,4 +1,4 @@ -# iconv.m4 serial 24 +# iconv.m4 serial 26 dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -234,12 +234,6 @@ AC_DEFUN([AM_ICONV_LINK], dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". -dnl This is tricky because of the way 'aclocal' is implemented: -dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. -dnl Otherwise aclocal's initial scan pass would miss the macro definition. -dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. -dnl Otherwise aclocal would emit many "Use of uninitialized value $1" -dnl warnings. AC_DEFUN_ONCE([AM_ICONV], [ AM_ICONV_LINK @@ -280,4 +274,20 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si ICONV_CONST="const" fi ]) + + dnl A summary result, for those packages which want to print a summary at the + dnl end of the configuration. + if test "$am_func_iconv" = yes; then + if test -n "$LIBICONV"; then + am_cv_func_iconv_summary='yes, in libiconv' + else + am_cv_func_iconv_summary='yes, in libc' + fi + else + if test "$am_cv_func_iconv" = yes; then + am_cv_func_iconv_summary='not working, consider installing GNU libiconv' + else + am_cv_func_iconv_summary='no, consider installing GNU libiconv' + fi + fi ]) |