[evolution/gnome-3-32] eds-I#99 - Fails to build against git master of OpenLDAP (vendor version check)
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-32] eds-I#99 - Fails to build against git master of OpenLDAP (vendor version check)
- Date: Fri, 12 Apr 2019 10:44:24 +0000 (UTC)
commit 0739bd240e80ee1dd29b9261105484b38e99ce78
Author: Дилян Палаузов <dilyan palauzov aegee org>
Date: Fri Apr 12 12:37:39 2019 +0200
eds-I#99 - Fails to build against git master of OpenLDAP (vendor version check)
Related to https://gitlab.gnome.org/GNOME/evolution-data-server/issues/99
cmake/modules/FindLDAP.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/cmake/modules/FindLDAP.cmake b/cmake/modules/FindLDAP.cmake
index abbc3280d7..a98bbba76e 100644
--- a/cmake/modules/FindLDAP.cmake
+++ b/cmake/modules/FindLDAP.cmake
@@ -86,7 +86,8 @@ set(CMAKE_REQUIRED_LIBRARIES "${LDAP_LIBS}")
if(WITH_OPENLDAP)
CHECK_C_SOURCE_COMPILES("#include \"ldap.h\"
int main(void) {
- #if !defined(LDAP_VENDOR_VERSION) || LDAP_VENDOR_VERSION < 20000
+ /* LDAP_VENDOR_VERSION is 0 if OpenLDAP is built from git/master */
+ #if !defined(LDAP_VENDOR_VERSION) || (LDAP_VENDOR_VERSION != 0 &&
LDAP_VENDOR_VERSION < 20000)
#error OpenLDAP version not at least 2.0
#endif
return 0; }" openldap_2_x)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]