diff options
| author | Richard Hughes <richard@hughsie.com> | 2017-07-24 16:00:42 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-07-24 16:13:43 +0100 |
| commit | 6c45b38433fb5f8eff63ea37bc2a6337ec0a0524 (patch) | |
| tree | ebc7c953dc3bf989f414cdade1edfc4c1caab796 | |
| parent | dd22416e8119db4fe91c7d4c01a505d96c6c2e2c (diff) | |
| download | colord-6c45b38433fb5f8eff63ea37bc2a6337ec0a0524.tar.gz | |
trivial: Remove --enable-daemon configure argument
It doesn't do anything we can't do in a post-transaction script.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | client/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/Makefile.am | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 63640ee..e4b1557 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,13 +20,11 @@ SUBDIRS += \ data # this needs data/profiles/*.icc -if HAVE_DAEMON SUBDIRS += \ man \ policy \ rules \ src -endif snapshot: $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"` diff --git a/client/Makefile.am b/client/Makefile.am index 1a41057..91b64cd 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -23,12 +23,8 @@ bin_PROGRAMS = \ cd-create-profile \ cd-iccdump \ cd-it8 \ - cd-fix-profile - -if HAVE_DAEMON -bin_PROGRAMS += \ + cd-fix-profile \ colormgr -endif colormgr_SOURCES = \ cd-util.c diff --git a/configure.ac b/configure.ac index 80f457e..86b4efb 100644 --- a/configure.ac +++ b/configure.ac @@ -162,11 +162,6 @@ AC_ARG_ENABLE(session_helper, AS_HELP_STRING([--enable-session-helper],[Enable S enable_session_helper=$enableval, enable_session_helper=$enable_unix) AM_CONDITIONAL(HAVE_SESSION_HELPER, test x$enable_session_helper = xyes) -# optional -AC_ARG_ENABLE(daemon, AS_HELP_STRING([--enable-daemon],[Enable daemon]), - enable_daemon=$enableval, enable_daemon=$enable_unix) -AM_CONDITIONAL(HAVE_DAEMON, test x$enable_daemon = xyes) - AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]), enable_gusb=$enableval, enable_gusb=yes) if test x$enable_gusb != xno; then @@ -482,7 +477,6 @@ echo " BASH completion support: ${enable_bash_completion} SANE support: ${has_sane} GUsb support: ${enable_gusb} - Build daemon: ${enable_daemon} Extra print profiles: ${enable_print_profiles} Install tests: ${enable_installed_tests} ArgyllCMS sensor: ${enable_argyllcms_sensor} diff --git a/data/Makefile.am b/data/Makefile.am index e558432..6e76701 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -8,7 +8,6 @@ SUBDIRS = \ tests \ ti1 -if HAVE_DAEMON dbusdir = $(sysconfdir)/dbus-1/system.d dist_dbus_DATA = org.freedesktop.ColorManager.conf @@ -23,8 +22,6 @@ systemdservicemain_in_files = colord.service.in dist_tmpfiles_DATA = colord.conf -endif - if HAVE_SYSTEMD systemdservicemaindir = $(systemdsystemunitdir) systemdservicemain_DATA = $(systemdservicemain_in_files:.service.in=.service) |