sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

build: optionally enable builtin popt

Browse Source
This commit is contained in:
Andrew Tridgell 2010-03-17 00:22:54 -06:00
parent cb0bf90b10
commit 10935a3354
4 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/popt/wscript Normal file
View File

@ -0,0 +1,23 @@
import Options
def set_options(opt):
opt.add_option('--with-included-popt',
help=("use bundled popt library, not from system"),
action="store_true", dest='INCLUDED_POPT', default=False)
def configure(conf):
conf.CHECK_HEADERS('float.h')
if not Options.options.INCLUDED_POPT:
if (conf.CHECK_HEADERS('popt.h') and
conf.CHECK_FUNCS_IN('poptGetContext', 'popt')):
conf.DEFINE('HAVE_SYSTEM_POPT', 1)
def build(bld):
if not bld.CONFIG_SET('HAVE_SYSTEM_POPT'):
bld.SAMBA_SUBSYSTEM('LIBPOPT',
source='findme.c popt.c poptconfig.c popthelp.c poptparse.c',
cflags='-DDBL_EPSILON=__DBL_EPSILON__'
)
bld.TARGET_ALIAS('LIBPOPT', 'popt')
else:
bld.TARGET_ALIAS('popt', 'LIBPOPT')

8
lib/popt/wscript_build
View File

@ -1,8 +0,0 @@
# AUTOGENERATED by mktowscript.pl from ../../lib/popt/config.mk
# Please remove this notice if hand editing
bld.SAMBA_SUBSYSTEM('LIBPOPT',
source='findme.c popt.c poptconfig.c popthelp.c poptparse.c',
)

2
source4/wscript
View File

@ -17,6 +17,7 @@ def set_options(opt):
opt.recurse('../lib/nss_wrapper')
opt.recurse('../lib/socket_wrapper')
opt.recurse('../lib/uid_wrapper')
opt.recurse('../lib/popt')
def configure(conf):
conf.define('PACKAGE_NAME', 'samba')
@ -60,6 +61,7 @@ def configure(conf):
conf.sub_config('../lib/nss_wrapper')
conf.sub_config('../lib/socket_wrapper')
conf.sub_config('../lib/uid_wrapper')
conf.sub_config('../lib/popt')
conf.sub_config('lib/smbreadline')
conf.SAMBA_CONFIG_H('include/config.h')

2
source4/wscript_build
View File

@ -15,7 +15,6 @@ bld.SAMBA_MKVERSION('version.h')
# this sets up some aliases
bld.TARGET_ALIAS('attr', 'XATTR')
bld.TARGET_ALIAS('execinfo', 'EXECINFO')
bld.TARGET_ALIAS('popt', 'LIBPOPT')
bld.TARGET_ALIAS('tevent', 'LIBTEVENT_EXT')
bld.TARGET_ALIAS('z', 'ZLIB')
bld.TARGET_ALIAS('pam', 'PAM')
@ -74,6 +73,7 @@ bld.BUILD_SUBDIR('lib/cmdline')
bld.BUILD_SUBDIR('../lib/socket_wrapper')
bld.BUILD_SUBDIR('../lib/nss_wrapper')
bld.BUILD_SUBDIR('../lib/uid_wrapper')
bld.BUILD_SUBDIR('../lib/popt')
bld.BUILD_SUBDIR('lib/stream')
bld.BUILD_SUBDIR('../lib/util')
bld.BUILD_SUBDIR('../lib/tdr')