[libgda] Meson: fix GIR generation with LDAP provider

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 4703a470a6afca0b353b10fe426fc2e2a0047dae
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jul 13 20:23:53 2018 -0500

    Meson: fix GIR generation with LDAP provider
    
    LDAP provider is re-enable.

 libgda/meson.build                | 33 ++++++++++++++++++---------------
 libgda/sqlite/virtual/meson.build | 16 ++++++++--------
 providers/meson.build             |  6 +++---
 3 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/libgda/meson.build b/libgda/meson.build
index c4ccd05c4..36def3ef8 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -224,21 +224,21 @@ libgda_source_all += [
        ]
 
 ldap_cargs = []
-# if ldap_found
-# ldaph_sources = files ([
-#      'gda-data-model-ldap.h',
-#      'gda-tree-mgr-ldap.h'
-#      ])
-# libgda_headers_all += ldaph_sources
-# ldapc_sources = files ([
-#      'gda-data-model-ldap.c',
-#      'gda-tree-mgr-ldap.c'
-#      ])
-# libgda_source_all += ldapc_sources
-# ldap_cargs += [
-#      '-DHAVE_LDAP'
-#      ]
-# endif
+if ldap_found
+ldaph_sources = files ([
+       'gda-data-model-ldap.h',
+       'gda-tree-mgr-ldap.h'
+       ])
+libgda_headers_all += ldaph_sources
+ldapc_sources = files ([
+       'gda-data-model-ldap.c',
+       'gda-tree-mgr-ldap.c'
+       ])
+libgda_source_all += ldapc_sources
+ldap_cargs += [
+       '-DHAVE_LDAP'
+       ]
+endif
 
 inc_sqliteh = include_directories ('sqlite')
 inc_sqliteh_dep = declare_dependency (include_directories : inc_sqliteh)
@@ -296,6 +296,9 @@ libgda_gir = gnome_module.generate_gir(libgda,
        identifier_prefix: 'Gda',
        nsversion: project_api_version,
        header: 'libgda/libgda.h',
+       dependencies : [
+               libgda_dep,
+               ],
        includes: [
                'GLib-2.0',
                'GObject-2.0',
diff --git a/libgda/sqlite/virtual/meson.build b/libgda/sqlite/virtual/meson.build
index 569619e4e..8ca89eaf1 100644
--- a/libgda/sqlite/virtual/meson.build
+++ b/libgda/sqlite/virtual/meson.build
@@ -27,11 +27,11 @@ libgda_virtual_sources = files(
        )
 libgda_virtual_sources += virtual_headers
 
-# if ldap_found
-# ldaph_virtual = files('gda-ldap-connection.h')
-# ldapc_virtual= files('gda-ldap-connection.c')
-# libgda_virtual_sources += [
-#      ldaph_virtual,
-#      ldapc_virtual
-#      ]
-# endif
+if ldap_found
+ldaph_virtual = files('gda-ldap-connection.h')
+ldapc_virtual= files('gda-ldap-connection.c')
+libgda_virtual_sources += [
+       ldaph_virtual,
+       ldapc_virtual
+       ]
+endif
diff --git a/providers/meson.build b/providers/meson.build
index 5d784b39d..3e29ad470 100644
--- a/providers/meson.build
+++ b/providers/meson.build
@@ -8,6 +8,6 @@ if postgres_dep.found()
 subdir('postgres')
 endif
 
-# if ldap_found
-# subdir('ldap')
-# endif
\ No newline at end of file
+if ldap_found
+subdir('ldap')
+endif
\ No newline at end of file