summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Naujok <bnaujok@sgi.com>2008-11-20 14:22:49 +0000
committerBarry Naujok <bnaujok@sgi.com>2008-11-20 14:22:49 +0000
commit2ccda108c474caf58c5d7ebf090af072795df0c0 (patch)
tree16e783f22cadc465a989fa1998b47b66e99c49c0
parentdc4bae27a448ed6f02a354e33feabb40dc5dc7f9 (diff)
xfstests: check for dmapi headers
Merge of master-melb:xfs-cmds:32507a by kenmcd. xfstests: check for dmapi headers
-rw-r--r--Makefile2
-rw-r--r--aclocal.m45
-rw-r--r--configure.in1
-rw-r--r--include/builddefs.in1
4 files changed, 9 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 0a0fc279..39e52906 100644
--- 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 dd65e1cd..c90451af 100644
--- 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 0c1656bd..32a2496b 100644
--- 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 1449aac6..ae8c608e 100644
--- 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