prepare NEWS.stable

[gnulib.git] / m4 / mbrlen.m4

diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4
index 6049d1a..8bf0756 100644 (file)
--- a/m4/mbrlen.m4
+++ b/m4/mbrlen.m4
@@ -1,5 +1,5 @@
-# mbrlen.m4 serial 2
-dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# mbrlen.m4 serial 8
+dnl Copyright (C) 2008, 2010-2012 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.
 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.


@@ -13,6 +13,22 @@ AC_DEFUN([gl_FUNC_MBRLEN],
   AC_CHECK_FUNCS_ONCE([mbrlen])
   if test $ac_cv_func_mbrlen = no; then
     HAVE_MBRLEN=0
   AC_CHECK_FUNCS_ONCE([mbrlen])
   if test $ac_cv_func_mbrlen = no; then
     HAVE_MBRLEN=0

+    AC_CHECK_DECLS([mbrlen],,, [[
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#include <wchar.h>
+]])
+    if test $ac_cv_have_decl_mbrlen = yes; then
+      dnl On Minix 3.1.8, the system's <wchar.h> declares mbrlen() although
+      dnl it does not have the function. Avoid a collision with gnulib's
+      dnl replacement.
+      REPLACE_MBRLEN=1
+    fi

   else
     dnl Most bugs affecting the system's mbrtowc function also affect the
     dnl mbrlen function. So override mbrlen whenever mbrtowc is overridden.
   else
     dnl Most bugs affecting the system's mbrtowc function also affect the
     dnl mbrlen function. So override mbrlen whenever mbrtowc is overridden.


@@ -22,11 +38,6 @@ AC_DEFUN([gl_FUNC_MBRLEN],
       REPLACE_MBRLEN=1
     fi
   fi
       REPLACE_MBRLEN=1
     fi
   fi

-  if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
-    gl_REPLACE_WCHAR_H
-    AC_LIBOBJ([mbrlen])
-    gl_PREREQ_MBRLEN
-  fi

 ])
 
 dnl Test whether mbrlen puts the state into non-initial state when parsing an
 ])
 
 dnl Test whether mbrlen puts the state into non-initial state when parsing an


@@ -45,16 +56,24 @@ AC_DEFUN([gl_MBRLEN_INCOMPLETE_STATE],
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
       dnl is present.
 changequote(,)dnl
       case "$host_os" in

-              # Guess no on AIX and OSF/1.
-        osf*) gl_cv_func_mbrlen_incomplete_state="guessing no" ;;
-              # Guess yes otherwise.
-        *)    gl_cv_func_mbrlen_incomplete_state="guessing yes" ;;
+                     # Guess no on AIX and OSF/1.
+        aix* | osf*) gl_cv_func_mbrlen_incomplete_state="guessing no" ;;
+                     # Guess yes otherwise.
+        *)           gl_cv_func_mbrlen_incomplete_state="guessing yes" ;;

       esac
 changequote([,])dnl
       if test $LOCALE_JA != none; then
       esac
 changequote([,])dnl
       if test $LOCALE_JA != none; then

-        AC_TRY_RUN([
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[

 #include <locale.h>
 #include <string.h>
 #include <locale.h>
 #include <string.h>

+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>

 #include <wchar.h>
 int main ()
 {
 #include <wchar.h>
 int main ()
 {


@@ -69,7 +88,7 @@ int main ()
           return 1;
     }
   return 0;
           return 1;
     }
   return 0;

-}],
+}]])],

           [gl_cv_func_mbrlen_incomplete_state=yes],
           [gl_cv_func_mbrlen_incomplete_state=no],
           [])
           [gl_cv_func_mbrlen_incomplete_state=yes],
           [gl_cv_func_mbrlen_incomplete_state=no],
           [])


@@ -102,12 +121,21 @@ changequote(,)dnl
       esac
 changequote([,])dnl
       if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then
       esac
 changequote([,])dnl
       if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none; then

-        AC_TRY_RUN([
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[

 #include <locale.h>
 #include <string.h>
 #include <locale.h>
 #include <string.h>

+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>

 #include <wchar.h>
 int main ()
 {
 #include <wchar.h>
 int main ()
 {

+  int result = 0;

   /* This fails on Solaris.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
   /* This fails on Solaris.  */
   if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {


@@ -119,7 +147,7 @@ int main ()
         {
           input[1] = '\0';
           if (mbrlen (input + 2, 5, &state) != 1)
         {
           input[1] = '\0';
           if (mbrlen (input + 2, 5, &state) != 1)

-            return 1;
+            result |= 1;

         }
     }
   /* This fails on HP-UX 11.11.  */
         }
     }
   /* This fails on HP-UX 11.11.  */


@@ -133,11 +161,11 @@ int main ()
         {
           input[1] = '\0';
           if (mbrlen (input + 2, 5, &state) != 2)
         {
           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],
           [])
           [gl_cv_func_mbrlen_retval=yes],
           [gl_cv_func_mbrlen_retval=no],
           [])


@@ -167,9 +195,17 @@ changequote(,)dnl
       esac
 changequote([,])dnl
       if test $LOCALE_ZH_CN != none; then
       esac
 changequote([,])dnl
       if test $LOCALE_ZH_CN != none; then

-        AC_TRY_RUN([
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[

 #include <locale.h>
 #include <string.h>
 #include <locale.h>
 #include <string.h>

+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+   <wchar.h>.
+   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+   included before <wchar.h>.  */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>

 #include <wchar.h>
 int main ()
 {
 #include <wchar.h>
 int main ()
 {


@@ -183,7 +219,7 @@ int main ()
         return 1;
     }
   return 0;
         return 1;
     }
   return 0;

-}],
+}]])],

           [gl_cv_func_mbrlen_nul_retval=yes],
           [gl_cv_func_mbrlen_nul_retval=no],
           [])
           [gl_cv_func_mbrlen_nul_retval=yes],
           [gl_cv_func_mbrlen_nul_retval=no],
           [])