Also define mbstate_t, if necessary.

diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index c7cc38a01b9ef5472affd51673b0d6be5e1faba6..2c14444d7eebbac0a5bef08427278410439a9e6f 100644 (file)
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,4 +1,4 @@
-# serial 3
+# serial 4
 
 # From Paul Eggert.
 
@@ -11,7 +11,20 @@
 # a syntax error in wchar.h due to the use of undefined __int32_t.
 
 AC_DEFUN(AC_MBSTATE_T_OBJECT,
-  [AC_CACHE_CHECK([for mbstate_t object type], ac_cv_type_mbstate_t_object,
+  [
+   # Check for the mbstate_t type.
+   ac_mbs_tmp=$ac_includes_default
+   ac_includes_default="
+$ac_includes_default
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+"
+   AC_CHECK_TYPE(mbstate_t, int)
+   # Restore the default value.
+   ac_includes_default=$ac_mbs_tmp
+
+   AC_CACHE_CHECK([for mbstate_t object type], ac_cv_type_mbstate_t_object,
     [AC_TRY_COMPILE([
 #if HAVE_STDLIB_H
 # include <stdlib.h>