X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=m4%2Fmbstate_t.m4;h=ac47f11b2504931b91db8c65ddd0184e3b4128d9;hb=12d0cc62bb2f9068794bbf8b1c210490bd07479a;hp=4cbbfd5b822fb564baa65fc9d03459cbc98c1e2f;hpb=0b9f42e41ad0e7d51e8885740274ce2a2d4eed04;p=chaz%2Ftar

diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4
index 4cbbfd5..ac47f11 100644
--- a/m4/mbstate_t.m4
+++ b/m4/mbstate_t.m4
@@ -1,4 +1,4 @@
-# serial 1
+# serial 6
 
 # From Paul Eggert.
 
@@ -6,13 +6,38 @@
 # so you can't declare an object of that type.
 # Check for this incompatibility with Standard C.
 
+# Include stdlib.h first, because otherwise this test would fail on Linux
+# (at least glibc-2.1.3) because the `_XOPEN_SOURCE 500' definition elicits
+# 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,
-    [AC_TRY_COMPILE([#include <wchar.h>],
+  [
+   AC_CHECK_HEADERS(stdlib.h)
+
+   AC_CACHE_CHECK([for mbstate_t object], ac_cv_type_mbstate_t_object,
+    [AC_TRY_COMPILE([
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#include <wchar.h>],
       [mbstate_t x; return sizeof x;],
       ac_cv_type_mbstate_t_object=yes,
       ac_cv_type_mbstate_t_object=no)])
    if test $ac_cv_type_mbstate_t_object = yes; then
      AC_DEFINE(HAVE_MBSTATE_T_OBJECT, 1,
 	       [Define if mbstate_t is an object type.])
+   else
+     AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
+      [AC_TRY_COMPILE([
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#include <wchar.h>],
+	[mbstate_t *x; return sizeof x;],
+	ac_cv_type_mbstate_t=yes,
+	ac_cv_type_mbstate_t=no)])
+     if test $ac_cv_type_mbstate_t != yes; then
+       AC_DEFINE(mbstate_t, int,
+		 [Define to int if <wchar.h> does not define.])
+     fi
    fi])