diff options
| author | Aurélien Aptel <aurelien.aptel@gmail.com> | 2013-08-07 16:34:22 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2014-02-19 18:22:29 +0100 |
| commit | 95f9e60ef70a1925a463038f41476400b8990d5c (patch) | |
| tree | 4fa17b625af07e3a295340b9ba3e5f32a2e65a1a /source3/wscript_build | |
| parent | 92356e1524b97abc7e8f8fb5c7e625dc200de277 (diff) | |
| download | samba-95f9e60ef70a1925a463038f41476400b8990d5c.tar.gz | |
s3: add --with-libarchive to build configuration
* skip tar tests if disabled
* print error message when using disabled command
* autodetection of libarchive
Signed-off-by: Aurélien Aptel <aurelien.aptel@gmail.com>
[ddiss@samba.org: rebased against makefile cleanup]
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/wscript_build')
| -rwxr-xr-x | source3/wscript_build | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index fb98e543e9e..9265e00c395 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -995,7 +995,6 @@ bld.SAMBA3_BINARY('client/smbclient', source='''client/client.c client/clitar.c client/dnsbrowse.c''', - ldflags='-larchive', deps=''' talloc popt_samba3 @@ -1005,7 +1004,9 @@ bld.SAMBA3_BINARY('client/smbclient', libsmb msrpc3 RPC_NDR_SRVSVC - cli_smb_common''') + cli_smb_common + '''+ + ('archive' if bld.CONFIG_SET('HAVE_LIBARCHIVE') else '')) bld.SAMBA3_BINARY('net', source='''utils/net.c |