diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-06-11 02:43:21 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-06-11 03:03:58 +0200 |
| commit | 182f65f09936303344d9d154a38ab2c752807dfa (patch) | |
| tree | 7658a8d93c2b33b34e9c2f4fce5c46f74d6649fc /CMakeLists.txt | |
| parent | 54c9be2c4c38ef1e71db866bb67310e2c2511ee0 (diff) | |
| download | tdelibs-182f65f09936303344d9d154a38ab2c752807dfa.tar.gz tdelibs-182f65f09936303344d9d154a38ab2c752807dfa.zip | |
Improve ACL detection for CMake build
Fix hidden visibility in posixacladdons
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6ebff397515bf153ea95d7e80d21ca9a0f97708d)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 15 insertions, 3 deletions
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 ) |