diff options
| -rw-r--r-- | selftest/tests.py | 6 | ||||
| -rw-r--r-- | wscript | 3 | ||||
| -rw-r--r-- | wscript_build | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/selftest/tests.py b/selftest/tests.py index d962a66f4e6..e3dd91414d9 100644 --- a/selftest/tests.py +++ b/selftest/tests.py @@ -39,6 +39,7 @@ finally: have_man_pages_support = ("XSLTPROC_MANPAGES" in config_hash) with_cmocka = ("HAVE_CMOCKA" in config_hash) +with_pam = ("WITH_PAM" in config_hash) pam_wrapper_so_path=config_hash["LIBPAM_WRAPPER_SO_PATH"] planpythontestsuite("none", "samba.tests.source") @@ -137,8 +138,9 @@ plantestsuite( configuration]) planpythontestsuite("none", "samba.tests.glue", py3_compatible=True) -plantestsuite("samba.tests.pam_winbind", "ad_member", - [os.path.join(srcdir(), "python/samba/tests/test_pam_winbind.sh"), valgrindify(python), pam_wrapper_so_path]) +if with_pam: + plantestsuite("samba.tests.pam_winbind", "ad_member", + [os.path.join(srcdir(), "python/samba/tests/test_pam_winbind.sh"), valgrindify(python), pam_wrapper_so_path]) if with_cmocka: plantestsuite("samba.unittests.krb5samba", "none", @@ -179,10 +179,11 @@ def configure(conf): conf.RECURSE('selftest') if conf.CONFIG_GET('ENABLE_SELFTEST'): conf.RECURSE('lib/nss_wrapper') - conf.RECURSE('lib/pam_wrapper') conf.RECURSE('lib/resolv_wrapper') conf.RECURSE('lib/socket_wrapper') conf.RECURSE('lib/uid_wrapper') + if Options.options.with_pam: + conf.RECURSE('lib/pam_wrapper') if Options.options.with_ntvfs_fileserver != False: if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): conf.DEFINE('WITH_NTVFS_FILESERVER', 1) diff --git a/wscript_build b/wscript_build index 59e0bdfa4cc..2ddcdcc8557 100644 --- a/wscript_build +++ b/wscript_build @@ -69,7 +69,7 @@ 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'): +if bld.CONFIG_GET('PAM_WRAPPER') and Options.options.with_pam: bld.RECURSE('lib/pam_wrapper') if bld.CONFIG_GET('SOCKET_WRAPPER'): bld.RECURSE('lib/socket_wrapper') |