summaryrefslogtreecommitdiff
path: root/source4/lib/popt/SConscript
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-09-28 18:18:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:08 -0500
commit5058f4b9e82ca8b9f2405930db3a46b8c37f06ed (patch)
tree008fb92b76381b2070568a27b905ff64608cb2b0 /source4/lib/popt/SConscript
parent09ee7a470ba052d184f94336cd7635efca387ace (diff)
downloadsamba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.gz
samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.tar.bz2
samba-5058f4b9e82ca8b9f2405930db3a46b8c37f06ed.zip
r10586: Add MergedObject() builder. Default to Library() rather
then StaticLibrary() (This used to be commit b53313dc517986c69a4e4cb8fe3885b696f8faa1)
Diffstat (limited to 'source4/lib/popt/SConscript')
-rw-r--r--source4/lib/popt/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/popt/SConscript b/source4/lib/popt/SConscript
index 85f9c9b7e0..d9a576a031 100644
--- a/source4/lib/popt/SConscript
+++ b/source4/lib/popt/SConscript
@@ -7,5 +7,5 @@ if hostenv['configure']:
conf.env['HAVE_EXTERNAL_POPT'] = conf.CheckLibWithHeader('popt', 'popt.h', 'c', 'poptGetArgs(NULL);')
conf.Finish()
-popt = hostenv.StaticLibrary('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c'])
+popt = hostenv.Library('popt', ['findme.c','popt.c','poptconfig.c','popthelp.c','poptparse.c'])
Export('popt')