From 7413a3b282f55aba9692068d2e7add59f0e7a414 Mon Sep 17 00:00:00 2001
From: Tim Shimmin <tes@sgi.com>
Date: Fri, 9 Mar 2007 05:16:22 +0000
Subject: [PATCH] Need to check for __u32 in our own m4 macro instead of using
 AC_CHECK_TYPES which doesn't exist on some older autoconf's. Merge of
 master-melb:xfs-cmds:28226a by kenmcd.

  Need to check for __u32 in our own m4 macro instead of using AC_CHECK_TYPES
  which doesn't exist on some older autoconf's.
---
 aclocal.m4          | 14 ++++++++++++++
 configure.in        |  2 +-
 doc/CHANGES         |  4 ++++
 m4/package_types.m4 | 14 ++++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index fcb244701..25664471b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -306,6 +306,20 @@ AC_DEFUN([AC_TYPE_PSUNSIGNED],
     ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
   ])
 
+# 
+# Check if we have a type for __u32
+# 
+AC_DEFUN([AC_TYPE_U32],
+  [ AC_MSG_CHECKING([for __u32 ])
+    AC_TRY_COMPILE([
+#include <asm/types.h>
+#include <stdlib.h>
+#include <stddef.h>
+    ], [
+         __u32  u32;
+    ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+  ])
+
 # 
 # Check type sizes
 # 
diff --git a/configure.in b/configure.in
index b451d7bf5..6bd24215d 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,7 @@ AC_HAVE_GETMNTINFO
 
 AC_TYPE_PSINT
 AC_TYPE_PSUNSIGNED
-AC_CHECK_TYPES(__u32,,,[#include <asm/types.h>])
+AC_TYPE_U32
 AC_SIZEOF_POINTERS_AND_LONG
 AC_MANUAL_FORMAT
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 3e2f80dca..4473ed2a3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,10 @@
 xfsprogs-2.8.XX
 	- Fix xfs_quota gracetime reporting.
 	  Thanks to Utako Kusaka <utako@tnes.nec.co.jp> for this.
+	- Instead of using AC_CHECK_TYPES which isn't supported for
+	  older versions of autoconf, add our own type check in the
+	  m4/package_types.m4 file for __u32.
+	  Suggested by Nathan Scott and discovered by wookey@aleph1.co.uk.
 
 xfsprogs-2.8.19 (31 January 2007)
 	- Fix pthread stack size setting in xfs_repair.
diff --git a/m4/package_types.m4 b/m4/package_types.m4
index 91db64e98..7630e9323 100644
--- a/m4/package_types.m4
+++ b/m4/package_types.m4
@@ -26,6 +26,20 @@ AC_DEFUN([AC_TYPE_PSUNSIGNED],
     ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
   ])
 
+# 
+# Check if we have a type for __u32
+# 
+AC_DEFUN([AC_TYPE_U32],
+  [ AC_MSG_CHECKING([for __u32 ])
+    AC_TRY_COMPILE([
+#include <asm/types.h>
+#include <stdlib.h>
+#include <stddef.h>
+    ], [
+         __u32  u32;
+    ], AC_DEFINE(HAVE___U32_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
+  ])
+
 # 
 # Check type sizes
 # 
-- 
2.47.2