From 5f30388415e951606fdac6eef409160f89d65c8c Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Thu, 26 Jun 2014 10:04:36 +0300 Subject: [PATCH] waf: Support systemd-209 systemd-209 integrated all libraries into the single one, libsystemd. Luckily, header files didn't change, so support both pre-209 and 209+. --- wscript | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index cf4e93b..bff3adf 100644 --- a/wscript +++ b/wscript @@ -199,13 +199,17 @@ def configure(conf): conf.env['ENABLE_RELRO'] = True if Options.options.enable_systemd != False: - conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs', + r = conf.check_cfg(package='libsystemd-daemon', args='--cflags --libs', msg='Checking for libsystemd-daemon', uselib_store="SYSTEMD-DAEMON") + if not r: + conf.check_cfg(package='libsystemd', args='--cflags --libs', + msg='Checking for libsystemd', 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.CONFIG_SET('HAVE_LIBSYSTEMD_DAEMON') or + conf.CONFIG_SET('HAVE_LIBSYSTEMD'))): conf.DEFINE('HAVE_SYSTEMD', '1') conf.env['ENABLE_SYSTEMD'] = True else: -- 1.9.3