def CHECK_SOCKET_WRAPPER(conf):
return conf.CHECK_BUNDLED_SYSTEM_PKG('socket_wrapper', minversion='1.1.7')
Build.BuildContext.CHECK_SOCKET_WRAPPER = CHECK_SOCKET_WRAPPER
+
+@conf
+def CHECK_NSS_WRAPPER(conf):
+ return conf.CHECK_BUNDLED_SYSTEM_PKG('nss_wrapper', minversion='1.1.3')
+Build.BuildContext.CHECK_NSS_WRAPPER = CHECK_NSS_WRAPPER
compression - Various compression algorithms (MSZIP, lzxpress)
dnspython - Python module for working with DNS.
-nss_wrapper - Wrapper for the user and group NSS API allowing the use
- of other data sources.
popt - Command-line option parsing library
replace - Provides replacements for standard (POSIX, C99) functions
not provided by the host platform.
my $conffile="$libdir/server.conf";
my $dfqconffile="$libdir/dfq.conf";
- my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/lib/nss_wrapper/nss_wrapper.pl";
+ my $nss_wrapper_pl = "$ENV{PERL} $self->{srcdir}/third_party/nss_wrapper/nss_wrapper.pl";
my $nss_wrapper_passwd = "$privatedir/passwd";
my $nss_wrapper_group = "$privatedir/group";
my $nss_wrapper_hosts = "$ENV{SELFTEST_PREFIX}/hosts";
VERSION="1.1.3"
def configure(conf):
- if conf.CHECK_BUNDLED_SYSTEM('nss_wrapper', minversion=VERSION, set_target=False):
+ if conf.CHECK_NSS_WRAPPER():
conf.DEFINE('USING_SYSTEM_NSS_WRAPPER', 1)
libnss_wrapper_so_path = 'libnss_wrapper.so'
else:
# Create full path to nss_wrapper
blddir = os.path.realpath(conf.blddir)
- libnss_wrapper_so_path = blddir + '/default/lib/nss_wrapper/libnss-wrapper.so'
+ libnss_wrapper_so_path = blddir + '/default/third_party/nss_wrapper/libnss-wrapper.so'
conf.DEFINE('LIBNSS_WRAPPER_SO_PATH', libnss_wrapper_so_path)
conf.DEFINE('NSS_WRAPPER', 1)
conf.RECURSE('aesni-intel')
if conf.CONFIG_GET('ENABLE_SELFTEST'):
conf.RECURSE('socket_wrapper')
+ conf.RECURSE('nss_wrapper')
def build(bld):
bld.RECURSE('aesni-intel')
if bld.CONFIG_GET('SOCKET_WRAPPER'):
bld.RECURSE('socket_wrapper')
+ if bld.CONFIG_GET('NSS_WRAPPER'):
+ bld.RECURSE('nss_wrapper')
else:
conf.define('USING_SYSTEM_SOCKET_WRAPPER', 1)
+ if not conf.CHECK_NSS_WRAPPER():
+ raise Utils.WafError('nss_wrapper package has not been found.\nIf third_party is installed, check that it is in the proper place.')
+ else:
+ conf.define('USING_SYSTEM_NSS_WRAPPER', 1)
+
conf.RECURSE('lib/ldb')
if not (Options.options.without_ad_dc):
conf.RECURSE('lib/crypto')
conf.RECURSE('pidl')
if conf.CONFIG_GET('ENABLE_SELFTEST'):
- conf.RECURSE('lib/nss_wrapper')
conf.RECURSE('lib/resolv_wrapper')
conf.RECURSE('lib/uid_wrapper')
if Options.options.with_pam:
bld.RECURSE('source4/lib/events')
bld.RECURSE('source4/lib/cmdline')
bld.RECURSE('source4/lib/http')
-if bld.CONFIG_GET('NSS_WRAPPER'):
- bld.RECURSE('lib/nss_wrapper')
if bld.CONFIG_GET('PAM_WRAPPER') and Options.options.with_pam:
bld.RECURSE('lib/pam_wrapper')
if bld.CONFIG_GET('RESOLV_WRAPPER'):