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 /tdeio | |
| 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 'tdeio')
| -rw-r--r-- | tdeio/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdeio/tdeio/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tdeio/tdeio/posixacladdons.cpp | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/tdeio/CMakeLists.txt b/tdeio/CMakeLists.txt index 5fa0ded6d..c561e8294 100644 --- a/tdeio/CMakeLists.txt +++ b/tdeio/CMakeLists.txt @@ -55,10 +55,6 @@ if( HAVE_ELFICON ) set( ELFICON_STATIC_LIB tdelficon-static ) endif( HAVE_ELFICON ) -if( HAVE_NON_POSIX_ACL_EXTENSIONS ) - set( ACL_LIBRARIES acl ) -endif( HAVE_NON_POSIX_ACL_EXTENSIONS ) - ##### libtdeio #################################### diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt index b4487db7f..77e122725 100644 --- a/tdeio/tdeio/CMakeLists.txt +++ b/tdeio/tdeio/CMakeLists.txt @@ -49,10 +49,9 @@ install( FILES kremoteencoding.h kmimetypechooser.h DESTINATION ${INCLUDE_INSTALL_DIR} ) -# FIXME seems that ACL is no longer optional -#if( USE_POSIX_ACL ) +if( USE_POSIX_ACL ) install( FILES kacl.h DESTINATION ${INCLUDE_INSTALL_DIR} ) -#endif( USE_POSIX_ACL ) +endif( USE_POSIX_ACL ) install( FILES connection.h slaveinterface.h slave.h slaveconfig.h @@ -111,10 +110,9 @@ set( ${target}_SRCS dataprotocol.cpp ) -# FIXME seems that ACL is no longer optional -#if( USE_POSIX_ACL ) +if( USE_POSIX_ACL ) set( ${target}_SRCS ${${target}_SRCS} kacl.cpp posixacladdons.cpp ) -#endif( USE_POSIX_ACL ) +endif( USE_POSIX_ACL ) tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} diff --git a/tdeio/tdeio/posixacladdons.cpp b/tdeio/tdeio/posixacladdons.cpp index bae51592b..873f1a81e 100644 --- a/tdeio/tdeio/posixacladdons.cpp +++ b/tdeio/tdeio/posixacladdons.cpp @@ -21,6 +21,8 @@ #if defined(USE_POSIX_ACL) && !defined(HAVE_NON_POSIX_ACL_EXTENSIONS) +#include <kdemacros.h> + #include <errno.h> #include <sys/stat.h> @@ -61,7 +63,7 @@ protected: } }; -int acl_cmp(acl_t acl1, acl_t acl2) +KDE_EXPORT int acl_cmp(acl_t acl1, acl_t acl2) { if ( !acl1 || !acl2 ) return -1; @@ -127,7 +129,7 @@ int acl_cmp(acl_t acl1, acl_t acl2) return 0; } -acl_t acl_from_mode(mode_t mode) +KDE_EXPORT acl_t acl_from_mode(mode_t mode) { acl_t newACL = acl_init( 3 ); acl_entry_t entry; @@ -178,7 +180,7 @@ acl_t acl_from_mode(mode_t mode) return newACL; } -int acl_equiv_mode(acl_t acl, mode_t *mode_p) +KDE_EXPORT int acl_equiv_mode(acl_t acl, mode_t *mode_p) { acl_entry_t entry; acl_tag_t tag; |