From 00f906db4c230b87d1fa0a11c5d166a80422d6eb Mon Sep 17 00:00:00 2001 From: Stefan Behrens Date: Tue, 28 May 2019 17:13:19 +0200 Subject: [PATCH] config: Fixup sendfile detection on Solaris during configuration step Commit f23287bcb69d7c changed the configuration code for the sendfile detection. A bug was added that set HAVE_SENDFILEV for Solaris but checked HAVE_SENDFILE (without the "V") and caused the configure step to fail if --with-sendfile-support was set. Signed-off-by: Stefan Behrens --- source3/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/wscript b/source3/wscript index ff72a173a4bf..46231f3d7299 100644 --- a/source3/wscript +++ b/source3/wscript @@ -1380,7 +1380,7 @@ main() { conf.DEFINE('HAVE_SENDFILE', '1') conf.DEFINE('AIX_SENDFILE_API', '1') - if Options.options.with_sendfile_support == True and not conf.CONFIG_SET('HAVE_SENDFILE'): + if Options.options.with_sendfile_support == True and not (conf.CONFIG_SET('HAVE_SENDFILE') or conf.CONFIG_SET('HAVE_SENDFILEV')): conf.fatal('sendfile support not found but it was requested !') # Check for getcwd allowing a NULL arg. conf.CHECK_CODE(''' -- 2.19.2