summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-06-18 08:49:18 +0200
committerStefan Metzmacher <metze@samba.org>2012-06-18 11:43:00 +0200
commitad3881b78c158eda36b866dc2cbaff1b4bc487d8 (patch)
tree05697946d8766f98a986f58eeddf0e022fda7a08
parentede2fa8e6925cd9f88d762049a4c65c4e130c2da (diff)
downloadsamba-ad3881b78c158eda36b866dc2cbaff1b4bc487d8.tar.gz
samba-ad3881b78c158eda36b866dc2cbaff1b4bc487d8.tar.bz2
samba-ad3881b78c158eda36b866dc2cbaff1b4bc487d8.zip
s3:configure: check for SPLICE_F_MOVE at configure stage
This should fix the waf build on AIX, which has a splice symbol. metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Mon Jun 18 11:43:01 CEST 2012 on sn-devel-104
-rw-r--r--source3/configure.in2
-rwxr-xr-xsource3/wscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index b6143f4041..e4ce944b0e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5676,7 +5676,7 @@ AC_CACHE_CHECK([for Linux splice],
#include <unistd.h>
#endif
#include <fcntl.h>],
- [long ret = splice(0,0,1,0,400,0);],
+ [long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);],
samba_cv_HAVE_LINUX_SPLICE=yes,
samba_cv_HAVE_LINUX_SPLICE=no)])
;;
diff --git a/source3/wscript b/source3/wscript
index 5a8a6f0baa..55b859c2de 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -107,7 +107,7 @@ def configure(conf):
#if defined(HAVE_UNISTD_H)
#include <unistd.h>
#endif
-long ret = splice(0,0,1,0,400,0);
+long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
''',
'HAVE_LINUX_SPLICE',
headers='fcntl.h'):