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.

diff --git a/aclocal.m4 b/aclocal.m4
index fcb244701b2b84a0b4b6d04e61142d3a23c5a802..25664471b86664656ef20e0ef5a35b8217121776 100644 (file)
--- 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 b451d7bf5780346824692cdd7ec0d70265d183ba..6bd24215d843e4894355d93aef43da2b0754713f 100644 (file)
--- 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 3e2f80dca1b88d7bf2b6b19a04afc9723745ddee..4473ed2a356ae03652a98041ac94cd419bd036b7 100644 (file)
--- 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 91db64e987e601ccd654be0d77ce5fdde30e44b7..7630e932366f63501524c3375ae0b5ab8f342fe9 100644 (file)
--- 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
 #