diff options
| author | Christof Schmitt <cs@samba.org> | 2018-07-10 14:51:02 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-07-11 05:18:59 +0200 |
| commit | 5c58ccba71022e165b2617674a1225ec9b960183 (patch) | |
| tree | 31c25724ac2675664f5ed88f714d313660b65c07 /buildtools | |
| parent | 0940f8560fc67caf79c1b4090bf6cbfc644ddc93 (diff) | |
| download | samba-5c58ccba71022e165b2617674a1225ec9b960183.tar.gz | |
wscript: Add --with-system-heimdalkrb5
Add the configure option --with-system-heimdalkrb5 to build Samba
explicitly with a system Heimdal kerberos library. This does the same as
the more complicated syntax
--bundled-libraries='!heimdal,!asn1,!com_err,!roken,!hx509,!wind,!gssapi,!hcrypto,!krb5,!heimbase,!asn1_compile,!compile_et,!kdc,!hdb,!heimntlm'
and it also enforces the conflicts with MIT Kerbros and the AD DC
build.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jul 11 05:18:59 CEST 2018 on sn-devel-144
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_bundled.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wscript | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py index aa6199e64ad..253d604fd97 100644 --- a/buildtools/wafsamba/samba_bundled.py +++ b/buildtools/wafsamba/samba_bundled.py @@ -85,6 +85,8 @@ def minimum_library_version(conf, libname, default): @conf def LIB_MAY_BE_BUNDLED(conf, libname): + if libname in conf.env.SYSTEM_LIBS: + return False if libname in conf.env.BUNDLED_LIBS: return True if '!%s' % libname in conf.env.BUNDLED_LIBS: diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript index 1567c4bb537..0eef3304faa 100644 --- a/buildtools/wafsamba/wscript +++ b/buildtools/wafsamba/wscript @@ -269,6 +269,7 @@ def configure(conf): conf.env.MODULESDIR = Options.options.MODULESDIR conf.env.PRIVATELIBDIR = Options.options.PRIVATELIBDIR conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',') + conf.env.SYSTEM_LIBS = () conf.env.PRIVATE_LIBS = Options.options.PRIVATE_LIBS.split(',') conf.env.BUILTIN_LIBRARIES = Options.options.BUILTIN_LIBRARIES.split(',') conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',') |