X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=wscript;h=c3c3cfd6f7909f8f2391f69678009a6159553162;hb=6f3656c47d8ae6a3ac10591ffd7a60797775b469;hp=215bcaf4adc6f8b528bb4e3d80faadc2e937c727;hpb=9dfc521642d643b4e2e2537596021554382a2efa;p=obnox%2Fsamba%2Fsamba-obnox.git diff --git a/wscript b/wscript index 215bcaf4adc..c3c3cfd6f79 100644 --- a/wscript +++ b/wscript @@ -8,14 +8,14 @@ VERSION=None import sys, os, tempfile sys.path.insert(0, srcdir+"/buildtools/wafsamba") -import wafsamba, Options, samba_dist, Scripting, Utils, samba_version +import wafsamba, Options, samba_dist, samba_git, Scripting, Utils, samba_version samba_dist.DIST_DIRS('.') samba_dist.DIST_BLACKLIST('.gitignore .bzrignore source4/selftest/provisions') # install in /usr/local/samba by default -Options.default_prefix = '/usr/local/samba' +default_prefix = Options.default_prefix = '/usr/local/samba' # This callback optionally takes a list of paths as arguments: # --with-system_mitkrb5 /path/to/krb5 /another/path @@ -53,6 +53,14 @@ def set_options(opt): help='disable AD DC functionality (enables Samba 4 client and Samba 3 code base).', action='store_true', dest='without_ad_dc', default=False) + opt.add_option('--with-ntvfs-fileserver', + help='enable the depricated NTVFS file server from the original Samba4 branch (default if --enable-selftest specicifed). Conflicts with --with-system-mitkrb5 and --without-ad-dc', + action='store_true', dest='with_ntvfs_fileserver') + + opt.add_option('--without-ntvfs-fileserver', + help='disable the depricated NTVFS file server from the original Samba4 branch', + action='store_false', dest='with_ntvfs_fileserver') + opt.add_option('--with-pie', help=("Build Position Independent Executables " + "(default if supported by compiler)"), @@ -69,14 +77,6 @@ def set_options(opt): help=("Disable RELRO builds"), action="store_false", dest='enable_relro') - opt.add_option('--with-systemd', - help=("Enable systemd integration"), - action='store_true', dest='enable_systemd') - - opt.add_option('--without-systemd', - help=("Disable systemd integration"), - action='store_false', dest='enable_systemd') - gr = opt.option_group('developer options') opt.tool_options('python') # options for disabling pyc or pyo compilation @@ -122,8 +122,7 @@ def configure(conf): conf.RECURSE('dynconfig') if conf.CHECK_FOR_THIRD_PARTY(): - conf.RECURSE('third_party/zlib') - conf.RECURSE('third_party/popt') + conf.RECURSE('third_party') else: if not conf.CHECK_ZLIB(): raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.') @@ -141,6 +140,7 @@ def configure(conf): conf.PROCESS_SEPARATE_RULE('system_mitkrb5') if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): conf.DEFINE('AD_DC_BUILD_IS_ENABLED', 1) + # Only process heimdal_build for non-MIT KRB5 builds # When MIT KRB5 checks are done as above, conf.env.KRB5_VENDOR will be set # to the lowcased output of 'krb5-config --vendor'. @@ -151,7 +151,6 @@ def configure(conf): conf.RECURSE('source4/lib/tls') conf.RECURSE('source4/ntvfs/sysdep') conf.RECURSE('lib/util') - conf.RECURSE('lib/ccan') conf.RECURSE('lib/util/charset') conf.RECURSE('source4/auth') conf.RECURSE('nsswitch') @@ -164,6 +163,19 @@ def configure(conf): conf.RECURSE('lib/resolv_wrapper') conf.RECURSE('lib/socket_wrapper') conf.RECURSE('lib/uid_wrapper') + if Options.options.with_ntvfs_fileserver != False: + if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + conf.DEFINE('WITH_NTVFS_FILESERVER', 1) + if Options.options.with_ntvfs_fileserver == False: + if not (Options.options.without_ad_dc or Options.options.with_system_mitkrb5): + raise Utils.WafError('--without-ntvfs-fileserver conflicts with --enable-selftest while building the AD DC') + + if Options.options.with_ntvfs_fileserver == True: + if Options.options.without_ad_dc: + raise Utils.WafError('--with-ntvfs-fileserver conflicts with --without-ad-dc') + if Options.options.with_system_mitkrb5: + raise Utils.WafError('--with-ntvfs-fileserver conflicts with --with-system-mitkrb5') + conf.DEFINE('WITH_NTVFS_FILESERVER', 1) conf.RECURSE('source3') conf.RECURSE('lib/texpect') if conf.env.with_ctdb: @@ -176,17 +188,11 @@ def configure(conf): # allows us to find problems on our development hosts faster. # It also results in faster load time. - if not sys.platform.startswith("openbsd"): - conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True) + conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True) if not conf.CHECK_NEED_LC("-lc not needed"): conf.ADD_LDFLAGS('-lc', testflags=False) - # we don't want PYTHONDIR in config.h, as otherwise changing - # --prefix causes a complete rebuild - del(conf.env.defines['PYTHONDIR']) - del(conf.env.defines['PYTHONARCHDIR']) - if not conf.CHECK_CODE('#include "tests/summary.c"', define='SUMMARY_PASSES', addmain=False, @@ -213,20 +219,6 @@ def configure(conf): msg="Checking compiler for full RELRO support"): conf.env['ENABLE_RELRO'] = True - if Options.options.enable_systemd != False: - conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs', - msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON") - conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon') - conf.CHECK_LIB('systemd-daemon', shlib=True) - - if (conf.CONFIG_SET('HAVE_SYSTEMD_SD_DAEMON_H') and - conf.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON')): - conf.DEFINE('HAVE_SYSTEMD', '1') - conf.env['ENABLE_SYSTEMD'] = True - else: - conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY') - conf.undefine('HAVE_SYSTEMD') - conf.SAMBA_CONFIG_H('include/config.h') def etags(ctx): @@ -249,6 +241,7 @@ def ctags(ctx): if os.WEXITSTATUS(status): raise Utils.WafError('ctags failed') + # putting this here enabled build in the list # of commands in --help def build(bld): @@ -344,6 +337,7 @@ def wildcard_cmd(cmd): def main(): from samba_wildcard import wildcard_main + wildcard_main(wildcard_cmd) Scripting.main = main @@ -351,3 +345,10 @@ def reconfigure(ctx): '''reconfigure if config scripts have changed''' import samba_utils samba_utils.reconfigure(ctx) + + +if os.path.isdir(os.path.join(srcdir, ".git")): + # Check if there are submodules that are checked out but out of date. + for submodule, status in samba_git.read_submodule_status(srcdir): + if status == "out-of-date": + raise Utils.WafError("some submodules are out of date. Please run 'git submodule update'")