commit 91e2b0fc87148fd75ff34632caad26e0f070d31d
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Sat Oct 17 15:55:57 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Sat Oct 17 15:55:57 2020 -0700
tree 3728d0cd38b926df34acfed8672f51fe391489e4
parent 1dab2dce6a64dbce9af14eebdc367d6557f09c81

fix wscript

Change-Id: I1bceac961fd12378a4bdcad92c81c4e1a9850c82

wscript

diff --git a/wscript b/wscript
index b49d124..66d72ac 100644
--- a/wscript
+++ b/wscript
@@ -16,8 +16,8 @@
     optgrp = opt.add_option_group('ndncert Options')
     optgrp.add_option('--with-tests', action='store_true', default=False,
                       help='Build unit tests')
-    optgrp.add_option('--without-systemd', action='store_true', default=False,
-                      help='Disable systemd integration')
+    optgrp.add_option('--with-systemd', action='store_true', default=False,
+                      help='Enable systemd service file compilation')
 
 def configure(conf):
     conf.load(['compiler_cxx', 'gnu_dirs',
@@ -28,10 +28,6 @@
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'], uselib_store='NDN_CXX',
                    pkg_config_path=os.environ.get('PKG_CONFIG_PATH', '%s/pkgconfig' % conf.env.LIBDIR))
 
-    if not conf.options.without_systemd:
-            conf.check_cfg(package='libsystemd', args=['--cflags', '--libs'],
-                           uselib_store='SYSTEMD', mandatory=False)
-
     conf.check_sqlite3()
     conf.check_openssl(lib='crypto', atleast_version=0x1010100f) # 1.1.1
 
@@ -64,6 +60,8 @@
     # compiler on the command line.
     conf.write_config_header('src/ndncert-config.hpp')
 
+    conf.define_cond('WITH_SYSTEMD', conf.options.with_systemd)
+
 def build(bld):
     bld.shlib(target='ndn-cert',
               vnum=VERSION,
@@ -105,14 +103,12 @@
         install_path='${BINDIR}',
         chmod=Utils.O755)
 
-    if bld.env.HAVE_SYSTEMD:
+    bld(features='subst',
+        name='ndncert-server.service',
+        source='systemd/ndncert-server.service.in',
+        target='systemd/ndncert-server.service')
 
-        bld(features='subst',
-            name='ndncert-server.service',
-            source='systemd/ndncert-server.service.in',
-            target='systemd/ndncert-server.service')
-
-        bld(features='subst',
-            name='ndncert-server.service',
-            source='systemd/ndncert-ca.service.in',
-            target='systemd/ndncert-ca.service')
+    bld(features='subst',
+        name='ndncert-server.service',
+        source='systemd/ndncert-ca.service.in',
+        target='systemd/ndncert-ca.service')
\ No newline at end of file