From 6ebff397515bf153ea95d7e80d21ca9a0f97708d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 11 Jun 2015 02:43:21 +0200 Subject: Improve ACL detection for CMake build Fix hidden visibility in posixacladdons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a0184166..84ceb566d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,11 +243,23 @@ if( HAVE_SYS_TIME_H AND HAVE_TIME_H ) endif( HAVE_SYS_TIME_H AND HAVE_TIME_H ) if( HAVE_SYS_ACL_H ) - set( USE_POSIX_ACL 1 ) + check_include_file( "acl/libacl.h" HAVE_ACL_LIBACL_H ) + if( HAVE_ACL_LIBACL_H ) + check_library_exists( acl acl_init "" HAVE_ACL_INIT ) + if( HAVE_ACL_INIT AND HAVE_SYS_XATTR_H ) + set( USE_POSIX_ACL 1 ) + set( HAVE_NON_POSIX_ACL_EXTENSIONS 1 ) + set( ACL_LIBRARIES acl attr ) + endif( HAVE_ACL_INIT AND HAVE_SYS_XATTR_H ) + else( HAVE_ACL_LIBACL_H ) + check_library_exists( c acl_init "" HAVE_ACL_INIT ) + if( HAVE_ACL_INIT ) + set( USE_POSIX_ACL 1 ) + set( ACL_LIBRARIES c ) + endif( HAVE_ACL_INIT ) + endif( HAVE_ACL_LIBACL_H ) endif( HAVE_SYS_ACL_H ) -check_include_file( "acl/libacl.h" HAVE_NON_POSIX_ACL_EXTENSIONS ) - check_include_file( "valgrind/memcheck.h" HAVE_VALGRIND_MEMCHECK_H ) check_include_file( "values.h" HAVE_VALUES_H ) check_include_file( "X11/extensions/shape.h" HAVE_X11_EXTENSIONS_SHAPE_H ) -- cgit v1.2.3