More merge fixes

This test was missing from the origional merge

diff --git a/aclocal.m4 b/aclocal.m4
index 6e9e49843b3040e89ae66b525a85e5cfb38c0829..7657b3f1161fa16fcb3853ed3fd31c553f81eb2e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -224,10 +224,9 @@ AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
     AC_SUBST(libuuid)
   ])
 
-
-AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
-  [ AC_CHECK_HEADERS([xfs/libxfs.h])
-    if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then
+AC_DEFUN([AC_PACKAGE_NEED_SYS_ACL_H],
+   [ AC_CHECK_HEADERS([sys/acl.h])
+     if test "$ac_cv_header_sys_acl_h" != "yes"; then
         echo
         echo 'FATAL ERROR: sys/acl.h does not exist.'
         echo 'Install the access control lists (acl) development package.'
@@ -262,12 +261,12 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS],
     AC_SUBST(libxfs)
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
-  [ AC_CHECK_LIB(handle, attr_list_by_handle,, [
+AC_DEFUN([AC_PACKAGE_NEED_ACLINIT_LIBACL],
+   [ AC_CHECK_LIB(acl, acl_init,, [
         echo
-        echo 'FATAL ERROR: could not find a current XFS handle library.'
-        echo 'Install or upgrade the XFS library package.'
-        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+        echo 'FATAL ERROR: could not find a valid Access Control List library.'
+        echo 'Install either the libacl (rpm) or the libacl1 (deb) package.'
+        echo 'Alternatively, run "make install-lib" from the acl source.'
         exit 1
     ])
     libacl="-lacl"

diff --git a/src/Makefile b/src/Makefile
index 1860045c709b19b0fc7d87fdb5879dbdf841689d..4b08f6e9309cee24dc3f42329a5f3342024a4bb9 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -45,12 +45,6 @@ TARGETS += $(LINUX_TARGETS)
 endif
 
 ifeq ($(HAVE_DB), true)
-TARGETS = alloc acl_get bstat devzero dirstress fault feature \
-         fill fill2 getpagesize holes xfsctl loggen lstat64 \
-         nametest permname randholes runas truncfile usemem \
-         fstest mmapcat append_reader append_writer \
-         dirperf metaperf
-ifeq ($(ENABLE_DBM), yes)
 TARGETS += dbtest
 endif