[libgda: 4/5] Revert "don't build ldap"



commit 2afec3cd63a4b1211a5881b456a76b2f86195643
Author: Shem Pasamba <shemgp yahoo com>
Date:   Tue Oct 29 20:32:09 2019 +0800

    Revert "don't build ldap"
    
    This reverts commit cfb74504aeafc534d4352662f023df52b6b7e4d8.

 meson.build | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/meson.build b/meson.build
index a0d4acdef..b09fd2217 100644
--- a/meson.build
+++ b/meson.build
@@ -145,23 +145,23 @@ libgda_dep += libgda_external_dep
 # LDAP
 ldap_found = false
 ldap_deps = []
-#ldap_lib_dep = compiler.find_library('ldap', required: true)
-#if ldap_lib_dep.found()
-#      ldapber_dep = compiler.find_library('lber')
-#      if compiler.has_header('ldap.h')
-#              ldap_found = true
-#              LIBGDA_LDAP_INC='#include <libgda/gda-data-model-ldap.h>'
-#              LIBGDA_LDAP_INC2='#include <libgda/gda-tree-mgr-ldap.h>'
-#              LIBGDA_LDAP_VINC='#include <virtual/gda-ldap-connection.h>'
-#              LIBGDA_LDAP_TYPE='gda_data_model_ldap_get_type'
-#              LIBGDA_LDAP_TYPE2='gda_ldap_connection_get_type'
-#              LIBGDA_LDAP_TYPE3='gda_tree_mgr_ldap_get_type'
-#              ldap_deps += [
-#                      ldap_lib_dep,
-#                      ldapber_dep
-#                      ]
-#      endif
-#endif
+ldap_lib_dep = compiler.find_library('ldap', required: false)
+if ldap_lib_dep.found()
+       ldapber_dep = compiler.find_library('lber')
+       if compiler.has_header('ldap.h')
+               ldap_found = true
+               LIBGDA_LDAP_INC='#include <libgda/gda-data-model-ldap.h>'
+               LIBGDA_LDAP_INC2='#include <libgda/gda-tree-mgr-ldap.h>'
+               LIBGDA_LDAP_VINC='#include <virtual/gda-ldap-connection.h>'
+               LIBGDA_LDAP_TYPE='gda_data_model_ldap_get_type'
+               LIBGDA_LDAP_TYPE2='gda_ldap_connection_get_type'
+               LIBGDA_LDAP_TYPE3='gda_tree_mgr_ldap_get_type'
+               ldap_deps += [
+                       ldap_lib_dep,
+                       ldapber_dep
+                       ]
+       endif
+endif
 
 tconf = configuration_data() # Empty configuration
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]