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-12-23 02:23:00 +0100 |
| commit | a1d982adfc89dd92a92df49bcfa13a0ef7579ba7 (patch) | |
| tree | e63e35d5ac12f4d5224a29443dc1ad096bb7c799 /kio | |
| parent | fb74d787f16652987a6376ecb77a67d01b7325ff (diff) | |
| download | tdelibs-a1d982adfc89dd92a92df49bcfa13a0ef7579ba7.tar.gz tdelibs-a1d982adfc89dd92a92df49bcfa13a0ef7579ba7.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 'kio')
| -rw-r--r-- | kio/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kio/kio/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | kio/kio/posixacladdons.cpp | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt index 1bb149284..5b4f804cc 100644 --- a/kio/CMakeLists.txt +++ b/kio/CMakeLists.txt @@ -49,10 +49,6 @@ install( FILES renamedlgplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) install( FILES kpasswdserver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install( FILES data.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -if( HAVE_NON_POSIX_ACL_EXTENSIONS ) - set( ACL_LIBRARIES acl ) -endif( HAVE_NON_POSIX_ACL_EXTENSIONS ) - ##### libkio #################################### diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt index f1053b703..dd7d7f7f9 100644 --- a/kio/kio/CMakeLists.txt +++ b/kio/kio/CMakeLists.txt @@ -48,10 +48,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 @@ -110,10 +109,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/kio/kio/posixacladdons.cpp b/kio/kio/posixacladdons.cpp index bae51592b..873f1a81e 100644 --- a/kio/kio/posixacladdons.cpp +++ b/kio/kio/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; |