On Sun, Jun 2, 2013 at 10:54 AM, Umut Tezduyar <[email protected]> wrote: > --- > Makefile.am | 52 +++++++++++++++++++++++++++++++++++++--------------- > configure.ac | 9 +++++++++ > 2 files changed, 46 insertions(+), 15 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index e63563f..54c4582 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -280,9 +280,13 @@ rootbin_PROGRAMS = \ > systemd-notify \ > systemd-ask-password \ > systemd-tty-ask-password-agent \ > - systemd-tmpfiles \ > systemd-machine-id-setup > > +if ENABLE_TMPFILES > +rootbin_PROGRAMS += \ > + systemd-tmpfiles > +endif > + > bin_PROGRAMS = \ > systemd-cgls \ > systemd-cgtop \ > @@ -336,18 +340,20 @@ dist_bashcompletion_DATA = \ > shell-completion/bash/systemd-analyze \ > shell-completion/bash/udevadm > > +if ENABLE_TMPFILES > dist_tmpfiles_DATA = \ > tmpfiles.d/systemd.conf \ > tmpfiles.d/tmp.conf \ > tmpfiles.d/x11.conf > > -dist_sysctl_DATA = \ > - sysctl.d/50-default.conf > - > if HAVE_SYSV_COMPAT > dist_tmpfiles_DATA += \ > tmpfiles.d/legacy.conf > endif > +endif > + > +dist_sysctl_DATA = \ > + sysctl.d/50-default.conf > > dist_systemunit_DATA = \ > units/graphical.target \ > @@ -400,7 +406,6 @@ dist_systemunit_DATA = \ > units/sound.target \ > units/bluetooth.target \ > units/smartcard.target \ > - units/systemd-tmpfiles-clean.timer \ > units/quotaon.service \ > units/systemd-ask-password-wall.path \ > units/systemd-ask-password-console.path \ > @@ -419,9 +424,6 @@ nodist_systemunit_DATA = \ > units/systemd-remount-fs.service \ > units/systemd-update-utmp.service \ > units/systemd-update-utmp-runlevel.service \ > - units/systemd-tmpfiles-setup-dev.service \ > - units/systemd-tmpfiles-setup.service \ > - units/systemd-tmpfiles-clean.service \ > units/systemd-ask-password-wall.service \ > units/systemd-ask-password-console.service \ > units/systemd-sysctl.service \ > @@ -465,9 +467,6 @@ EXTRA_DIST += \ > units/systemd-remount-fs.service.in \ > units/systemd-update-utmp.service.in \ > units/systemd-update-utmp-runlevel.service.in \ > - units/systemd-tmpfiles-setup-dev.service.in \ > - units/systemd-tmpfiles-setup.service.in \ > - units/systemd-tmpfiles-clean.service.in \ > units/systemd-ask-password-wall.service.in \ > units/systemd-ask-password-console.service.in \ > units/systemd-sysctl.service.in \ > @@ -500,6 +499,19 @@ CLEANFILES += \ > units/console-getty.service.m4 \ > units/rescue.service.m4 > > +if ENABLE_TMPFILES > +dist_systemunit_DATA += \ > + units/systemd-tmpfiles-clean.timer > +nodist_systemunit_DATA += \ > + units/systemd-tmpfiles-setup-dev.service \ > + units/systemd-tmpfiles-setup.service \ > + units/systemd-tmpfiles-clean.service > +EXTRA_DIST += \ > + units/systemd-tmpfiles-setup-dev.service.in \ > + units/systemd-tmpfiles-setup.service.in \ > + units/systemd-tmpfiles-clean.service.in > +endif > + > if HAVE_SYSV_COMPAT > nodist_systemunit_DATA += \ > units/rc-local.service \ > @@ -1437,6 +1449,7 @@ EXTRA_DIST += \ > units/systemd-modules-load.service.in > > # > ------------------------------------------------------------------------------ > +if ENABLE_TMPFILES > systemd_tmpfiles_SOURCES = \ > src/tmpfiles/tmpfiles.c > > @@ -1444,6 +1457,7 @@ systemd_tmpfiles_LDADD = \ > libsystemd-label.la \ > libsystemd-shared.la \ > libsystemd-capability.la > +endif > > # > ------------------------------------------------------------------------------ > systemd_machine_id_setup_SOURCES = \ > @@ -4115,12 +4129,16 @@ SYSINIT_TARGET_WANTS += \ > sys-kernel-config.mount \ > sys-kernel-debug.mount \ > sys-fs-fuse-connections.mount \ > - systemd-tmpfiles-setup-dev.service \ > - systemd-tmpfiles-setup.service \ > systemd-sysctl.service \ > systemd-ask-password-console.path > + > +if ENABLE_TMPFILES > +SYSINIT_TARGET_WANTS += \ > + systemd-tmpfiles-setup-dev.service \ > + systemd-tmpfiles-setup.service > TIMERS_TARGET_WANTS += \ > systemd-tmpfiles-clean.timer > +endif > > if HAVE_SYSV_COMPAT > SYSTEM_UNIT_ALIASES += \ > @@ -4164,8 +4182,6 @@ INSTALL_DIRS += \ > endif > > INSTALL_DIRS += \ > - $(tmpfilesdir) \ > - $(sysconfdir)/tmpfiles.d \ > $(prefix)/lib/modules-load.d \ > $(sysconfdir)/modules-load.d \ > $(prefix)/lib/sysctl.d \ > @@ -4185,6 +4201,12 @@ INSTALL_DIRS += \ > $(dbussessionservicedir) \ > $(sysconfdir)/xdg/systemd > > +if ENABLE_TMPFILES > +INSTALL_DIRS += \ > + $(tmpfilesdir) \ > + $(sysconfdir)/tmpfiles.d > +endif > + > install-exec-hook: $(INSTALL_EXEC_HOOKS) > > uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS) > diff --git a/configure.ac b/configure.ac > index c24b4a8..d266601 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -617,6 +617,14 @@ fi > AM_CONDITIONAL(ENABLE_QUOTACHECK, [test "$have_quotacheck" = "yes"]) > > # > ------------------------------------------------------------------------------ > +have_tmpfiles=no > +AC_ARG_ENABLE(tmpfiles, AS_HELP_STRING([--disable-tmpfiles], [disable > tmpfiles support])) > +if test "x$enable_tmpfiles" != "xno"; then > + have_tmpfiles=yes > +fi > +AM_CONDITIONAL(ENABLE_TMPFILES, [test "$have_tmpfiles" = "yes"]) > + > +# > ------------------------------------------------------------------------------ > have_randomseed=no > AC_ARG_ENABLE(randomseed, AS_HELP_STRING([--disable-randomseed], [disable > randomseed tools])) > if test "x$enable_randomseed" != "xno"; then > @@ -954,6 +962,7 @@ AC_MSG_RESULT([ > readahead: ${have_readahead} > bootchart: ${have_bootchart} > quotacheck: ${have_quotacheck} > + tmpfiles: ${have_tmpfiles} > randomseed: ${have_randomseed} > logind: ${have_logind} > hostnamed: ${have_hostnamed} > -- > 1.8.2.3 > > _______________________________________________ > systemd-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Thanks! Applied. Tom _______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
