summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2013-02-25 10:02:35 +0100
committerDavid Disseldorp <ddiss@suse.de>2013-03-05 23:29:43 +0100
commitdef575bc29ee399fc93320b0f3716bc15740863d (patch)
tree97988f5f37e51df5f3bf9ae01c541fb4fd1f057d
parent3c134bcf86a156b8b0292e6a8108050273038b29 (diff)
downloadsamba-def575bc29ee399fc93320b0f3716bc15740863d.tar.gz
samba-def575bc29ee399fc93320b0f3716bc15740863d.tar.bz2
samba-def575bc29ee399fc93320b0f3716bc15740863d.zip
waf: Correctly check for prctl in just one place.
Reviewed-by: David Disseldorp <ddiss@samba.org>
-rw-r--r--lib/replace/wscript15
-rw-r--r--source3/wscript10
2 files changed, 15 insertions, 10 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 47735be9e6..36a9f6a366 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -94,7 +94,7 @@ struct foo bar = { .y = 'X', .x = 1 };
conf.CHECK_HEADERS('security/pam_appl.h zlib.h asm/unistd.h')
conf.CHECK_HEADERS('aio.h sys/unistd.h rpc/rpc.h rpc/nettype.h alloca.h float.h')
- conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h sys/prctl.h sys/sysctl.h')
+ conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h sys/sysctl.h')
conf.CHECK_HEADERS('sys/fileio.h sys/filesys.h sys/dustat.h sys/sysmacros.h')
conf.CHECK_HEADERS('xfs/libxfs.h netgroup.h')
@@ -106,6 +106,18 @@ struct foo bar = { .y = 'X', .x = 1 };
conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h malloc.h')
conf.CHECK_HEADERS('syscall.h sys/syscall.h inttypes.h')
+ # Check for process set name support
+ conf.CHECK_CODE('''
+ #include <sys/prctl.h>
+ int main(void) {
+ prctl(0);
+ return 0;
+ }
+ ''',
+ 'HAVE_PRCTL',
+ headers='sys/prctl.h',
+ msg='Checking for prctl syscall')
+
conf.CHECK_CODE('''
#include <unistd.h>
#ifdef HAVE_FCNTL_H
@@ -225,6 +237,7 @@ struct foo bar = { .y = 'X', .x = 1 };
conf.CHECK_FUNCS('link readlink symlink realpath snprintf vsnprintf')
conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen strtoull __strtoull')
conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq memalign posix_memalign')
+ conf.CHECK_FUNCS('prctl')
# libbsd on some platforms provides strlcpy and strlcat
if not conf.CHECK_FUNCS('strlcpy strlcat'):
diff --git a/source3/wscript b/source3/wscript
index 7a99dc1c55..1bc68115e5 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -317,7 +317,7 @@ _lstat __lstat lutimes
__lxstat memalign mknod mlock mlockall munlock munlockall
_open __open _opendir __opendir
pathconf poll posix_fallocate
-posix_memalign prctl pread _pread __pread
+posix_memalign pread _pread __pread
pwrite _pwrite __pwrite
rdchk _read __read _readdir __readdir
_seekdir __seekdir
@@ -330,14 +330,6 @@ __sys_llseek syslog _telldir __telldir textdomain timegm
utimensat vsyslog _write __write __xstat
''')
- conf.CHECK_CODE('''
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
-int i; i = prtcl(0);
-''',
- 'HAVE_PRCTL', link=False)
-
conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
# FIXME: these should be tests for features, but the old build system just