Merge of xfs-cmds-2.4.18:slinx:111140a by nathans.

minor changes to xfstests as we transition to new EA/ACL interfaces.
This commit is contained in:
Nathan Scott
2002-02-25 22:12:17 +00:00
parent 04cbb967db
commit 958b881b08
14 changed files with 129 additions and 171 deletions
+15 -8
View File
@@ -152,14 +152,14 @@ AC_SUBST(libxfs)
AC_SUBST(libhdl)
dnl Checks for Extended Attributes header and library.
AC_CHECK_HEADER(attr/attributes.h,, [
AC_CHECK_HEADER(attr/xattr.h,, [
echo
echo 'FATAL ERROR: could not find a valid Extended Attributes header.'
echo 'Install either the attr-devel (rpm) or the attr-dev (deb) package.'
echo 'Alternatively, run "make install-dev" from the attr source.'
exit 1
])
AC_CHECK_LIB(attr, attr_get,, [
AC_CHECK_LIB(attr, getxattr,, [
echo
echo 'FATAL ERROR: could not find a valid Extended Attributes library.'
echo 'Install either the attr-devel (rpm) or the attr-dev (deb) package.'
@@ -169,19 +169,26 @@ AC_CHECK_LIB(attr, attr_get,, [
libattr="-lattr"
AC_SUBST(libattr)
dnl Checks for Access Control List header and library.
dnl Checks for Access Control List headers and library.
AC_CHECK_HEADER(sys/acl.h,, [
echo
echo 'FATAL ERROR: could not find a valid Access Control List header.'
echo 'Install either the acl-devel (rpm) or the acl-dev (deb) package.'
echo 'Alternatively, run "make install-dev" from the acl source.'
echo 'FATAL ERROR: could not find a valid Access Control List headers.'
echo 'Install either the acl-devel (rpm) or the acl (deb) package.'
echo 'Alternatively, run "make install" from the acl source.'
exit 1
])
AC_CHECK_HEADER(acl/libacl.h,, [
echo
echo 'FATAL ERROR: could not find a valid Access Control List headers.'
echo 'Install either the acl-devel (rpm) or the acl (deb) package.'
echo 'Alternatively, run "make install" from the acl source.'
exit 1
])
AC_CHECK_LIB(acl, acl_init,, [
echo
echo 'FATAL ERROR: could not find a valid Access Control List library.'
echo 'Install either the acl-devel (rpm) or the acl-dev (deb) package.'
echo 'Alternatively, run "make install-dev" from the acl source.'
echo 'Install either the acl-devel (rpm) or the acl (deb) package.'
echo 'Alternatively, run "make install" from the acl source.'
exit 1
])
libacl="-lacl"