diff options
| author | Björn Jacke <bj@sernet.de> | 2015-05-28 14:55:28 +0200 |
|---|---|---|
| committer | Bjoern Jacke <bj@sernet.de> | 2015-12-03 16:09:08 +0100 |
| commit | c118fbc680f84622c12997cf347f3194d532ddbc (patch) | |
| tree | 787cbf6cd2975e93d97fbcb1f128e5d1f13c925d /source3/wscript | |
| parent | f25d09a6eb8274fd62d23def8d494d4af0178bf5 (diff) | |
| download | samba-c118fbc680f84622c12997cf347f3194d532ddbc.tar.gz | |
clitar: cope with functions of older versions of libarchive
the feature of automatic decompression in extract mode is only supported in
libarchive 3, so we use this only when available now.
The changed config checks for that also fix this bug:
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11296
Signed-off-by: Bjoern Jacke <bj@sernet.de>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Björn Jacke <bj@sernet.de>
Autobuild-Date(master): Thu Dec 3 16:09:08 CET 2015 on sn-devel-104
Diffstat (limited to 'source3/wscript')
| -rw-r--r-- | source3/wscript | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/wscript b/source3/wscript index 990afcdfa01..8741d192ea9 100644 --- a/source3/wscript +++ b/source3/wscript @@ -212,14 +212,14 @@ main() { # check for libarchive (tar command in smbclient) # None means autodetect, True/False means enable/disable - conf.env['archive_lib'] = '' + conf.SET_TARGET_TYPE('archive', 'EMPTY') if Options.options.with_libarchive is not False: libarchive_mandatory = Options.options.with_libarchive == True Logs.info("Checking for libarchive existence") - if conf.CHECK_BUNDLED_SYSTEM('libarchive', minversion='3.1.2'): - conf.env['archive_lib'] = 'libarchive' + if conf.CHECK_HEADERS('archive.h') and conf.CHECK_LIB('archive', shlib=True): + conf.CHECK_FUNCS_IN('archive_read_support_filter_all archive_read_free', 'archive') elif libarchive_mandatory: - conf.fatal('libarchive support requested, but no suitable pkgconfig found') + conf.fatal('libarchive support requested, but not found') # check for DMAPI libs if Options.options.with_dmapi == False: |