libreplace-waf: Only check for _np functions if standard functions are not available
authorVolker Lendecke <vl@samba.org>
Wed, 6 Feb 2013 11:15:41 +0000 (12:15 +0100)
committerJeremy Allison <jra@samba.org>
Thu, 22 May 2014 19:05:15 +0000 (21:05 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
replace/wscript

index fd53999dce1fa3ba03deef198aa6d4c20a60f8fb..a26de0f8bae7f401b9804c8a56c83f86f050ac3c 100644 (file)
@@ -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