[Opensync-commits] r5994 - in plugins/ldap-sync: . src

[<svn...@op...>]

Author: scriptor
Date: Sun Jan 10 19:26:33 2010
New Revision: 5994
URL: http://www.opensync.org/changeset/5994

Log:
- Better distinction between libldap from openldap and libldap60 from
  the Mozilla LDAP C SDK in the build process.
- New file ldap_ssl.c added to the build process.
- Small fix in the CMakeLists.txt when libsasl2 has not been found.

Modified:
   plugins/ldap-sync/CMakeLists.txt
   plugins/ldap-sync/src/CMakeLists.txt

Modified: plugins/ldap-sync/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/CMakeLists.txt	Sun Jan 10 19:03:23 2010	(r5993)
+++ plugins/ldap-sync/CMakeLists.txt	Sun Jan 10 19:26:33 2010	(r5994)
@@ -398,10 +398,10 @@
 MESSAGE(STATUS "LDAP_PLUGIN_OPENSYNC_SCHEMASDIR = ${LDAP_PLUGIN_OPENSYNC_SCHEMASDIR}")
 
 IF ( USE_OPENLDAP )
-	MESSAGE (STATUS "libldap from openldap will be used.")
+	MESSAGE (STATUS "The LDAP plugin will be linked against libldap from openldap ( http://www.openldap.org/ ).")
 ELSE ( USE_OPENLDAP )
 	IF ( USE_MOZLDAP )
-		MESSAGE (STATUS "libldap60 from Mozilla will be used.")
+		MESSAGE (STATUS "The LDAP plugin will be linked against libldap60 from the Mozilla LDAP C SDK ( http://www.mozilla.org/directory/csdk.html ).")
 	ELSE ( USE_MOZLDAP )
 		MESSAGE (FATAL_ERROR "Neither libldap from openldap nor libldap60 from Mozilla has been chosen.  This is not possible.  The LDAP plugin requires either of these libraries.")
 	ENDIF ( USE_MOZLDAP )

Modified: plugins/ldap-sync/src/CMakeLists.txt
==============================================================================
--- plugins/ldap-sync/src/CMakeLists.txt	Sun Jan 10 19:03:23 2010	(r5993)
+++ plugins/ldap-sync/src/CMakeLists.txt	Sun Jan 10 19:26:33 2010	(r5994)
@@ -41,12 +41,18 @@
 	MESSAGE( STATUS "_LDAP_LIBRARIES = \"${_LDAP_LIBRARIES}\"" )
 ENDIF ( NOT _LDAP_LIBRARIES )
 
-LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARY_DIRS} ${_LDAP_LIBRARY_DIRS} ${SASL2_LIBRARY_DIRS} ${GSSAPIV2_LIBRARY_DIRS})
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ${_LDAP_INCLUDE_DIRS} ${SASL2_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
+IF (LIBSASL2_FOUND)
+	LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARY_DIRS} ${_LDAP_LIBRARY_DIRS} ${SASL2_LIBRARY_DIRS} ${GSSAPIV2_LIBRARY_DIRS})
+	INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ${_LDAP_INCLUDE_DIRS} ${SASL2_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
+ELSE (LIBSASL2_FOUND)
+	LINK_DIRECTORIES( ${OPENSYNC_LIBRARY_DIRS} ${GLIB2_LIBRARY_DIRS} ${LIBXML2_LIBRARY_DIRS} ${LIBXSLT_LIBRARY_DIRS} ${_LDAP_LIBRARY_DIRS} ${GSSAPIV2_LIBRARY_DIRS})
+	INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${OPENSYNC_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${LIBXSLT_INCLUDE_DIRS} ${_LDAP_INCLUDE_DIRS} ${GSSAPIV2_INCLUDE_DIRS})
+ENDIF (LIBSASL2_FOUND)
+
 INCLUDE( Compiler )
 
 
-OPENSYNC_PLUGIN_ADD( ldap-sync ldap_plugin.c ldap_connect.c ldap_sasl.c ldap_debug.c)
+OPENSYNC_PLUGIN_ADD( ldap-sync ldap_plugin.c ldap_connect.c ldap_sasl.c ldap_ssl.c ldap_debug.c)
 OPENSYNC_FORMAT_ADD( ldap-format ldap_format.c ldap_debug.c)