Fixed merge problems

[xfstests-dev.git] / configure.in

diff --git a/configure.in b/configure.in
index 56150c99d848a192301445fb17bef69e86ac7441..e3cf4b5810547d7cfaf55b211ce6676fc51ed9ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,20 +2,61 @@ AC_INIT(src/xfsctl.c)
 AC_PACKAGE_GLOBALS(xfstests)
 AC_PACKAGE_UTILITIES(xfstests)
 
-AC_PACKAGE_NEED_UUID_H
+AC_HEADER_STDC
+    AC_CHECK_HEADERS([ assert.h                \
+                       bstring.h               \
+                       libgen.h                \
+                       dirent.h                \
+                       errno.h                 \
+                       malloc.h                \
+                       uuid.h                  \
+                       uuid/uuid.h             \
+                       sys/uuid.h              \
+                       sys/file.h              \
+                       sys/fcntl.h             \
+                       sys/syssgi.h            \
+                       sys/param.h             \
+                       sys/stat.h              \
+                       sys/statvfs.h           \
+                       sys/time.h              \
+                       sys/ioctl.h             \
+                       sys/wait.h              \
+                       sys/types.h             \
+                       strings.h               \
+                       err.h
+    ])
+    AC_CHECK_HEADERS([ sys/fs/xfs_fsops.h      \
+                       sys/fs/xfs_itable.h     \
+                       xfs/platform_defs.h     \
+    ])
+
 AC_PACKAGE_NEED_UUIDCOMPARE
 
-AC_PACKAGE_NEED_XFS_LIBXFS_H
-AC_PACKAGE_NEED_XFSCTL_MACRO
-AC_PACKAGE_NEED_XFS_HANDLE_H
-AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
+case $pkg_platform
+in
+       irix)
+               AC_PACKAGE_NEED_SYS_ACL_H
+               AC_PACKAGE_NEED_ATTRIBUTES_H
+               AC_PACKAGE_WANT_NDBM
+               ;;
+       *)
+               AC_PACKAGE_NEED_XFS_LIBXFS_H
+               AC_PACKAGE_NEED_XFS_XQM_H
+               AC_PACKAGE_NEED_XFSCTL_MACRO
+               AC_PACKAGE_NEED_XFS_HANDLE_H
+
+               AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
+               AC_PACKAGE_NEED_ATTR_XATTR_H
+               AC_PACKAGE_NEED_ATTRIBUTES_H
+               AC_PACKAGE_NEED_GETXATTR_LIBATTR
 
-AC_PACKAGE_NEED_ATTR_XATTR_H
-AC_PACKAGE_NEED_GETXATTR_LIBATTR
-AC_PACKAGE_NEED_SYS_ACL_H
-AC_PACKAGE_NEED_ACL_LIBACL_H
-AC_PACKAGE_NEED_ACLINIT_LIBACL
+               AC_PACKAGE_NEED_SYS_ACL_H
+               AC_PACKAGE_NEED_ACL_LIBACL_H
+               AC_PACKAGE_NEED_ACLINIT_LIBACL
 
-AC_PACKAGE_WANT_LIBGDBM
+               AC_PACKAGE_WANT_GDBM
+               ;;
+esac
 
+AC_CONFIG_HEADER(include/config.h)
 AC_OUTPUT(include/builddefs)