"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "m4/iconv.m4" between
pulseaudio-14.0.tar.xz and pulseaudio-14.2.tar.xz

About: PulseAudio is a networked sound server (for POSIX OSes), a proxy for your sound applications.

iconv.m4  (pulseaudio-14.0.tar.xz):iconv.m4  (pulseaudio-14.2.tar.xz)
# iconv.m4 serial 21 # iconv.m4 serial 19 (gettext-0.18.2)
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation, dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
dnl Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible. dnl From Bruno Haible.
AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
[ [
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
skipping to change at line 171 skipping to change at line 170
&inptr, &inbytesleft, &inptr, &inbytesleft,
&outptr, &outbytesleft); &outptr, &outbytesleft);
if ((int)res > 0) if ((int)res > 0)
result |= 8; result |= 8;
iconv_close (cd_88591_to_utf8); iconv_close (cd_88591_to_utf8);
} }
} }
#endif #endif
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
provided. */ provided. */
{ if (/* Try standardized names. */
/* Try standardized names. */ iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP"); /* Try IRIX, OSF/1 names. */
/* Try IRIX, OSF/1 names. */ && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
iconv_t cd2 = iconv_open ("UTF-8", "eucJP"); /* Try AIX names. */
/* Try AIX names. */ && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP"); /* Try HP-UX names. */
/* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
iconv_t cd4 = iconv_open ("utf8", "eucJP"); result |= 16;
if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
&& cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
result |= 16;
if (cd1 != (iconv_t)(-1))
iconv_close (cd1);
if (cd2 != (iconv_t)(-1))
iconv_close (cd2);
if (cd3 != (iconv_t)(-1))
iconv_close (cd3);
if (cd4 != (iconv_t)(-1))
iconv_close (cd4);
}
return result; return result;
]])], ]])],
[am_cv_func_iconv_works=yes], , [am_cv_func_iconv_works=yes], ,
[case "$host_os" in [case "$host_os" in
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
*) am_cv_func_iconv_works="guessing yes" ;; *) am_cv_func_iconv_works="guessing yes" ;;
esac]) esac])
test "$am_cv_func_iconv_works" = no || break test "$am_cv_func_iconv_works" = no || break
done done
LIBS="$am_save_LIBS" LIBS="$am_save_LIBS"
skipping to change at line 274 skipping to change at line 261
size_t iconv(); size_t iconv();
#endif #endif
]], ]],
[[]])], [[]])],
[am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1=""],
[am_cv_proto_iconv_arg1="const"]) [am_cv_proto_iconv_arg1="const"])
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg 1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg 1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/ '` am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/ '`
AC_MSG_RESULT([ AC_MSG_RESULT([
$am_cv_proto_iconv]) $am_cv_proto_iconv])
else AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
dnl When compiling GNU libiconv on a system that does not have iconv yet, [Define as const if the declaration of iconv() needs const.])
dnl pick the POSIX compliant declaration without 'const'. dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
am_cv_proto_iconv_arg1="" m4_ifdef([gl_ICONV_H_DEFAULTS],
[AC_REQUIRE([gl_ICONV_H_DEFAULTS])
if test -n "$am_cv_proto_iconv_arg1"; then
ICONV_CONST="const"
fi
])
fi fi
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
[Define as const if the declaration of iconv() needs const.])
dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
m4_ifdef([gl_ICONV_H_DEFAULTS],
[AC_REQUIRE([gl_ICONV_H_DEFAULTS])
if test -n "$am_cv_proto_iconv_arg1"; then
ICONV_CONST="const"
fi
])
]) ])
 End of changes. 4 change blocks. 
37 lines changed or deleted 20 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)