From 706f0775c34615ae72eb141e38de95c85d6680d1 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 14 Sep 2018 14:36:07 +0200 Subject: [PATCH] build: Add option to disable the wireless daemon binary --- Makefile.am | 16 +++++++++++----- configure.ac | 5 +++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index bda5103a..cab5f2bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,11 +8,6 @@ builtin_sources = noinst_LTLIBRARIES = ell/libell-internal.la -if DBUS_POLICY -dbus_datadir = @DBUS_DATADIR@/dbus-1/system.d -dist_dbus_data_DATA = src/iwd-dbus.conf -endif - ell_sources = ell/ell.h ell/private.h ell/missing.h \ ell/util.h ell/util.c \ ell/test.h ell/test.c \ @@ -72,6 +67,11 @@ bin_PROGRAMS = libexec_PROGRAMS = noinst_PROGRAMS = +if DBUS_POLICY +dbus_datadir = @DBUS_DATADIR@/dbus-1/system.d +dist_dbus_data_DATA = +endif + if SYSTEMD_SERVICE systemd_unitdir = @SYSTEMD_UNITDIR@ systemd_unit_DATA = @@ -80,6 +80,7 @@ dbus_busdir = @DBUS_BUSDIR@ dbus_bus_DATA = endif +if DAEMON libexec_PROGRAMS += src/iwd src_iwd_SOURCES = src/main.c linux/nl80211.h \ @@ -137,12 +138,17 @@ builtin_modules += ofono builtin_sources += plugins/ofono.c endif +if DBUS_POLICY +dist_dbus_data_DATA += src/iwd-dbus.conf +endif + if SYSTEMD_SERVICE src_iwd_DEPENDENCIES += src/iwd.service systemd_unit_DATA += src/iwd.service dbus_bus_DATA += src/net.connman.iwd.service endif +endif if CLIENT bin_PROGRAMS += client/iwctl diff --git a/configure.ac b/configure.ac index c50e88de..43e166ab 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,11 @@ AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) AC_CHECK_HEADERS_ONCE(execinfo.h) AC_CHECK_LIB(execinfo, backtrace) +AC_ARG_ENABLE([daemon], AC_HELP_STRING([--disable-daemon], + [don't install iwd system daemon]), + [enable_daemon=${enableval}]) +AM_CONDITIONAL(DAEMON, test "${enable_daemon}" != "no") + AC_ARG_ENABLE([client], AC_HELP_STRING([--disable-client], [don't install iwctl client utility]), [enable_client=${enableval}])