diff options
author | Christof Schmitt <cs@samba.org> | 2015-03-20 12:13:14 -0700 |
---|---|---|
committer | Christof Schmitt <cs@samba.org> | 2015-03-23 21:22:11 +0100 |
commit | 0509790ec3696e09f6d5e6db969e46e8fd975efb (patch) | |
tree | 0e51360ceb6a23ce9922ac0d0ca8cfd419cdcf4a /wscript | |
parent | dee2b958c0412296e7944a120d28dd0a350f0223 (diff) | |
download | samba-0509790ec3696e09f6d5e6db969e46e8fd975efb.tar.gz |
build: Move systemd checks to lib/util
Only lib/util uses the systemd library, so it makes sense to have the
checks there. This also removes the need for the ctdb build script to
specify an empty tag for the systemd library.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 22 |
1 files changed, 0 insertions, 22 deletions
@@ -69,14 +69,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 @@ -212,20 +204,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): |