sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

build: Make --with-gpgme the default

Browse Source 
Those wishing to build without gpgme support need simply to build --without-gpgme

This In general, we prefer that optional libraries be required by default
so that they are not accidentially missed, particularly in packages.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2018-05-10 13:05:56 +12:00
parent 78c8e699a8
commit aced401728
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/dsdb/samdb/ldb_modules/wscript
View File

@ -7,7 +7,7 @@ def set_options(opt):
help += "This requires gpgme devel and python packages "
help += "(e.g. libgpgme11-dev, python-gpgme on debian/ubuntu)."
opt.SAMBA3_ADD_OPTION('gpgme', default=None, help=(help))
opt.SAMBA3_ADD_OPTION('gpgme', default=True, help=(help))
return
@ -24,7 +24,8 @@ def configure(conf):
conf.SET_TARGET_TYPE('gpgme', 'EMPTY')
if Options.options.with_gpgme != False:
if not Options.options.without_ad_dc \
and Options.options.with_gpgme != False:
conf.find_program('gpgme-config', var='GPGME_CONFIG')
if conf.env.GPGME_CONFIG:
@ -36,7 +37,11 @@ def configure(conf):
conf.DEFINE('ENABLE_GPGME', '1')
if not conf.CONFIG_SET('ENABLE_GPGME'):
if Options.options.with_gpgme == True:
conf.fatal('GPGME support requested, but no suitable GPGME library found, eg libgpgme11-dev and python-gpgme')
else:
Logs.warn('no suitable GPGME library found')
conf.fatal("GPGME support not found. "
"Try installing libgpgme11-dev or gpgme-devel "
"and python-gpgme. "
"Otherwise, use --without-gpgme to build without "
"GPGME support or --without-ad-dc to build without "
"the Samba AD DC. "
"GPGME support is required for the GPG encrypted "
"password sync feature")