summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-16 21:20:36 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-18 16:12:08 +0200
commit75faa9eec5fecfc033bd4941427da28e4471a516 (patch)
tree0065c6e7d8771726b7bb785ac3bfb8a9b356c4d8
parent41b3c38587f1153d49c1805869aa186b66501f7a (diff)
downloadsamba-75faa9eec5fecfc033bd4941427da28e4471a516.tar.gz
samba-75faa9eec5fecfc033bd4941427da28e4471a516.tar.bz2
samba-75faa9eec5fecfc033bd4941427da28e4471a516.zip
build: Make POPT_SAMBA3 a library
This avoids some duplicate symbols when libnet and libsmbclient are linked into the same binary (smbtorture4). Andrew Bartlett
-rwxr-xr-xsource3/wscript_build9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 3e8b2b278f..f4ed9155e1 100755
--- 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,