[libgda] LDAP provider need enable-ldap to true



commit a2708246e9eff32c36baaa7a9509167fc8467a66
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Apr 5 17:22:49 2019 -0600

    LDAP provider need enable-ldap to true

 libgda/meson.build                | 2 +-
 libgda/sqlite/virtual/meson.build | 2 +-
 meson_options.txt                 | 1 +
 providers/meson.build             | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/libgda/meson.build b/libgda/meson.build
index 6fe7ab5b5..efb2f63ac 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -263,7 +263,7 @@ libgda_source_all += [
        ]
 
 ldap_cargs = []
-if ldap_found and get_option('enable-experimental')
+if ldap_found and get_option('enable-ldap') and get_option('enable-experimental')
 ldaph_sources = files ([
        'gda-data-model-ldap.h',
        'gda-tree-mgr-ldap.h'
diff --git a/libgda/sqlite/virtual/meson.build b/libgda/sqlite/virtual/meson.build
index 941e46061..5fc60502d 100644
--- a/libgda/sqlite/virtual/meson.build
+++ b/libgda/sqlite/virtual/meson.build
@@ -23,7 +23,7 @@ libgda_virtual_sources = files(
        )
 libgda_virtual_sources += virtual_headers
 
-if ldap_found and get_option('enable-experimental')
+if ldap_found and get_option('enable-ldap') and get_option('enable-experimental')
 ldaph_virtual = files('gda-ldap-connection.h')
 ldapc_virtual= files('gda-ldap-connection.c')
 libgda_virtual_sources += [
diff --git a/meson_options.txt b/meson_options.txt
index c88958d57..ef1e3a2f9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,3 +16,4 @@ option('glade-catalog-dir', type : 'string', value : '', description : 'Use the
 option('glade-pixmap-dir', type : 'string', value : '', description : 'Use the given directory to install 
glade pixmap files. If glade is not available this option is ignored. If it is not given the valaue from 
pkg-config will be used')
 option('enable-gtk-doc', type : 'boolean', value : false, description : 'Enable documentation generation 
[default = false]')
 option('enable-experimental', type : 'boolean', value : false, description : 'Enable experimental features 
[default = false]')
+option('enable-ldap', type : 'boolean', value : false, description : 'Enable LDAP provider')
diff --git a/providers/meson.build b/providers/meson.build
index 7ffef54d4..57492154e 100644
--- a/providers/meson.build
+++ b/providers/meson.build
@@ -12,7 +12,7 @@ if postgres_dep.found()
 subdir('postgres')
 endif
 
-if ldap_found and get_option('enable-experimental')
+if ldap_found and get_option('enable-ldap') and get_option('enable-experimental')
 subdir('ldap')
 endif
 


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