summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-02-06 12:15:41 +0100
committerJeremy Allison <jra@samba.org>2014-05-22 21:05:15 +0200
commit4baa2d021cb1be0ca19bad9da0f6300a95c9a722 (patch)
tree01595696b6aded5eae7e61bdf9b9cdcd46ece8c2
parent4ea036c26dd921c4fce18db3e54f551e9f856a07 (diff)
downloadsamba-4baa2d021cb1be0ca19bad9da0f6300a95c9a722.tar.gz
libreplace-waf: Only check for _np functions if standard functions are not available
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/replace/wscript22
1 files changed, 14 insertions, 8 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index fd53999dce1..a26de0f8bae 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -458,20 +458,26 @@ removeea setea
if conf.CONFIG_SET('HAVE_PTHREAD'):
conf.CHECK_DECLS('pthread_mutexattr_setrobust', headers='pthread.h')
- conf.CHECK_FUNCS_IN('pthread_mutexattr_setrobust', 'pthread',
- checklibc=True, headers='pthread.h')
+ if not conf.CONFIG_SET('HAVE_DECL_PTHREAD_MUTEXATTR_SETROBUST'):
+ conf.CHECK_DECLS('pthread_mutexattr_setrobust_np',
+ headers='pthread.h')
- conf.CHECK_DECLS('pthread_mutexattr_setrobust_np', headers='pthread.h')
- conf.CHECK_FUNCS_IN('pthread_mutexattr_setrobust_np', 'pthread',
+ conf.CHECK_FUNCS_IN('pthread_mutexattr_setrobust', 'pthread',
checklibc=True, headers='pthread.h')
+ if not conf.CONFIG_SET('HAVE_PTHREAD_MUTEXATTR_SETROBUST'):
+ conf.CHECK_FUNCS_IN('pthread_mutexattr_setrobust_np', 'pthread',
+ checklibc=True, headers='pthread.h')
conf.CHECK_DECLS('pthread_mutex_consistent', headers='pthread.h')
- conf.CHECK_FUNCS_IN('pthread_mutex_consistent', 'pthread',
- checklibc=True, headers='pthread.h')
+ if not conf.CONFIG_SET('HAVE_DECL_PTHREAD_MUTEX_CONSISTENT'):
+ conf.CHECK_DECLS('pthread_mutex_consistent_np',
+ headers='pthread.h')
- conf.CHECK_DECLS('pthread_mutex_consistent_np', headers='pthread.h')
- conf.CHECK_FUNCS_IN('pthread_mutex_consistent_np', 'pthread',
+ conf.CHECK_FUNCS_IN('pthread_mutex_consistent', 'pthread',
checklibc=True, headers='pthread.h')
+ if not conf.CONFIG_SET('HAVE_PTHREAD_MUTEX_CONSISTENT'):
+ conf.CHECK_FUNCS_IN('pthread_mutex_consistent_np', 'pthread',
+ checklibc=True, headers='pthread.h')
if ((conf.CONFIG_SET('HAVE_PTHREAD_MUTEXATTR_SETROBUST') or
conf.CONFIG_SET('HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP')) and