summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-03-13 12:27:48 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-03-13 12:27:48 +0000
commit3f8943dc55dda548298a7514e47ac4649b92e937 (patch)
treeb850eb9d301cfc33d293f1b852b3f41f7c97c312
parent64f8fc7f84d8771888cdee6ac412fa21f8e5320a (diff)
downloadtdebase-3f8943dc.tar.gz
tdebase-3f8943dc.zip
[kdebase] added samba and ldap support
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1224685 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kcontrol/CMakeLists.txt2
-rw-r--r--kcontrol/samba/CMakeLists.txt36
-rw-r--r--kioslave/CMakeLists.txt6
-rw-r--r--kioslave/ldap/CMakeLists.txt37
-rw-r--r--kioslave/ldap/ConfigureChecks.cmake21
-rw-r--r--kioslave/smb/CMakeLists.txt42
-rw-r--r--kioslave/smb/ConfigureChecks.cmake21
7 files changed, 160 insertions, 5 deletions
diff --git a/kcontrol/CMakeLists.txt b/kcontrol/CMakeLists.txt
index 9362653f2..0bd7f3706 100644
--- a/kcontrol/CMakeLists.txt
+++ b/kcontrol/CMakeLists.txt
@@ -27,7 +27,6 @@ if( BUILD_KCONTROL )
add_subdirectory( bell )
add_subdirectory( dnssd )
add_subdirectory( filetypes )
- # add_subdirectory( samba )
add_subdirectory( krdb )
add_subdirectory( input )
add_subdirectory( kicker )
@@ -67,6 +66,7 @@ if( BUILD_KCONTROL )
add_subdirectory( kfontinst )
add_subdirectory( access )
+ tde_conditional_add_subdirectory( WITH_SAMBA samba )
tde_conditional_add_subdirectory( WITH_XRANDR randr )
tde_conditional_add_subdirectory( WITH_LIBRAW1394 view1394 )
diff --git a/kcontrol/samba/CMakeLists.txt b/kcontrol/samba/CMakeLists.txt
new file mode 100644
index 000000000..1358e0d53
--- /dev/null
+++ b/kcontrol/samba/CMakeLists.txt
@@ -0,0 +1,36 @@
+#################################################
+#
+# (C) 2010-2011 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES smbstatus.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+
+
+##### kcm_samba (module) ########################
+
+tde_add_kpart( kcm_samba AUTOMOC
+ SOURCES
+ main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp
+ kcmsambastatistics.cpp
+ LINK kio-shared
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/kioslave/CMakeLists.txt b/kioslave/CMakeLists.txt
index 79ba1f9b9..56b05c852 100644
--- a/kioslave/CMakeLists.txt
+++ b/kioslave/CMakeLists.txt
@@ -11,8 +11,6 @@
include( ConfigureChecks.cmake )
-# FIXME no LDAP and SAMBA support yet
-
add_subdirectory( about )
add_subdirectory( cgi )
add_subdirectory( floppy )
@@ -35,5 +33,5 @@ add_subdirectory( media )
add_subdirectory( remote )
add_subdirectory( home )
add_subdirectory( system )
-# tde_conditional_add_subdirectory( WITH_LDAP ldap )
-# tde_conditional_add_subdirectory( WITH_SAMBA smb )
+tde_conditional_add_subdirectory( WITH_LDAP ldap )
+tde_conditional_add_subdirectory( WITH_SAMBA smb )
diff --git a/kioslave/ldap/CMakeLists.txt b/kioslave/ldap/CMakeLists.txt
new file mode 100644
index 000000000..ebf162205
--- /dev/null
+++ b/kioslave/ldap/CMakeLists.txt
@@ -0,0 +1,37 @@
+#################################################
+#
+# (C) 2010-2011 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include( ConfigureChecks.cmake )
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES ldap.protocol ldaps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+
+
+##### kio_ldap (module) #########################
+
+tde_add_kpart( kio_ldap AUTOMOC
+ SOURCES kio_ldap.cpp
+ LINK kabc-shared ${LDAP_LIBRARIES}
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/kioslave/ldap/ConfigureChecks.cmake b/kioslave/ldap/ConfigureChecks.cmake
new file mode 100644
index 000000000..9515a3d69
--- /dev/null
+++ b/kioslave/ldap/ConfigureChecks.cmake
@@ -0,0 +1,21 @@
+#################################################
+#
+# (C) 2010-2011 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+check_include_file( ldap.h HAVE_LDAP_H )
+
+if( HAVE_LDAP_H )
+ set( LDAP_LIBRARIES ldap )
+ check_library_exists( ${LDAP_LIBRARIES} ldap_initialize "" HAVE_LDAP )
+endif( )
+
+if( NOT HAVE_LDAP_H OR NOT HAVE_LDAP )
+ tde_message_fatal( "ldap is requested, but was not found on your system." )
+endif( )
diff --git a/kioslave/smb/CMakeLists.txt b/kioslave/smb/CMakeLists.txt
new file mode 100644
index 000000000..c13277939
--- /dev/null
+++ b/kioslave/smb/CMakeLists.txt
@@ -0,0 +1,42 @@
+#################################################
+#
+# (C) 2010-2011 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+include( ConfigureChecks.cmake )
+
+include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+)
+
+
+##### other data ################################
+
+install( FILES smb.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES smb-network.desktop DESTINATION ${DATA_INSTALL_DIR}/konqueror/dirtree/remote )
+install( FILES smb-network.desktop DESTINATION ${DATA_INSTALL_DIR}/remoteview )
+install( FILES x-smb-workgroup.desktop x-smb-server.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
+
+
+##### kio_smb (module) ##########################
+
+tde_add_kpart( kio_smb AUTOMOC
+ SOURCES
+ kio_smb.cpp kio_smb_auth.cpp kio_smb_browse.cpp kio_smb_config.cpp
+ kio_smb_dir.cpp kio_smb_file.cpp kio_smb_internal.cpp kio_smb_mount.cpp
+ LINK kio-shared ${SMBCLIENT_LIBRARIES}
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/kioslave/smb/ConfigureChecks.cmake b/kioslave/smb/ConfigureChecks.cmake
new file mode 100644
index 000000000..878682394
--- /dev/null
+++ b/kioslave/smb/ConfigureChecks.cmake
@@ -0,0 +1,21 @@
+#################################################
+#
+# (C) 2010-2011 Serghei Amelian
+# serghei (DOT) amelian (AT) gmail.com
+#
+# Improvements and feedback are welcome
+#
+# This file is released under GPL >= 2
+#
+#################################################
+
+check_include_file( libsmbclient.h HAVE_LIBSMBCLIENT_H )
+
+if( HAVE_LIBSMBCLIENT_H )
+ set( SMBCLIENT_LIBRARIES smbclient )
+ check_library_exists( ${SMBCLIENT_LIBRARIES} smbc_new_context "" HAVE_SMBCLIENT )
+endif( )
+
+if( NOT HAVE_LIBSMBCLIENT_H OR NOT HAVE_SMBCLIENT )
+ tde_message_fatal( "smbclient is requested, but was not found on your system." )
+endif( )