diff options
| author | David Disseldorp <ddiss@samba.org> | 2014-02-19 17:17:45 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2014-02-19 20:19:07 +0100 |
| commit | 497f0327a08fbfa444308c90a418ccb6b45b96d6 (patch) | |
| tree | fd32a012a4f3c7aa6917c96702924d13861a270c /source3/wscript | |
| parent | 43227c3d9fda806dc510fd552e340127192b9424 (diff) | |
| download | samba-497f0327a08fbfa444308c90a418ccb6b45b96d6.tar.gz samba-497f0327a08fbfa444308c90a418ccb6b45b96d6.tar.xz samba-497f0327a08fbfa444308c90a418ccb6b45b96d6.zip | |
build: check for libarchive version via pkgconfig
The previous libarchive linker and header file check was not suitible
for older libarchive versions that do not provide the function
archive_read_support_filter_all().
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Wed Feb 19 20:19:07 CET 2014 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 99ec1beb8db..45eb33ba01b 100644 --- a/source3/wscript +++ b/source3/wscript @@ -200,10 +200,10 @@ main() { if Options.options.with_libarchive is not False: libarchive_mandatory = Options.options.with_libarchive == True Logs.info("Checking for libarchive existence") - 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') + if conf.CHECK_BUNDLED_SYSTEM('libarchive', minversion='3.1.2'): + conf.env['archive_lib'] = 'libarchive' + elif libarchive_mandatory: + conf.fatal('libarchive support requested, but no suitable pkgconfig found') # check for DMAPI libs Logs.info("Checking for DMAPI library existence") |