libreplace: only add PTHREAD CFLAGS and LDFLAGS globally if asked for
authorStefan Metzmacher <metze@samba.org>
Thu, 16 May 2013 09:50:38 +0000 (11:50 +0200)
committerJeremy Allison <jra@samba.org>
Thu, 22 May 2014 19:05:15 +0000 (21:05 +0200)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/replace/wscript

index 45e5d9084562ee2014b4a5384fb163f965e1cd96..483c0dcec86b126716e90564a6bd11eb96047839 100644 (file)
@@ -449,8 +449,9 @@ removeea setea
             PTHREAD_LDFLAGS='-lpthread'
 
     if PTHREAD_CFLAGS != 'error' and PTHREAD_LDFLAGS != 'error':
-        conf.ADD_CFLAGS(PTHREAD_CFLAGS)
-        conf.ADD_LDFLAGS(PTHREAD_LDFLAGS)
+        if conf.CONFIG_SET('replace_add_global_pthread'):
+            conf.ADD_CFLAGS(PTHREAD_CFLAGS)
+            conf.ADD_LDFLAGS(PTHREAD_LDFLAGS)
         conf.CHECK_HEADERS('pthread.h')
         conf.DEFINE('HAVE_PTHREAD', '1')