xfstests: check for dmapi headers

Merge of master-melb:xfs-cmds:32507a by kenmcd.

  xfstests: check for dmapi headers

diff --git a/Makefile b/Makefile
index 0a0fc27939f535ecc758f91c62eaf2762c385409..39e5290679542e371c84f4da120d4d91b7585f15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,10 @@ else
        $(SUBDIRS_MAKERULE)
        # automake doesn't always support "default" target 
        # so do dmapi make explicitly with "all"
+ifeq ($(HAVE_DMAPI), true)
        cd $(TOPDIR)/dmapi; make all
 endif
+endif
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(BUILDRULES)

diff --git a/aclocal.m4 b/aclocal.m4
index dd65e1cd5fb75b0b4934792429e9dad26201ab6d..c90451afc7f6cd64421cd33cab8e402da10326e8 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -99,6 +99,11 @@ AC_DEFUN([AC_PACKAGE_WANT_AIO],
     AC_SUBST(have_aio)
   ])
 
+AC_DEFUN([AC_PACKAGE_WANT_DMAPI],
+  [ AC_CHECK_HEADERS(sys/dmapi/dmapi.h, [ have_dmapi=true ], [ have_dmapi=false ])
+    AC_SUBST(have_dmapi)
+  ])
+
 AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
   [ AC_CHECK_HEADERS([attr/xattr.h])
     if test "$ac_cv_header_attr_xattr_h" != "yes"; then

diff --git a/configure.in b/configure.in
index 0c1656bdcca7048f3bef193d1929e3f6d47583ef..32a2496bd83889bfdbbb9f442ef9d2facb7c2f9c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,7 @@ in
 
                AC_PACKAGE_WANT_GDBM
                AC_PACKAGE_WANT_AIO
+               AC_PACKAGE_WANT_DMAPI
                ;;
 esac
 

diff --git a/include/builddefs.in b/include/builddefs.in
index 1449aac69e2dfa41284f4c739cb628a3af4a7ea7..ae8c608e3b477025e59c89fdf47887c936572fbe 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -50,6 +50,7 @@ RPM_VERSION     = @rpm_version@
 ENABLE_SHARED = @enable_shared@
 HAVE_DB = @have_db@
 HAVE_AIO = @have_aio@
+HAVE_DMAPI = @have_dmapi@
 HAVE_ATTR_LIST = @have_attr_list@
 
 GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall