diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/wscript | 4 | ||||
| -rwxr-xr-x | source3/wscript_build | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/wscript b/source3/wscript index 39ab1f335c6..99ec1beb8db 100644 --- a/source3/wscript +++ b/source3/wscript @@ -196,10 +196,12 @@ main() { # check for libarchive (tar command in smbclient) # None means autodetect, True/False means enable/disable + conf.env['archive_lib'] = '' if Options.options.with_libarchive is not False: libarchive_mandatory = Options.options.with_libarchive == True Logs.info("Checking for libarchive existence") - conf.CHECK_LIB('archive', mandatory=libarchive_mandatory) + if conf.CHECK_LIB('archive', mandatory=libarchive_mandatory): + conf.env['archive_lib'] = 'archive' if not conf.CHECK_HEADERS('archive.h') and libarchive_mandatory: conf.fatal('libarchive support requested, but no suitable header found') diff --git a/source3/wscript_build b/source3/wscript_build index 9265e00c395..9d3071a74cd 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1005,8 +1005,7 @@ bld.SAMBA3_BINARY('client/smbclient', msrpc3 RPC_NDR_SRVSVC cli_smb_common - '''+ - ('archive' if bld.CONFIG_SET('HAVE_LIBARCHIVE') else '')) + ''' + bld.env['archive_lib']) bld.SAMBA3_BINARY('net', source='''utils/net.c |