# HG changeset patch # User Bruno Haible # Date 1240450520 -7200 # Node ID fcd8e65744b277ba47b74562d271542ac6c59b87 # Parent 3bc886cdc68cf4cedaa9e5946afe69b15d280589 Fix cross-compilation results. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2009-04-22 Yoann Vandoorselaere + Bruno Haible + + Fix cross-compilation results. + * m4/btowc.m4 (gl_FUNC_BTOWC): Use no-op statement, rather than empty + statement, as third argument of AC_TRY_RUN. + * m4/mbrtowc.m4 (gl_MBRTOWC_INCOMPLETE_STATE, gl_MBRTOWC_SANITYCHECK, + gl_MBRTOWC_NULL_ARG, gl_MBRTOWC_RETVAL, gl_MBRTOWC_NUL_RETVAL): + Likewise. + * m4/mbsrtowcs.m4 (gl_MBSRTOWCS_WORKS): Likewise. + * m4/wcsrtombs.m4 (gl_WCSRTOMBS_TERMINATION, gl_WCSRTOMBS_NULL): + Likewise. + * m4/wctob.m4 (gl_FUNC_WCTOB): Likewise. + * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Likewise. Update for AIX 4.3. + * doc/posix-functions/wcrtomb.texi: Mention the bug on AIX 4.3. + 2009-04-20 Bruno Haible Avoid test failure on mingw. diff --git a/doc/posix-functions/wcrtomb.texi b/doc/posix-functions/wcrtomb.texi --- a/doc/posix-functions/wcrtomb.texi +++ b/doc/posix-functions/wcrtomb.texi @@ -13,7 +13,7 @@ HP-UX 11.00, IRIX 6.5, Solaris 2.6, mingw, Interix 3.5. @item This function returns 0 when the first argument is NULL in some locales on some platforms: -OSF/1 5.1, Solaris 10. +AIX 4.3, OSF/1 5.1, Solaris 10. @end itemize Portability problems not fixed by Gnulib: diff --git a/m4/btowc.m4 b/m4/btowc.m4 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ -# btowc.m4 serial 3 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# btowc.m4 serial 4 +dnl Copyright (C) 2008-2009 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. @@ -47,7 +47,7 @@ }], [gl_cv_func_btowc_eof=yes], [gl_cv_func_btowc_eof=no], - []) + [:]) fi ]) case "$gl_cv_func_btowc_eof" in diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,4 +1,4 @@ -# mbrtowc.m4 serial 14 +# mbrtowc.m4 serial 15 dnl Copyright (C) 2001-2002, 2004-2005, 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -127,7 +127,7 @@ }], [gl_cv_func_mbrtowc_incomplete_state=yes], [gl_cv_func_mbrtowc_incomplete_state=no], - []) + [:]) fi ]) ]) @@ -178,7 +178,7 @@ }], [gl_cv_func_mbrtowc_sanitycheck=yes], [gl_cv_func_mbrtowc_sanitycheck=no], - []) + [:]) fi ]) ]) @@ -225,7 +225,7 @@ return 1; } return 0; -}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], []) +}], [gl_cv_func_mbrtowc_null_arg=yes], [gl_cv_func_mbrtowc_null_arg=no], [:]) fi ]) ]) @@ -295,7 +295,7 @@ }], [gl_cv_func_mbrtowc_retval=yes], [gl_cv_func_mbrtowc_retval=no], - []) + [:]) fi ]) ]) @@ -342,7 +342,7 @@ }], [gl_cv_func_mbrtowc_nul_retval=yes], [gl_cv_func_mbrtowc_nul_retval=no], - []) + [:]) fi ]) ]) diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ -# mbsrtowcs.m4 serial 4 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# mbsrtowcs.m4 serial 5 +dnl Copyright (C) 2008-2009 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. @@ -110,7 +110,7 @@ }], [gl_cv_func_mbsrtowcs_works=yes], [gl_cv_func_mbsrtowcs_works=no], - []) + [:]) fi ]) ]) diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ -# wcrtomb.m4 serial 2 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# wcrtomb.m4 serial 3 +dnl Copyright (C) 2008-2009 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. @@ -14,7 +14,7 @@ HAVE_WCRTOMB=0 else - dnl On OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes + dnl On AIX 4.3, OSF/1 5.1 and Solaris 10, wcrtomb (NULL, 0, NULL) sometimes dnl returns 0 instead of 1. AC_REQUIRE([AC_PROG_CC]) AC_REQUIRE([gt_LOCALE_FR]) @@ -29,10 +29,10 @@ dnl is present. changequote(,)dnl case "$host_os" in - # Guess no on OSF/1 and Solaris. - osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; - # Guess yes otherwise. - *) gl_cv_func_wcrtomb_retval="guessing yes" ;; + # Guess no on AIX 4, OSF/1 and Solaris. + aix4* | osf* | solaris*) gl_cv_func_wcrtomb_retval="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_wcrtomb_retval="guessing yes" ;; esac changequote([,])dnl if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then @@ -67,7 +67,7 @@ }], [gl_cv_func_wcrtomb_retval=yes], [gl_cv_func_wcrtomb_retval=no], - []) + [:]) fi ]) case "$gl_cv_func_wcrtomb_retval" in diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4 --- a/m4/wcsrtombs.m4 +++ b/m4/wcsrtombs.m4 @@ -1,5 +1,5 @@ -# wcsrtombs.m4 serial 2 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# wcsrtombs.m4 serial 3 +dnl Copyright (C) 2008-2009 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. @@ -86,7 +86,7 @@ }], [gl_cv_func_wcsrtombs_termination=yes], [gl_cv_func_wcsrtombs_termination=no], - []) + [:]) fi ]) ]) @@ -139,7 +139,7 @@ }], [gl_cv_func_wcsrtombs_null=yes], [gl_cv_func_wcsrtombs_null=no], - []) + [:]) fi ]) ]) diff --git a/m4/wctob.m4 b/m4/wctob.m4 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,5 +1,5 @@ -# wctob.m4 serial 3 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# wctob.m4 serial 4 +dnl Copyright (C) 2008-2009 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. @@ -53,7 +53,7 @@ }], [gl_cv_func_wctob_works=yes], [gl_cv_func_wctob_works=no], - []) + [:]) fi ]) case "$gl_cv_func_wctob_works" in