From 75faa9eec5fecfc033bd4941427da28e4471a516 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 16 May 2011 21:20:36 +1000
Subject: build: Make POPT_SAMBA3 a library

This avoids some duplicate symbols when libnet and libsmbclient are
linked into the same binary (smbtorture4).

Andrew Bartlett
---
 source3/wscript_build | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source3/wscript_build')

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,
-- 
cgit