git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
41b3c38
)
build: Make POPT_SAMBA3 a library
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 16 May 2011 11:20:36 +0000
(21:20 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Wed, 18 May 2011 14:12:08 +0000
(16:12 +0200)
This avoids some duplicate symbols when libnet and libsmbclient are
linked into the same binary (smbtorture4).
Andrew Bartlett
source3/wscript_build
patch
|
blob
|
history
diff --git
a/source3/wscript_build
b/source3/wscript_build
index 3e8b2b278fe7ca896483be8be1315c41089d84f3..f4ed9155e1f6933f3ecb2e7b4daae2960ca417ef 100755
(executable)
--- a/
source3/wscript_build
+++ b/
source3/wscript_build
@@
-772,10
+772,11
@@
bld.SAMBA3_SUBSYSTEM('REG_FULL',
deps='REG_SMBCONF',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3',
- source=POPT_LIB_SRC,
- deps='popt',
- vars=locals())
+bld.SAMBA3_LIBRARY('POPT_SAMBA3',
+ source=POPT_LIB_SRC,
+ deps='popt',
+ vars=locals(),
+ private_library=True)
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,