conversion to the cmake building system

Signed-off-by: gregory guy <g-gregory@gmx.fr>
(cherry picked from commit 6d8d495faf0a8670d1657ec4dc0fb84f3e3d249a)

3 files changed, 50 insertions, 7 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..09658b9
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,43 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}/tde
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${KRB5_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdeldap (shared)
+
+tde_add_library( tdeldap SHARED AUTOMOC
+
+  SOURCES
+        libtdeldap.cpp
+        ldaplogindlgbase.ui
+        ldaplogindlg.cpp
+        ldappasswddlg.cpp
+  LINK
+     tdeui-shared
+     tdecore-shared
+     tdeio-shared
+     tdesu
+     lber
+     ldap
+     
+  DESTINATION ${LIB_INSTALL_DIR}
+) 
+
+
+##### headers
+
+install(
+    FILES ldappasswddlg.h libtdeldap.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/src/ldaplogindlg.cpp b/src/ldaplogindlg.cpp
index 5a5acd1..458c0d9 100644
--- a/src/ldaplogindlg.cpp
+++ b/src/ldaplogindlg.cpp
@@ -43,4 +43,4 @@ LDAPLogin::~LDAPLogin(){
 	// 
 }
 
-// #include "ldaplogindlg.moc"
+#include "ldaplogindlg.moc"
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index 1e2678c..efd852e 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -50,13 +50,13 @@
 #define LDAP_INSECURE_PORT 389
 #define LDAP_SECURE_PORT 636
 
-// FIXME
-// Connect this to CMake/Automake
+#ifndef KDE_CONFDIR
 #define KDE_CONFDIR "/etc/trinity"
+#endif
 
-// FIXME
-// This assumes Debian!
+#ifndef KRB5_FILE
 #define KRB5_FILE "/etc/krb5.conf"
+#endif
 
 #define NSSWITCH_FILE "/etc/nsswitch.conf"
 
@@ -74,9 +74,9 @@
 #define CRON_UPDATE_NSS_FILE "/etc/cron.daily/upd-local-nss-db"
 #define CRON_UPDATE_NSS_COMMAND "/usr/sbin/nss_updatedb ldap"
 
-// FIXME
-// This assumes Debian!
+#ifndef CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND
 #define CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND "/etc/init.d/slapd force-reload"
+#endif
 
 int requested_ldap_version = LDAP_VERSION3;
 char* ldap_user_and_operational_attributes[2] = {"*", "+"};