summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/wscript8
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")