build-sys: Add --disable-hostnamed configure switch
This commit is contained in:
parent
de3910a324
commit
b2e9fb99ab
50
Makefile.am
50
Makefile.am
|
@ -171,7 +171,6 @@ rootlibexec_PROGRAMS = \
|
||||||
systemd-ac-power \
|
systemd-ac-power \
|
||||||
systemd-detect-virt \
|
systemd-detect-virt \
|
||||||
systemd-sysctl \
|
systemd-sysctl \
|
||||||
systemd-hostnamed \
|
|
||||||
systemd-localed \
|
systemd-localed \
|
||||||
systemd-timedated \
|
systemd-timedated \
|
||||||
systemd-logind \
|
systemd-logind \
|
||||||
|
@ -182,6 +181,11 @@ rootlibexec_PROGRAMS += \
|
||||||
systemd-binfmt
|
systemd-binfmt
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
rootlibexec_PROGRAMS += \
|
||||||
|
systemd-hostnamed
|
||||||
|
endif
|
||||||
|
|
||||||
systemgenerator_PROGRAMS = \
|
systemgenerator_PROGRAMS = \
|
||||||
systemd-getty-generator
|
systemd-getty-generator
|
||||||
|
|
||||||
|
@ -226,18 +230,26 @@ dist_pkgsysconf_DATA = \
|
||||||
|
|
||||||
dist_dbuspolicy_DATA = \
|
dist_dbuspolicy_DATA = \
|
||||||
src/org.freedesktop.systemd1.conf \
|
src/org.freedesktop.systemd1.conf \
|
||||||
src/org.freedesktop.hostname1.conf \
|
|
||||||
src/org.freedesktop.locale1.conf \
|
src/org.freedesktop.locale1.conf \
|
||||||
src/org.freedesktop.timedate1.conf \
|
src/org.freedesktop.timedate1.conf \
|
||||||
src/org.freedesktop.login1.conf
|
src/org.freedesktop.login1.conf
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
dist_dbuspolicy_DATA += \
|
||||||
|
src/org.freedesktop.hostname1.conf
|
||||||
|
endif
|
||||||
|
|
||||||
dist_dbussystemservice_DATA = \
|
dist_dbussystemservice_DATA = \
|
||||||
src/org.freedesktop.systemd1.service \
|
src/org.freedesktop.systemd1.service \
|
||||||
src/org.freedesktop.hostname1.service \
|
|
||||||
src/org.freedesktop.locale1.service \
|
src/org.freedesktop.locale1.service \
|
||||||
src/org.freedesktop.timedate1.service \
|
src/org.freedesktop.timedate1.service \
|
||||||
src/org.freedesktop.login1.service
|
src/org.freedesktop.login1.service
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
dist_dbussystemservice_DATA += \
|
||||||
|
src/org.freedesktop.hostname1.service
|
||||||
|
endif
|
||||||
|
|
||||||
dist_udevrules_DATA = \
|
dist_udevrules_DATA = \
|
||||||
src/70-uaccess.rules \
|
src/70-uaccess.rules \
|
||||||
src/71-seat.rules
|
src/71-seat.rules
|
||||||
|
@ -260,10 +272,14 @@ dbusinterface_DATA = \
|
||||||
org.freedesktop.systemd1.Snapshot.xml \
|
org.freedesktop.systemd1.Snapshot.xml \
|
||||||
org.freedesktop.systemd1.Swap.xml \
|
org.freedesktop.systemd1.Swap.xml \
|
||||||
org.freedesktop.systemd1.Path.xml \
|
org.freedesktop.systemd1.Path.xml \
|
||||||
org.freedesktop.hostname1.xml \
|
|
||||||
org.freedesktop.locale1.xml \
|
org.freedesktop.locale1.xml \
|
||||||
org.freedesktop.timedate1.xml
|
org.freedesktop.timedate1.xml
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
dbusinterface_DATA += \
|
||||||
|
org.freedesktop.hostname1.xml
|
||||||
|
endif
|
||||||
|
|
||||||
dist_bashcompletion_DATA = \
|
dist_bashcompletion_DATA = \
|
||||||
src/systemctl-bash-completion.sh
|
src/systemctl-bash-completion.sh
|
||||||
|
|
||||||
|
@ -348,7 +364,6 @@ nodist_systemunit_DATA = \
|
||||||
units/systemd-initctl.service \
|
units/systemd-initctl.service \
|
||||||
units/systemd-logger.service \
|
units/systemd-logger.service \
|
||||||
units/systemd-shutdownd.service \
|
units/systemd-shutdownd.service \
|
||||||
units/systemd-hostnamed.service \
|
|
||||||
units/systemd-localed.service \
|
units/systemd-localed.service \
|
||||||
units/systemd-timedated.service \
|
units/systemd-timedated.service \
|
||||||
units/systemd-logind.service \
|
units/systemd-logind.service \
|
||||||
|
@ -384,6 +399,11 @@ nodist_systemunit_DATA += \
|
||||||
units/systemd-binfmt.service
|
units/systemd-binfmt.service
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
nodist_systemunit_DATA += \
|
||||||
|
units/systemd-hostnamed.service
|
||||||
|
endif
|
||||||
|
|
||||||
dist_userunit_DATA = \
|
dist_userunit_DATA = \
|
||||||
units/user/default.target \
|
units/user/default.target \
|
||||||
units/user/exit.target
|
units/user/exit.target
|
||||||
|
@ -399,7 +419,6 @@ EXTRA_DIST = \
|
||||||
units/systemd-initctl.service.in \
|
units/systemd-initctl.service.in \
|
||||||
units/systemd-logger.service.in \
|
units/systemd-logger.service.in \
|
||||||
units/systemd-shutdownd.service.in \
|
units/systemd-shutdownd.service.in \
|
||||||
units/systemd-hostnamed.service.in \
|
|
||||||
units/systemd-localed.service.in \
|
units/systemd-localed.service.in \
|
||||||
units/systemd-timedated.service.in \
|
units/systemd-timedated.service.in \
|
||||||
units/systemd-logind.service.in \
|
units/systemd-logind.service.in \
|
||||||
|
@ -443,6 +462,11 @@ EXTRA_DIST += \
|
||||||
units/systemd-binfmt.service.in
|
units/systemd-binfmt.service.in
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
EXTRA_DIST += \
|
||||||
|
units/systemd-hostnamed.service.in
|
||||||
|
endif
|
||||||
|
|
||||||
if TARGET_FEDORA
|
if TARGET_FEDORA
|
||||||
dist_systemunit_DATA += \
|
dist_systemunit_DATA += \
|
||||||
units/fedora/prefdm.service \
|
units/fedora/prefdm.service \
|
||||||
|
@ -505,11 +529,15 @@ pkgconfiglib_DATA = \
|
||||||
|
|
||||||
# Passed through intltool only
|
# Passed through intltool only
|
||||||
polkitpolicy_in_files = \
|
polkitpolicy_in_files = \
|
||||||
src/org.freedesktop.hostname1.policy.in \
|
|
||||||
src/org.freedesktop.locale1.policy.in \
|
src/org.freedesktop.locale1.policy.in \
|
||||||
src/org.freedesktop.timedate1.policy.in \
|
src/org.freedesktop.timedate1.policy.in \
|
||||||
src/org.freedesktop.login1.policy.in
|
src/org.freedesktop.login1.policy.in
|
||||||
|
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
polkitpolicy_in_files += \
|
||||||
|
src/org.freedesktop.hostname1.policy.in
|
||||||
|
endif
|
||||||
|
|
||||||
# First passed through sed, followed by intltool
|
# First passed through sed, followed by intltool
|
||||||
polkitpolicy_in_in_files = \
|
polkitpolicy_in_in_files = \
|
||||||
src/org.freedesktop.systemd1.policy.in.in
|
src/org.freedesktop.systemd1.policy.in.in
|
||||||
|
@ -1732,10 +1760,9 @@ endif
|
||||||
$(LN_S) graphical.target runlevel5.target && \
|
$(LN_S) graphical.target runlevel5.target && \
|
||||||
$(LN_S) reboot.target runlevel6.target )
|
$(LN_S) reboot.target runlevel6.target )
|
||||||
( cd $(DESTDIR)$(systemunitdir) && \
|
( cd $(DESTDIR)$(systemunitdir) && \
|
||||||
rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
|
rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
|
||||||
$(LN_S) graphical.target default.target && \
|
$(LN_S) graphical.target default.target && \
|
||||||
$(LN_S) reboot.target ctrl-alt-del.target && \
|
$(LN_S) reboot.target ctrl-alt-del.target && \
|
||||||
$(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service && \
|
|
||||||
$(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
|
$(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
|
||||||
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service && \
|
$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service && \
|
||||||
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
|
$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
|
||||||
|
@ -1783,6 +1810,11 @@ if ENABLE_BINFMT
|
||||||
proc-sys-fs-binfmt_misc.automount && \
|
proc-sys-fs-binfmt_misc.automount && \
|
||||||
$(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
|
$(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
|
||||||
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
|
$(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
|
||||||
|
endif
|
||||||
|
if ENABLE_HOSTNAMED
|
||||||
|
( cd $(DESTDIR)$(systemunitdir) && \
|
||||||
|
rm -f dbus-org.freedesktop.hostname1.service && \
|
||||||
|
$(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
|
||||||
endif
|
endif
|
||||||
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
|
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
|
||||||
rm -f systemd-tmpfiles-clean.timer && \
|
rm -f systemd-tmpfiles-clean.timer && \
|
||||||
|
|
|
@ -300,6 +300,13 @@ if test "x$enable_binfmt" != "xno"; then
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"])
|
AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"])
|
||||||
|
|
||||||
|
have_hostnamed=no
|
||||||
|
AC_ARG_ENABLE(hostnamed, AS_HELP_STRING([--disable-hostnamed], [disable hostname daemon]))
|
||||||
|
if test "x$enable_hostnamed" != "xno"; then
|
||||||
|
have_hostnamed=yes
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(ENABLE_HOSTNAMED, [test "$have_hostnamed" = "yes"])
|
||||||
|
|
||||||
have_gtk=no
|
have_gtk=no
|
||||||
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
|
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
|
||||||
if test "x$enable_gtk" != "xno"; then
|
if test "x$enable_gtk" != "xno"; then
|
||||||
|
@ -561,6 +568,7 @@ AC_MSG_RESULT([
|
||||||
SELinux: ${have_selinux}
|
SELinux: ${have_selinux}
|
||||||
ACL: ${have_acl}
|
ACL: ${have_acl}
|
||||||
binfmt: ${have_binfmt}
|
binfmt: ${have_binfmt}
|
||||||
|
hostnamed: ${have_hostnamed}
|
||||||
plymouth: ${have_plymouth}
|
plymouth: ${have_plymouth}
|
||||||
prefix: ${prefix}
|
prefix: ${prefix}
|
||||||
root dir: ${with_rootdir}
|
root dir: ${with_rootdir}
|
||||||
|
|
Loading…
Reference in a new issue