Mercurial > hg > octave-nkf > gnulib-hg
changeset 9348:8ffd013e225e
* m4/iconv_open (gl_FUNC_ICONV_OPEN_UTF): Fix cache variable name.
author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
---|---|
date | Mon, 15 Oct 2007 21:15:17 +0200 |
parents | 637caf8d483d |
children | 0c6048a8aaed |
files | ChangeLog m4/iconv_open.m4 |
diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * m4/iconv_open (gl_FUNC_ICONV_OPEN_UTF): Fix cache variable name. + 2007-10-15 Bruno Haible <bruno@clisp.org> * m4/getaddrinfo.m4 (gl_GETADDRINFO, gl_PREREQ_GETADDRINFO): Use
--- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,4 +1,4 @@ -# iconv_open.m4 serial 2 +# iconv_open.m4 serial 3 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -56,7 +56,7 @@ fi AC_SUBST([ICONV_CONST]) AC_CACHE_CHECK([whether iconv supports conversion between UTF-8 and UTF-{16,32}{BE,LE}], - [gl_func_iconv_supports_utf], + [gl_cv_func_iconv_supports_utf], [ save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -206,25 +206,25 @@ ASSERT (iconv_close (cd) == 0); } return 0; -}], [gl_func_iconv_supports_utf=yes], [gl_func_iconv_supports_utf=no], +}], [gl_cv_func_iconv_supports_utf=yes], [gl_cv_func_iconv_supports_utf=no], [ dnl We know that GNU libiconv, GNU libc, and Solaris >= 9 do. dnl OSF/1 5.1 has these encodings, but inserts a BOM in the "to" dnl direction. - gl_func_iconv_supports_utf=no + gl_cv_func_iconv_supports_utf=no if test $gl_func_iconv_gnu = yes; then - gl_func_iconv_supports_utf=yes + gl_cv_func_iconv_supports_utf=yes else changequote(,)dnl case "$host_os" in - solaris2.9 | solaris2.1[0-9]) gl_func_iconv_supports_utf=yes ;; + solaris2.9 | solaris2.1[0-9]) gl_cv_func_iconv_supports_utf=yes ;; esac changequote([,])dnl fi ]) LIBS="$save_LIBS" ]) - if test $gl_func_iconv_supports_utf = no; then + if test $gl_cv_func_iconv_supports_utf = no; then REPLACE_ICONV_UTF=1 AC_DEFINE([REPLACE_ICONV_UTF], 1, [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.])