X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmbrlen.m4;h=8f55e3627dad1820ae666d7eb09db45dc9bd878f;hb=4e90ef85d2d3c2e42ce26d2e6eebfb5e5b0f0943;hp=81fc671da2116c20876d7569b488ac6f620e5e00;hpb=89d7698a351cd36d0e7baa44ee4bea3cf56cf459;p=gnulib.git diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4 index 81fc671da..8f55e3627 100644 --- a/m4/mbrlen.m4 +++ b/m4/mbrlen.m4 @@ -1,5 +1,5 @@ -# mbrlen.m4 serial 3 -dnl Copyright (C) 2008, 2010 Free Software Foundation, Inc. +# mbrlen.m4 serial 6 +dnl Copyright (C) 2008, 2010-2011 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. @@ -23,7 +23,6 @@ AC_DEFUN([gl_FUNC_MBRLEN], fi fi if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then - gl_REPLACE_WCHAR_H AC_LIBOBJ([mbrlen]) gl_PREREQ_MBRLEN fi @@ -52,9 +51,17 @@ changequote(,)dnl esac changequote([,])dnl if test $LOCALE_JA != none; then - AC_TRY_RUN([ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -69,7 +76,7 @@ int main () return 1; } return 0; -}], +}]])], [gl_cv_func_mbrlen_incomplete_state=yes], [gl_cv_func_mbrlen_incomplete_state=no], []) @@ -102,12 +109,21 @@ changequote(,)dnl esac changequote([,])dnl if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then - AC_TRY_RUN([ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { + int result = 0; /* This fails on Solaris. */ if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL) { @@ -119,7 +135,7 @@ int main () { input[1] = '\0'; if (mbrlen (input + 2, 5, &state) != 1) - return 1; + result |= 1; } } /* This fails on HP-UX 11.11. */ @@ -133,11 +149,11 @@ int main () { input[1] = '\0'; if (mbrlen (input + 2, 5, &state) != 2) - return 1; + result |= 2; } } - return 0; -}], + return result; +}]])], [gl_cv_func_mbrlen_retval=yes], [gl_cv_func_mbrlen_retval=no], []) @@ -167,9 +183,17 @@ changequote(,)dnl esac changequote([,])dnl if test $LOCALE_ZH_CN != none; then - AC_TRY_RUN([ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.0.1 has a bug: , and must be + included before . */ +#include +#include +#include #include int main () { @@ -183,7 +207,7 @@ int main () return 1; } return 0; -}], +}]])], [gl_cv_func_mbrlen_nul_retval=yes], [gl_cv_func_mbrlen_nul_retval=no], [])