Attempt to link against openldap on Windows, too

Rewrite cmake module to remove special case for Windows.

Added some (commented out) example code to ldapauthenticator as
how we'd need to link against winldap.h, but the implementations
are sufficiently different that it's probably a waste of time.

diff --git a/cmake/FindLdap.cmake b/cmake/FindLdap.cmake
index e29d6a2..2f0c0dd 100644 (file)
--- a/cmake/FindLdap.cmake
+++ b/cmake/FindLdap.cmake
@@ -13,15 +13,16 @@ if(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES)
     set(Ldap_FIND_QUIETLY TRUE)
 endif(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES)
 
-if(UNIX)
-   FIND_PATH(LDAP_INCLUDE_DIR ldap.h)
-   FIND_LIBRARY(LDAP_LIBRARIES NAMES ldap)
-   FIND_LIBRARY(LBER_LIBRARIES NAMES lber)
+#if(UNIX)
+# Attempt to link against ldap.h regardless of platform!
+FIND_PATH(LDAP_INCLUDE_DIR ldap.h)
+FIND_LIBRARY(LDAP_LIBRARIES NAMES ldap)
+FIND_LIBRARY(LBER_LIBRARIES NAMES lber)
 
-else(UNIX)
-   FIND_PATH(LDAP_INCLUDE_DIR winldap.h)
-   FIND_LIBRARY(LDAP_LIBRARIES NAMES wldap32)
-endif(UNIX)
+#else(UNIX)
+#   FIND_PATH(LDAP_INCLUDE_DIR winldap.h)
+#   FIND_LIBRARY(LDAP_LIBRARIES NAMES wldap32)
+#endif(UNIX)
 
 if(LDAP_INCLUDE_DIR AND LDAP_LIBRARIES)
    set(LDAP_FOUND TRUE)

diff --git a/src/core/ldapauthenticator.cpp b/src/core/ldapauthenticator.cpp
index 90b7e89..5b62b89 100644 (file)
--- a/src/core/ldapauthenticator.cpp
+++ b/src/core/ldapauthenticator.cpp
@@ -32,8 +32,14 @@
 #include "network.h"
 #include "quassel.h"
 
-// Link against LDAP.
+/* We should use openldap on windows if at all possible, rather than trying to
+ * write some kind of compatiblity routine.
+#ifdef Q_CC_MSVC
+#include <windows.h>
+#include <winldap.h>
+#else*/
 #include <ldap.h>
+//#endif
 
 LdapAuthenticator::LdapAuthenticator(QObject *parent)
     : Authenticator(parent),

diff --git a/src/core/ldapauthenticator.h b/src/core/ldapauthenticator.h
index a0c8720..2281c68 100644 (file)
--- a/src/core/ldapauthenticator.h
+++ b/src/core/ldapauthenticator.h
@@ -34,7 +34,14 @@
 #include "core.h"
 
 // Link against LDAP.
+/* We should use openldap on windows if at all possible, rather than trying to
+ * write some kind of compatiblity routine.
+#ifdef Q_CC_MSVC
+#include <windows.h>
+#include <winldap.h>
+#else*/
 #include <ldap.h>
+//#endif
 
 // Default LDAP server port.
 #define DEFAULT_LDAP_PORT 389