Permalink
Browse files

FreeBSD: detect ACL and extended attribute support

  • Loading branch information...
pstorz authored and franku committed Oct 10, 2018
1 parent d291e8d commit 0154107d1a87b6484645252948d0507b1ca1621e
Showing with 7 additions and 8 deletions.
  1. +5 −6 core/CMakeLists.txt
  2. +2 −2 core/cmake/BareosCheckIncludes.cmake
View
@@ -484,16 +484,15 @@ set(build_dird "${build-dird}" )
set(build_stored "${build-stored}" )
set(have_plugins "${have_plugins}" )
set(have_afs "" )
#set(have_acl "" )
if(${acl} AND ${ACL_FOUND})
if(${HAVE_SYS_ACL_H})
set(HAVE_ACL 1)
Message(STATUS "acl found: ${ACL_LIBS}")
Message(STATUS "acl found, libs: ${ACL_LIBS}")
endif()
if(${HAVE_SYS_XATTR_H})
if("${HAVE_SYS_XATTR_H}" OR "${HAVE_SYS_EXTATTR_H}")
set(HAVE_XATTR 1)
set(have_xattr ${HAVE_SYS_XATTR_H})
set(have_xattr YES)
endif()
if(${HAVE_RADOS_LIBRADOS_H})
@@ -679,7 +678,7 @@ MESSAGE(" build-dird: ${build_dird} ")
MESSAGE(" build-stored: ${build_stored} ")
MESSAGE(" Plugin support: ${have_plugins} ")
MESSAGE(" AFS support: ${have_afs} ")
MESSAGE(" ACL support: ${acl} ${ACL_FOUND} ${ACL_LIBS}")
MESSAGE(" ACL support: ${HAVE_ACL} ${ACL_LIBS}")
MESSAGE(" XATTR support: ${have_xattr} ")
MESSAGE(" SCSI Crypto support: ${scsi-crypto} ${HAVE_LOWLEVEL_SCSI_INTERFACE} ")
MESSAGE(" GFAPI(GLUSTERFS) support: ${GFAPI_FOUND} ${GFAPI_LIBRARIES} ${GFAPI_INCLUDE_DIRS} ")
@@ -54,7 +54,7 @@ CHECK_INCLUDE_FILES(sys/capability.h HAVE_SYS_CAPABILITY_H)
CHECK_INCLUDE_FILES(sys/dir.h HAVE_SYS_DIR_H)
CHECK_INCLUDE_FILES(sys/dl.h HAVE_SYS_DL_H)
CHECK_INCLUDE_FILES(sys/ea.h HAVE_SYS_EA_H)
CHECK_INCLUDE_FILES(sys/extattr.h HAVE_SYS_EXTATTR_H)
CHECK_INCLUDE_FILES("sys/types.h;sys/extattr.h" HAVE_SYS_EXTATTR_H)
CHECK_INCLUDE_FILES(sys/ioctl.h HAVE_SYS_IOCTL_H)
CHECK_INCLUDE_FILES(sys/mtio.h HAVE_SYS_MTIO_H)
CHECK_INCLUDE_FILES(sys/ndir.h HAVE_SYS_NDIR_H)
@@ -95,7 +95,7 @@ CHECK_INCLUDE_FILES(demangle.h HAVE_DEMANGLE_H)
CHECK_INCLUDE_FILES(fastlzlib.h HAVE_FASTLZLIB_H)
CHECK_INCLUDE_FILES(capability.h HAVE_FASTLZLIB_H)
CHECK_INCLUDE_FILES(sys/acl.h HAVE_ACL_H)
CHECK_INCLUDE_FILES(acl.h HAVE_ACL_H)
CHECK_INCLUDE_FILES(sys/extattr.h HAVE_SYS_EXTATTR_H)
CHECK_INCLUDE_FILES(libutil.h HAVE_LIBUTIL_H)
CHECK_INCLUDE_FILES(sys/ea.h HAVE_SYS_EA_H)

0 comments on commit 0154107

Please sign in to comment.