patch tizen_2.0_build
authorjy910.yun <jy910.yun@samsung.com>
Thu, 23 Aug 2012 08:51:49 +0000 (17:51 +0900)
committerjy910.yun <jy910.yun@samsung.com>
Thu, 23 Aug 2012 08:51:49 +0000 (17:51 +0900)
539 files changed:
CODING_STYLE [new file with mode: 0644]
Makefile.am
Makefile.in [deleted file]
NEWS [deleted file]
README
TODO
aclocal.m4 [deleted file]
autogen.sh [new file with mode: 0755]
compile [deleted file]
config.guess [deleted file]
config.h.in [deleted file]
config.sub [deleted file]
configure [deleted file]
configure.ac
debian/README.Debian [new file with mode: 0644]
debian/changelog [new file with mode: 0644]
debian/compat [new file with mode: 0644]
debian/control [new file with mode: 0644]
debian/copyright [new file with mode: 0644]
debian/debian-fixup [new file with mode: 0755]
debian/debian-fixup.service [new file with mode: 0644]
debian/ifup@.service [new file with mode: 0644]
debian/init-functions [new file with mode: 0644]
debian/lib-init-rw.automount [moved from sysctl.d/coredump.conf.in with 63% similarity]
debian/lib-init-rw.mount [new file with mode: 0644]
debian/libpam-systemd.install [new file with mode: 0644]
debian/libpam-systemd.postinst [new file with mode: 0644]
debian/libpam-systemd.prerm [new file with mode: 0644]
debian/libsystemd-daemon-dev.install [new file with mode: 0644]
debian/libsystemd-daemon0.install [new file with mode: 0644]
debian/libsystemd-daemon0.symbols [new file with mode: 0644]
debian/libsystemd-login-dev.install [new file with mode: 0644]
debian/libsystemd-login0.install [new file with mode: 0644]
debian/libsystemd-login0.symbols [new file with mode: 0644]
debian/pam-configs/systemd [new file with mode: 0644]
debian/rules [new file with mode: 0755]
debian/source/format [new file with mode: 0644]
debian/source/options [new file with mode: 0644]
debian/systemd-gui.install [new file with mode: 0644]
debian/systemd-hack-up-the-source.hook [new file with mode: 0755]
debian/systemd-sysv.install [new file with mode: 0644]
debian/systemd-sysv.links [new file with mode: 0644]
debian/systemd.dirs [new file with mode: 0644]
debian/systemd.install [new file with mode: 0644]
debian/systemd.links [new file with mode: 0644]
debian/systemd.postinst [new file with mode: 0644]
debian/systemd.postrm [new file with mode: 0644]
debian/systemd.preinst [new file with mode: 0644]
depcomp [deleted file]
install-sh [deleted file]
libsystemd-daemon.pc.in [moved from src/libsystemd-daemon.pc.in with 100% similarity]
libsystemd-login.pc.in [moved from src/login/libsystemd-login.pc.in with 100% similarity]
libsystemd_basic_la_vala.stamp [deleted file]
libsystemd_core_la_vala.stamp [deleted file]
libsystemd_daemon_la_vala.stamp [deleted file]
libsystemd_id128_la_vala.stamp [deleted file]
libsystemd_journal_la_vala.stamp [deleted file]
libsystemd_login_la_vala.stamp [deleted file]
ltmain.sh [deleted file]
m4/.gitignore [new file with mode: 0644]
m4/intltool.m4 [deleted file]
m4/libtool.m4 [deleted file]
m4/ltoptions.m4 [deleted file]
m4/ltsugar.m4 [deleted file]
m4/ltversion.m4 [deleted file]
m4/lt~obsolete.m4 [deleted file]
man/.gitignore [new file with mode: 0644]
man/Makefile [new symlink]
man/binfmt.d.5 [deleted file]
man/custom-html.xsl [deleted file]
man/daemon.7 [deleted file]
man/halt.8 [deleted file]
man/hostname.5 [deleted file]
man/hostname.xml
man/init.1 [deleted file]
man/locale.conf.5 [deleted file]
man/machine-id.5 [deleted file]
man/machine-info.5 [deleted file]
man/modules-load.d.5 [deleted file]
man/os-release.5 [deleted file]
man/os-release.xml
man/pam_systemd.8 [deleted file]
man/poweroff.8 [deleted file]
man/reboot.8 [deleted file]
man/runlevel.8 [deleted file]
man/sd-daemon.7 [deleted file]
man/sd-daemon.xml
man/sd-login.7 [deleted file]
man/sd-login.xml [deleted file]
man/sd-readahead.7 [deleted file]
man/sd-readahead.xml
man/sd_booted.3 [deleted file]
man/sd_booted.xml
man/sd_get_seats.3 [deleted file]
man/sd_get_seats.xml [deleted file]
man/sd_get_sessions.3 [deleted file]
man/sd_get_uids.3 [deleted file]
man/sd_is_fifo.3 [deleted file]
man/sd_is_fifo.xml
man/sd_is_mq.3 [deleted file]
man/sd_is_socket.3 [deleted file]
man/sd_is_socket_inet.3 [deleted file]
man/sd_is_socket_unix.3 [deleted file]
man/sd_listen_fds.3 [deleted file]
man/sd_listen_fds.xml
man/sd_login_monitor_flush.3 [deleted file]
man/sd_login_monitor_get_fd.3 [deleted file]
man/sd_login_monitor_new.3 [deleted file]
man/sd_login_monitor_new.xml [deleted file]
man/sd_login_monitor_unref.3 [deleted file]
man/sd_notify.3 [deleted file]
man/sd_notify.xml
man/sd_notifyf.3 [deleted file]
man/sd_pid_get_owner_uid.3 [deleted file]
man/sd_pid_get_session.3 [deleted file]
man/sd_pid_get_session.xml [deleted file]
man/sd_pid_get_unit.3 [deleted file]
man/sd_readahead.3 [deleted file]
man/sd_readahead.xml
man/sd_seat_can_multi_session.3 [deleted file]
man/sd_seat_get_active.3 [deleted file]
man/sd_seat_get_active.xml [deleted file]
man/sd_seat_get_sessions.3 [deleted file]
man/sd_session_get_seat.3 [deleted file]
man/sd_session_get_uid.3 [deleted file]
man/sd_session_is_active.3 [deleted file]
man/sd_session_is_active.xml [deleted file]
man/sd_uid_get_seats.3 [deleted file]
man/sd_uid_get_sessions.3 [deleted file]
man/sd_uid_get_state.3 [deleted file]
man/sd_uid_get_state.xml [deleted file]
man/sd_uid_is_on_seat.3 [deleted file]
man/shutdown.8 [deleted file]
man/sysctl.d.5 [deleted file]
man/systemadm.1 [deleted file]
man/systemctl.1 [deleted file]
man/systemd-ask-password.1 [deleted file]
man/systemd-cgls.1 [deleted file]
man/systemd-cgls.xml
man/systemd-cgtop.1 [deleted file]
man/systemd-cgtop.xml [deleted file]
man/systemd-loginctl.1 [deleted file]
man/systemd-logind.conf.5 [deleted file]
man/systemd-notify.1 [deleted file]
man/systemd-nspawn.1 [deleted file]
man/systemd-nspawn.xml
man/systemd-tmpfiles.8 [deleted file]
man/systemd-tmpfiles.xml
man/systemd.1 [deleted file]
man/systemd.automount.5 [deleted file]
man/systemd.conf.5 [deleted file]
man/systemd.conf.xml
man/systemd.device.5 [deleted file]
man/systemd.exec.5 [deleted file]
man/systemd.exec.xml
man/systemd.mount.5 [deleted file]
man/systemd.mount.xml
man/systemd.path.5 [deleted file]
man/systemd.path.xml
man/systemd.service.5 [deleted file]
man/systemd.service.xml
man/systemd.snapshot.5 [deleted file]
man/systemd.socket.5 [deleted file]
man/systemd.socket.xml
man/systemd.special.7.in [deleted file]
man/systemd.special.html.in [deleted file]
man/systemd.swap.5 [deleted file]
man/systemd.target.5 [deleted file]
man/systemd.timer.5 [deleted file]
man/systemd.unit.5 [deleted file]
man/systemd.unit.xml
man/systemd.xml
man/telinit.8 [deleted file]
man/timezone.5 [deleted file]
man/tmpfiles.d.5 [deleted file]
man/tmpfiles.d.xml
man/vconsole.conf.5 [deleted file]
missing [deleted file]
packaging/0002-systemd-fsck-disable-l-until-linux.patch [deleted file]
packaging/add-tmp.mount-as-tmpfs.patch [deleted file]
packaging/pamconsole-tmp.conf [deleted file]
packaging/systemd.changes [deleted file]
packaging/systemd.manifest [deleted file]
packaging/systemd.spec
packaging/tizen-login-location.patch [deleted file]
packaging/tizen-service-file-workaround.patch [deleted file]
pam_systemd_la_vala.stamp [deleted file]
po/.gitignore [new file with mode: 0644]
po/Makefile.in.in [deleted file]
po/POTFILES.in
po/POTFILES.skip
po/pl.po [new file with mode: 0644]
src/.gitignore [new file with mode: 0644]
src/70-uaccess.rules [moved from src/login/70-uaccess.rules with 100% similarity]
src/71-seat.rules [moved from src/login/71-seat.rules with 100% similarity]
src/73-seat-late.rules.in [moved from src/login/73-seat-late.rules.in with 100% similarity]
src/99-systemd.rules.in
src/Makefile [new file with mode: 0644]
src/acl-util.c [deleted file]
src/acl-util.h [deleted file]
src/ask-password-api.c
src/automount.c
src/automount.h
src/binfmt.c [moved from src/binfmt/binfmt.c with 100% similarity]
src/bridge.c
src/cgls.c
src/cgroup-show.c
src/cgroup-show.h
src/cgroup-util.c
src/cgroup-util.h
src/cgroup.c
src/cgroup.h
src/cgroups-agent.c
src/cgtop.c [deleted file]
src/condition.c
src/conf-parser.c
src/conf-parser.h
src/cryptsetup-generator.c [moved from src/cryptsetup/cryptsetup-generator.c with 97% similarity]
src/cryptsetup.c [moved from src/cryptsetup/cryptsetup.c with 100% similarity]
src/dbus-automount.c
src/dbus-automount.h
src/dbus-common.c
src/dbus-common.h
src/dbus-device.c
src/dbus-execute.c
src/dbus-execute.h
src/dbus-job.c
src/dbus-manager.c
src/dbus-mount.c
src/dbus-path.c
src/dbus-path.h
src/dbus-service.c
src/dbus-snapshot.c
src/dbus-socket.c
src/dbus-swap.c
src/dbus-target.c
src/dbus-timer.c
src/dbus-unit.c
src/dbus-unit.h
src/dbus.c
src/device.c
src/device.h
src/execute.c
src/execute.h
src/exit-status.c
src/exit-status.h
src/fsck.c
src/generate-kbd-model-map [new file with mode: 0755]
src/getty-generator.c
src/gnome-ask-password-agent.c [deleted file]
src/gnome-ask-password-agent.vala
src/hashmap.c
src/hashmap.h
src/hostname-setup.c
src/hostnamed.c [moved from src/hostname/hostnamed.c with 95% similarity]
src/initctl.c
src/install.c
src/job.c
src/journal/cat.c [deleted file]
src/journal/compress.c [deleted file]
src/journal/compress.h [deleted file]
src/journal/coredump.c [deleted file]
src/journal/journal-def.h [deleted file]
src/journal/journal-file.c [deleted file]
src/journal/journal-file.h [deleted file]
src/journal/journal-internal.h [deleted file]
src/journal/journal-rate-limit.c [deleted file]
src/journal/journal-rate-limit.h [deleted file]
src/journal/journal-send.c [deleted file]
src/journal/journalctl.c [deleted file]
src/journal/journald-gperf.gperf [deleted file]
src/journal/journald.c [deleted file]
src/journal/journald.h [deleted file]
src/journal/libsystemd-journal.pc.in [deleted file]
src/journal/libsystemd-journal.sym [deleted file]
src/journal/lookup3.c [deleted file]
src/journal/lookup3.h [deleted file]
src/journal/sd-journal.c [deleted file]
src/journal/systemd-journald.conf [deleted file]
src/journal/test-journal.c [deleted file]
src/kbd-model-map [moved from src/locale/kbd-model-map with 100% similarity]
src/kmod-setup.c
src/kmsg-syslogd.c [new file with mode: 0644]
src/label.c
src/libsystemd-id128.sym [deleted file]
src/libsystemd-login.sym [moved from src/login/libsystemd-login.sym with 78% similarity]
src/load-dropin.c
src/load-fragment-gperf.gperf.m4
src/load-fragment.c
src/load-fragment.h
src/locale-setup.c
src/localed.c [moved from src/locale/localed.c with 87% similarity]
src/log.c
src/log.h
src/login/multi-seat-x.c [deleted file]
src/loginctl.c [moved from src/login/loginctl.c with 99% similarity]
src/logind-acl.c [moved from src/login/logind-acl.c with 86% similarity]
src/logind-acl.h [moved from src/login/logind-acl.h with 100% similarity]
src/logind-dbus.c [moved from src/login/logind-dbus.c with 85% similarity]
src/logind-device.c [moved from src/login/logind-device.c with 100% similarity]
src/logind-device.h [moved from src/login/logind-device.h with 100% similarity]
src/logind-gperf.gperf [moved from src/login/logind-gperf.gperf with 100% similarity]
src/logind-seat-dbus.c [moved from src/login/logind-seat-dbus.c with 91% similarity]
src/logind-seat.c [moved from src/login/logind-seat.c with 92% similarity]
src/logind-seat.h [moved from src/login/logind-seat.h with 98% similarity]
src/logind-session-dbus.c [moved from src/login/logind-session-dbus.c with 80% similarity]
src/logind-session.c [moved from src/login/logind-session.c with 92% similarity]
src/logind-session.h [moved from src/login/logind-session.h with 90% similarity]
src/logind-user-dbus.c [moved from src/login/logind-user-dbus.c with 85% similarity]
src/logind-user.c [moved from src/login/logind-user.c with 98% similarity]
src/logind-user.h [moved from src/login/logind-user.h with 100% similarity]
src/logind.c [moved from src/login/logind.c with 94% similarity]
src/logind.h [moved from src/login/logind.h with 95% similarity]
src/logs-show.c [deleted file]
src/logs-show.h [deleted file]
src/machine-id-setup.c
src/macro.h
src/main.c
src/manager.c
src/manager.h
src/modules-load.c
src/mount.c
src/mount.h
src/namespace.c
src/notify.c
src/nspawn.c
src/org.freedesktop.hostname1.conf [moved from src/hostname/org.freedesktop.hostname1.conf with 100% similarity]
src/org.freedesktop.hostname1.policy.in [moved from src/hostname/org.freedesktop.hostname1.policy.in with 100% similarity]
src/org.freedesktop.hostname1.service [moved from src/hostname/org.freedesktop.hostname1.service with 100% similarity]
src/org.freedesktop.locale1.conf [moved from src/locale/org.freedesktop.locale1.conf with 100% similarity]
src/org.freedesktop.locale1.policy.in [moved from src/locale/org.freedesktop.locale1.policy.in with 100% similarity]
src/org.freedesktop.locale1.service [moved from src/locale/org.freedesktop.locale1.service with 100% similarity]
src/org.freedesktop.login1.conf [moved from src/login/org.freedesktop.login1.conf with 70% similarity]
src/org.freedesktop.login1.policy.in [moved from src/login/org.freedesktop.login1.policy.in with 100% similarity]
src/org.freedesktop.login1.service [moved from src/login/org.freedesktop.login1.service with 100% similarity]
src/org.freedesktop.timedate1.conf [moved from src/timedate/org.freedesktop.timedate1.conf with 100% similarity]
src/org.freedesktop.timedate1.policy.in [moved from src/timedate/org.freedesktop.timedate1.policy.in with 100% similarity]
src/org.freedesktop.timedate1.service [moved from src/timedate/org.freedesktop.timedate1.service with 100% similarity]
src/pam-module.c [moved from src/login/pam-module.c with 90% similarity]
src/path-lookup.c
src/path.c
src/path.h
src/polkit.c
src/polkit.h
src/quotacheck.c
src/random-seed.c
src/ratelimit.c
src/ratelimit.h
src/rc-local-generator.c [deleted file]
src/readahead-collect.c [moved from src/readahead/readahead-collect.c with 99% similarity]
src/readahead-common.c [moved from src/readahead/readahead-common.c with 100% similarity]
src/readahead-common.h [moved from src/readahead/readahead-common.h with 100% similarity]
src/readahead-replay.c [moved from src/readahead/readahead-replay.c with 95% similarity]
src/remount-api-vfs.c
src/reply-password.c
src/sd-daemon.c
src/sd-daemon.h [moved from src/systemd/sd-daemon.h with 96% similarity]
src/sd-id128.c [deleted file]
src/sd-login.c [moved from src/login/sd-login.c with 82% similarity]
src/sd-login.h [moved from src/systemd/sd-login.h with 85% similarity]
src/sd-readahead.c [moved from src/readahead/sd-readahead.c with 87% similarity]
src/sd-readahead.h [moved from src/systemd/sd-readahead.h with 87% similarity]
src/service.c
src/service.h
src/shutdown.c
src/shutdownd.c
src/snapshot.c
src/snapshot.h
src/socket.c
src/socket.h
src/special.h
src/stdout-syslog-bridge.c [new file with mode: 0644]
src/swap.c
src/swap.h
src/sysfs-show.c [moved from src/login/sysfs-show.c with 100% similarity]
src/system.conf
src/systemadm.c [deleted file]
src/systemadm.vala
src/systemctl-bash-completion.sh [new file with mode: 0644]
src/systemctl.c
src/systemd-bash-completion.sh [deleted file]
src/systemd-interfaces.c [deleted file]
src/systemd-logind.conf [moved from src/login/systemd-logind.conf with 100% similarity]
src/systemd/sd-id128.h [deleted file]
src/systemd/sd-journal.h [deleted file]
src/systemd/sd-messages.h [deleted file]
src/target.c
src/target.h
src/test-daemon.c
src/test-engine.c
src/test-id128.c [deleted file]
src/test-login.c [moved from src/login/test-login.c with 89% similarity]
src/timedated.c [moved from src/timedate/timedated.c with 90% similarity]
src/timer.c
src/timer.h
src/tmpfiles.c
src/tty-ask-password-agent.c
src/uaccess.c [moved from src/login/uaccess.c with 97% similarity]
src/unit.c
src/unit.h
src/update-utmp.c
src/user-sessions.c [moved from src/login/user-sessions.c with 98% similarity]
src/util.c
src/util.h
src/utmp-wtmp.c
src/utmp-wtmp.h
src/vconsole-setup.c [moved from src/vconsole/vconsole-setup.c with 99% similarity]
src/virt.c
src/wraplabel.c [deleted file]
src/wraplabel.vala [deleted file]
systemadm_vala.stamp [deleted file]
systemctl_vala.stamp [deleted file]
systemd.pc.in [moved from src/systemd.pc.in with 96% similarity]
systemd_ac_power_vala.stamp [deleted file]
systemd_ask_password_vala.stamp [deleted file]
systemd_binfmt_vala.stamp [deleted file]
systemd_cat_vala.stamp [deleted file]
systemd_cgls_vala.stamp [deleted file]
systemd_cgroups_agent_vala.stamp [deleted file]
systemd_cgtop_vala.stamp [deleted file]
systemd_coredump_vala.stamp [deleted file]
systemd_cryptsetup_generator_vala.stamp [deleted file]
systemd_cryptsetup_vala.stamp [deleted file]
systemd_detect_virt_vala.stamp [deleted file]
systemd_fsck_vala.stamp [deleted file]
systemd_getty_generator_vala.stamp [deleted file]
systemd_gnome_ask_password_agent_vala.stamp [deleted file]
systemd_hostnamed_vala.stamp [deleted file]
systemd_initctl_vala.stamp [deleted file]
systemd_journalctl_vala.stamp [deleted file]
systemd_journald_vala.stamp [deleted file]
systemd_localed_vala.stamp [deleted file]
systemd_loginctl_vala.stamp [deleted file]
systemd_logind_vala.stamp [deleted file]
systemd_machine_id_setup_vala.stamp [deleted file]
systemd_modules_load_vala.stamp [deleted file]
systemd_multi_seat_x_vala.stamp [deleted file]
systemd_notify_vala.stamp [deleted file]
systemd_nspawn_vala.stamp [deleted file]
systemd_quotacheck_vala.stamp [deleted file]
systemd_random_seed_vala.stamp [deleted file]
systemd_rc_local_generator_vala.stamp [deleted file]
systemd_readahead_collect_vala.stamp [deleted file]
systemd_readahead_replay_vala.stamp [deleted file]
systemd_remount_api_vfs_vala.stamp [deleted file]
systemd_reply_password_vala.stamp [deleted file]
systemd_shutdown_vala.stamp [deleted file]
systemd_shutdownd_vala.stamp [deleted file]
systemd_stdio_bridge_vala.stamp [deleted file]
systemd_sysctl_vala.stamp [deleted file]
systemd_timedated_vala.stamp [deleted file]
systemd_timestamp_vala.stamp [deleted file]
systemd_tmpfiles_vala.stamp [deleted file]
systemd_tty_ask_password_agent_vala.stamp [deleted file]
systemd_uaccess_vala.stamp [deleted file]
systemd_update_utmp_vala.stamp [deleted file]
systemd_user_sessions_vala.stamp [deleted file]
systemd_vala.stamp [deleted file]
systemd_vconsole_setup_vala.stamp [deleted file]
test1/default.target [new symlink]
test1/exec-demo.service [new file with mode: 0644]
test1/fifo-demo.service [new file with mode: 0644]
test1/fifo-demo.socket [new file with mode: 0644]
test1/mail-transfer-agent.service [new symlink]
test1/mail-transfer-agent.socket [new symlink]
test1/multiuser.target [new file with mode: 0644]
test1/multiuser.target.wants/exec-demo.service [new symlink]
test1/multiuser.target.wants/fifo-demo.socket [new symlink]
test1/multiuser.target.wants/mail-transfer-agent.socket [new symlink]
test1/multiuser.target.wants/permissions.service [new symlink]
test1/multiuser.target.wants/systemd-logger.socket [new symlink]
test1/permissions.service [new file with mode: 0644]
test1/postfix.service [new file with mode: 0644]
test1/postfix.socket [new file with mode: 0644]
test1/syslog.service [new file with mode: 0644]
test1/syslog.socket [new file with mode: 0644]
test1/systemd-logger.service [new file with mode: 0644]
test1/systemd-logger.socket [new file with mode: 0644]
test2/Makefile [new file with mode: 0644]
test2/a.service [new file with mode: 0644]
test2/b.service [new file with mode: 0644]
test2/c.service [new file with mode: 0644]
test2/d.service [new file with mode: 0644]
test2/e.service [new file with mode: 0644]
test2/f.service [new file with mode: 0644]
test2/g.service [new file with mode: 0644]
test2/h.service [new file with mode: 0644]
test_cgroup_vala.stamp [deleted file]
test_daemon_vala.stamp [deleted file]
test_engine_vala.stamp [deleted file]
test_env_replace_vala.stamp [deleted file]
test_hostname_vala.stamp [deleted file]
test_id128_vala.stamp [deleted file]
test_install_vala.stamp [deleted file]
test_job_type_vala.stamp [deleted file]
test_journal_vala.stamp [deleted file]
test_login_vala.stamp [deleted file]
test_loopback_vala.stamp [deleted file]
test_ns_vala.stamp [deleted file]
test_strv_vala.stamp [deleted file]
tmpfiles.d/legacy.conf
units/.gitignore [new file with mode: 0644]
units/Makefile [new symlink]
units/console-shell.service.m4
units/emergency.service
units/fedora/Makefile [new symlink]
units/fedora/prefdm.service
units/fedora/rc-local.service
units/fsck-root.service.in
units/fsck@.service.in
units/getty@.service.m4
units/mageia/prefdm.service [deleted file]
units/quotacheck.service.in
units/quotaon.service
units/remote-fs-pre.target
units/remount-rootfs.service
units/rescue.service.m4
units/serial-getty@.service.m4
units/slp/var-cache.automount [new file with mode: 0644]
units/slp/var-cache.mount [new file with mode: 0644]
units/slp/var-lib.automount [new file with mode: 0644]
units/slp/var-lib.mount [new file with mode: 0644]
units/slp/var-lock.mount [new file with mode: 0644]
units/slp/var-log.automount [new file with mode: 0644]
units/slp/var-log.mount [new file with mode: 0644]
units/suse/rc-local.service
units/syslog.socket
units/systemd-kmsg-syslogd.service.in [moved from src/libsystemd-id128.pc.in with 51% similarity]
units/systemd-logind.service.in
units/systemd-remount-api-vfs.service.in
units/systemd-shutdownd.socket
units/systemd-stdout-syslog-bridge.service.in [moved from units/systemd-journald.service.in with 65% similarity]
units/systemd-stdout-syslog-bridge.socket [moved from units/systemd-journald.socket with 71% similarity]
units/systemd-vconsole-setup.service.in
units/user/.gitignore [new file with mode: 0644]
units/user/Makefile [new symlink]
units/user@.service.in
units/var-lock.mount
units/var-run.mount

diff --git a/CODING_STYLE b/CODING_STYLE
new file mode 100644 (file)
index 0000000..9341b48
--- /dev/null
@@ -0,0 +1,27 @@
+
+- 8ch indent, no tabs
+
+- structs in MixedCase, variables, functions in lower_case
+
+- the destructors always unregister the object from the next bigger
+  object, not the other way around
+
+- to minimize strict aliasing violations we prefer unions over casting
+
+- for robustness reasons destructors should be able to destruct
+  half-initialized objects, too
+
+- error codes are returned as negative Exxx. i.e. return -EINVAL. There
+  are some exceptions: for constructors its is OK to return NULL on
+  OOM. For lookup functions NULL is fine too for "not found".
+
+- Do not issue NSS requests (that includes user name and host name
+  lookups) from the main daemon as this might trigger deadlocks when
+  we those lookups involve synchronously talking to services that we
+  would need to start up.
+
+- Do not access any directories outside of /etc/, /dev, /lib from the
+  init daemon to avoid deadlocks with the automounter.
+
+- Don't synchronously talk to any other service, due to risk of
+  deadlocks.
index 9762da1..1f29a92 100644 (file)
@@ -1,7 +1,6 @@
 #  This file is part of systemd.
 #
-#  Copyright 2011 Lennart Poettering
-#  Copyright 2011 Kay Sievers
+#  Copyright 2010 Lennart Poettering
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
@@ -20,22 +19,14 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=0
+LIBSYSTEMD_LOGIN_REVISION=6
+LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_REVISION=0
 LIBSYSTEMD_DAEMON_AGE=0
 
-LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=2
-LIBSYSTEMD_ID128_AGE=0
-
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=2
-LIBSYSTEMD_JOURNAL_AGE=0
-
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -52,28 +43,16 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
-sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
-rootprefix=@rootprefix@
-rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/systemd
+rootdir=@rootdir@
+rootbindir=$(rootdir)/bin
+rootlibexecdir=$(rootdir)/lib/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootprefix)/lib/systemd/system
-
-CLEANFILES =
-EXTRA_DIST =
-INSTALL_EXEC_HOOKS =
-UNINSTALL_EXEC_HOOKS =
-INSTALL_DATA_HOOKS =
-pkginclude_HEADERS =
-lib_LTLIBRARIES =
-pkgconfiglib_DATA =
-polkitpolicy_in_files =
-dist_udevrules_DATA =
+systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -86,25 +65,19 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
+       -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-       -DROOTPREFIX=\"$(rootprefix)\" \
        -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-       -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-        -DX_SERVER=\"$(bindir)/X\" \
-       -I $(top_srcdir)/src \
-       -I $(top_srcdir)/src/readahead \
-       -I $(top_srcdir)/src/login \
-       -I $(top_srcdir)/src/journal \
-       -I $(top_srcdir)/src/systemd
+        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+       -I $(top_srcdir)/src
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -142,12 +115,6 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/usr/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
-if TARGET_MAGEIA
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\" \
-       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
@@ -158,10 +125,11 @@ endif
 endif
 endif
 endif
-endif
 
 rootbin_PROGRAMS = \
+       systemd \
        systemctl \
+        systemd-loginctl \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
@@ -170,7 +138,6 @@ rootbin_PROGRAMS = \
 
 bin_PROGRAMS = \
        systemd-cgls \
-       systemd-cgtop \
        systemd-stdio-bridge \
        systemd-nspawn
 
@@ -184,24 +151,69 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-       systemd \
+       systemd-stdout-syslog-bridge \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
+       systemd-random-seed \
        systemd-shutdownd \
        systemd-shutdown \
        systemd-modules-load \
        systemd-remount-api-vfs \
+       systemd-kmsg-syslogd \
+       systemd-vconsole-setup \
        systemd-reply-password \
+       systemd-readahead-collect \
+       systemd-readahead-replay \
+       systemd-user-sessions \
        systemd-fsck \
+       systemd-quotacheck \
        systemd-timestamp \
        systemd-ac-power \
        systemd-detect-virt \
-       systemd-sysctl
+       systemd-sysctl \
+        systemd-logind \
+        systemd-uaccess
+
+if ENABLE_BINFMT
+rootlibexec_PROGRAMS += \
+       systemd-binfmt
+endif
+
+if ENABLE_HOSTNAMED
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+endif
+
+if ENABLE_TIMEDATED
+rootlibexec_PROGRAMS += \
+       systemd-timedated
+endif
+
+if ENABLE_LOCALED
+rootlibexec_PROGRAMS += \
+       systemd-localed
+endif
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+       systemd-cryptsetup
+
+systemgenerator_PROGRAMS += \
+       systemd-cryptsetup-generator
+endif
+
+lib_LTLIBRARIES = \
+       libsystemd-daemon.la \
+       libsystemd-login.la
+
+pkginclude_HEADERS = \
+       src/sd-daemon.h \
+       src/sd-login.h
+
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -212,20 +224,64 @@ noinst_PROGRAMS = \
        test-cgroup \
        test-env-replace \
        test-strv \
-       test-install
+        test-login \
+        test-install
+
+if HAVE_PAM
+pamlib_LTLIBRARIES = \
+       pam_systemd.la
+endif
 
 dist_pkgsysconf_DATA = \
        src/system.conf \
-       src/user.conf
+        src/user.conf \
+        src/systemd-logind.conf
 
 dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf
+       src/org.freedesktop.systemd1.conf \
+        src/org.freedesktop.login1.conf
+
+if ENABLE_HOSTNAMED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.hostname1.conf
+endif
+
+if ENABLE_TIMEDATED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.timedate1.conf
+endif
+
+if ENABLE_LOCALED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.locale1.conf
+endif
 
 dist_dbussystemservice_DATA = \
-       src/org.freedesktop.systemd1.service
+       src/org.freedesktop.systemd1.service \
+        src/org.freedesktop.login1.service
+
+if ENABLE_HOSTNAMED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.hostname1.service
+endif
+
+if ENABLE_TIMEDATED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.timedate1.service
+endif
+
+if ENABLE_LOCALED
+dist_dbussystemservice_DATA += \
+        src/org.freedesktop.locale1.service
+endif
+
+dist_udevrules_DATA = \
+        src/70-uaccess.rules \
+        src/71-seat.rules
 
 nodist_udevrules_DATA = \
-       src/99-systemd.rules
+        src/73-seat-late.rules \
+        src/99-systemd.rules
 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
@@ -242,8 +298,23 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml
 
+if ENABLE_HOSTNAMED
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+endif
+
+if ENABLE_TIMEDATED
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
+endif
+
+if ENABLE_LOCALED
+dbusinterface_DATA += \
+       org.freedesktop.locale1.xml
+endif
+
 dist_bashcompletion_DATA = \
-       src/systemd-bash-completion.sh
+       src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -266,9 +337,10 @@ dist_systemunit_DATA = \
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
-       units/local-fs-pre.target \
+        units/local-fs-pre.target \
        units/remote-fs.target \
-       units/remote-fs-pre.target \
+        units/remote-fs-pre.target \
+       units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
        units/mail-transfer-agent.target \
@@ -285,6 +357,7 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
+       units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
        units/dev-hugepages.mount \
@@ -300,6 +373,7 @@ dist_systemunit_DATA = \
        units/sound.target \
        units/bluetooth.target \
        units/smartcard.target \
+       units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
@@ -311,18 +385,34 @@ dist_systemunit_DATA += \
        units/var-lock.mount
 endif
 
+if ENABLE_BINFMT
+dist_systemunit_DATA += \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount
+endif
+
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
        units/console-shell.service \
        units/systemd-initctl.service \
+       units/systemd-stdout-syslog-bridge.service \
        units/systemd-shutdownd.service \
+       units/systemd-logind.service \
+       units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
+       units/systemd-vconsole-setup.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
+       units/systemd-random-seed-save.service \
+       units/systemd-random-seed-load.service \
+       units/systemd-readahead-collect.service \
+       units/systemd-readahead-replay.service \
+       units/systemd-readahead-done.service \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
+       units/systemd-user-sessions.service \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
@@ -332,8 +422,29 @@ nodist_systemunit_DATA = \
        units/kexec.service \
        units/fsck@.service \
        units/fsck-root.service \
+       units/quotacheck.service \
        units/rescue.service \
-       units/user@.service
+        units/user@.service
+
+if ENABLE_BINFMT
+nodist_systemunit_DATA += \
+       units/systemd-binfmt.service
+endif
+
+if ENABLE_HOSTNAMED
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+endif
+
+if ENABLE_TIMEDATED
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
+endif
+
+if ENABLE_LOCALED
+nodist_systemunit_DATA += \
+       units/systemd-localed.service
+endif
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -342,19 +453,29 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/exit.service
 
-EXTRA_DIST += \
+EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
+       units/systemd-stdout-syslog-bridge.service.in \
        units/systemd-shutdownd.service.in \
+       units/systemd-logind.service.in \
+       units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
+       units/systemd-vconsole-setup.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
+       units/systemd-random-seed-save.service.in \
+       units/systemd-random-seed-load.service.in \
+       units/systemd-readahead-collect.service.in \
+       units/systemd-readahead-replay.service.in \
+       units/systemd-readahead-done.service.in \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in \
+       units/systemd-user-sessions.service.in \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
@@ -365,19 +486,42 @@ EXTRA_DIST += \
        units/user/exit.service.in \
        units/fsck@.service.in \
        units/fsck-root.service.in \
+       units/quotacheck.service.in \
        units/user@.service.in \
-       src/systemd.pc.in \
+       systemd.pc.in \
+       libsystemd-daemon.pc.in \
+       libsystemd-login.pc.in \
+       src/libsystemd-daemon.sym \
+       src/libsystemd-login.sym \
        introspect.awk \
-       src/99-systemd.rules.in \
-       man/custom-html.xsl
+       src/73-seat-late.rules.in \
+        src/99-systemd.rules.in
+
+if ENABLE_BINFMT
+EXTRA_DIST += \
+       units/systemd-binfmt.service.in
+endif
+
+if ENABLE_HOSTNAMED
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
+if ENABLE_TIMEDATED
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
+
+if ENABLE_LOCALED
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+endif
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
 endif
 
 if TARGET_MANDRIVA
@@ -385,8 +529,17 @@ dist_systemunit_DATA += \
        units/mandriva/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
+endif
+
+if TARGET_SLP
+dist_systemunit_DATA += \
+       units/slp/var-lib.mount \
+       units/slp/var-lib.automount \
+       units/slp/var-cache.mount \
+       units/slp/var-cache.automount \
+       units/slp/var-log.mount \
+       units/slp/var-log.automount \
+       units/slp/var-lock.mount
 endif
 
 if TARGET_FRUGALWARE
@@ -398,17 +551,6 @@ if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/rc-local.service \
        units/suse/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
-
-if TARGET_MAGEIA
-dist_systemunit_DATA += \
-       units/mageia/prefdm.service \
-       units/fedora/rc-local.service \
-       units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
 endif
 
 if HAVE_PLYMOUTH
@@ -432,24 +574,50 @@ endif
 
 dist_doc_DATA = \
        README \
-        NEWS \
        LICENSE \
-       DISTRO_PORTING
+       DISTRO_PORTING \
+       src/sd-daemon.h \
+       src/sd-daemon.c \
+       src/sd-readahead.h \
+       src/sd-readahead.c
 
 pkgconfigdata_DATA = \
-       src/systemd.pc
+       systemd.pc
+
+pkgconfiglib_DATA = \
+        libsystemd-daemon.pc \
+        libsystemd-login.pc
+
+# Passed through intltool only
+polkitpolicy_in_files = \
+        src/org.freedesktop.login1.policy.in
+
+if ENABLE_HOSTNAMED
+polkitpolicy_in_files += \
+       src/org.freedesktop.hostname1.policy.in
+endif
+
+if ENABLE_TIMEDATED
+polkitpolicy_in_files += \
+       src/org.freedesktop.timedate1.policy.in
+endif
+
+if ENABLE_LOCALED
+polkitpolicy_in_files += \
+        src/org.freedesktop.locale1.policy.in
+endif
 
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
        src/org.freedesktop.systemd1.policy.in.in
 
 nodist_polkitpolicy_DATA = \
-       $(polkitpolicy_in_files:.policy.in=.policy) \
-       $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+        $(polkitpolicy_in_files:.policy.in=.policy) \
+        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
 
 EXTRA_DIST += \
-       $(polkitpolicy_in_files) \
-       $(polkitpolicy_in_in_files)
+        $(polkitpolicy_in_files) \
+        $(polkitpolicy_in_in_files)
 
 @INTLTOOL_POLICY_RULE@
 
@@ -459,7 +627,7 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
-       src/virt.c \
+        src/virt.c \
        src/label.c \
        src/hashmap.c \
        src/set.c \
@@ -527,18 +695,17 @@ libsystemd_core_la_SOURCES = \
        src/tcpwrap.c \
        src/cgroup-util.c \
        src/condition.c \
-       src/dbus-common.c \
-       src/sd-daemon.c \
-       src/install.c \
-       src/cgroup-attr.c \
-       src/sd-id128.c
+        src/dbus-common.c \
+        src/sd-daemon.c \
+        src/install.c \
+        src/cgroup-attr.c
 
 nodist_libsystemd_core_la_SOURCES = \
-       src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c
+        src/load-fragment-gperf.c \
+        src/load-fragment-gperf-nulstr.c
 
 EXTRA_DIST += \
-       src/load-fragment-gperf.gperf.m4
+        src/load-fragment-gperf.gperf.m4
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -546,8 +713,7 @@ libsystemd_core_la_CFLAGS = \
        $(UDEV_CFLAGS) \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
-       $(AUDIT_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AUDIT_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
@@ -556,76 +722,16 @@ libsystemd_core_la_LIBADD = \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
-       $(CAP_LIBS) \
-       $(KMOD_LIBS)
+       $(CAP_LIBS)
 
 # This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs. We therefore can't
+# rules for C programs, but not Vala programs.  We therefore can't
 # list the .h files as dependencies if we want make dist to work.
 
 EXTRA_DIST += \
-       src/util.h \
-       src/virt.h \
-       src/label.h \
-       src/hashmap.h \
-       src/set.h \
-       src/strv.h \
-       src/conf-parser.h \
-       src/socket-util.h \
-       src/log.h \
-       src/ratelimit.h \
-       src/exit-status.h \
-       src/unit.h \
-       src/job.h \
-       src/manager.h \
-       src/path-lookup.h \
-       src/load-fragment.h \
-       src/service.h \
-       src/automount.h \
-       src/mount.h \
-       src/swap.h \
-       src/device.h \
-       src/target.h \
-       src/snapshot.h \
-       src/socket.h \
-       src/timer.h \
-       src/path.h \
-       src/load-dropin.h \
-       src/execute.h \
-       src/utmp-wtmp.h \
-       src/dbus.h \
-       src/dbus-manager.h \
-       src/dbus-unit.h \
-       src/dbus-job.h \
-       src/dbus-service.h \
-       src/dbus-socket.h \
-       src/dbus-timer.h \
-       src/dbus-target.h \
-       src/dbus-mount.h \
-       src/dbus-automount.h \
-       src/dbus-swap.h \
-       src/dbus-snapshot.h \
-       src/dbus-device.h \
-       src/dbus-execute.h \
-       src/dbus-path.h \
-       src/cgroup.h \
-       src/mount-setup.h \
-       src/hostname-setup.h \
-       src/selinux-setup.h \
-       src/loopback-setup.h \
-       src/kmod-setup.h \
-       src/locale-setup.h \
-       src/machine-id-setup.h \
-       src/specifier.h \
-       src/unit-name.h \
-       src/fdset.h \
-       src/namespace.h \
-       src/tcpwrap.h \
-       src/cgroup-util.h \
-       src/condition.h \
-       src/dbus-common.h \
-       src/install.h \
-       src/cgroup-attr.h \
+       ${libsystemd_basic_la_SOURCES:.c=.h} \
+       ${libsystemd_core_la_SOURCES:.c=.h} \
+       ${libsystemd_daemon_la_SOURCES:.c=.h} \
        src/macro.h \
        src/def.h \
        src/ioprio.h \
@@ -635,6 +741,7 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/linux/fanotify.h \
        src/initreq.h \
+       src/sd-readahead.h \
        src/special.h \
        src/dbus-common.h \
        src/bus-errors.h \
@@ -642,24 +749,34 @@ EXTRA_DIST += \
        src/build.h \
        src/shutdownd.h \
        src/umount.h \
+       src/readahead-common.h \
        src/ask-password-api.h \
-       src/pager.h \
-       src/sysfs-show.h \
-       src/polkit.h \
-       src/dbus-loop.h \
-       src/spawn-agent.h \
-       src/acl-util.h \
-       src/logs-show.h
+        src/pager.h \
+        src/sysfs-show.h \
+        src/polkit.h \
+        src/logind.h \
+        src/logind-device.h \
+        src/logind-seat.h \
+        src/logind-session.h \
+        src/logind-user.h \
+        src/logind-acl.h \
+        src/dbus-loop.h \
+        src/spawn-agent.h
 
+if HAVE_XSLTPROC
 MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-cgls.1 \
-       man/systemd-cgtop.1 \
        man/systemd-nspawn.1 \
        man/systemd-tmpfiles.8 \
        man/systemd-notify.1 \
+       man/sd_notify.3 \
+       man/sd_readahead.3 \
+       man/sd_booted.3 \
+       man/sd_listen_fds.3 \
+       man/sd_is_fifo.3 \
        man/systemd.unit.5 \
        man/systemd.service.5 \
        man/systemd.socket.5 \
@@ -673,33 +790,50 @@ MANPAGES = \
        man/systemd.snapshot.5 \
        man/systemd.exec.5 \
        man/daemon.7 \
+       man/sd-daemon.7 \
+       man/sd-readahead.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
        man/shutdown.8 \
        man/pam_systemd.8 \
        man/systemd.conf.5 \
+       man/systemd-logind.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
-       man/timezone.5 \
+        man/timezone.5 \
        man/machine-id.5 \
+       man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
-       man/machine-info.5 \
+        man/machine-info.5 \
        man/modules-load.d.5 \
        man/sysctl.d.5 \
-       man/systemd-ask-password.1
+        man/systemd-ask-password.1 \
+        man/systemd-loginctl.1
+
+if ENABLE_BINFMT
+MANPAGES += \
+       man/binfmt.d.5
+endif
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
+       man/sd_is_socket.3 \
+       man/sd_is_socket_unix.3 \
+       man/sd_is_socket_inet.3 \
+       man/sd_notifyf.3 \
        man/init.1
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
+man/sd_is_socket.3: man/sd_is_fifo.3
+man/sd_is_socket_unix.3: man/sd_is_fifo.3
+man/sd_is_socket_inet.3: man/sd_is_fifo.3
+man/sd_notifyf.3: man/sd_notify.3
 man/init.1: man/systemd.1
 
-if ENABLE_MANPAGES
 dist_man_MANS = \
        $(MANPAGES) \
        $(MANPAGES_ALIAS)
@@ -780,12 +914,18 @@ test_cgroup_SOURCES = \
        src/test-cgroup.c \
        src/cgroup-util.c
 
+test_cgroup_CFLAGS = \
+       $(AM_CFLAGS)
+
 test_cgroup_LDADD = \
        libsystemd-basic.la
 
 test_env_replace_SOURCES = \
        src/test-env-replace.c
 
+test_env_replace_CFLAGS = \
+       $(AM_CFLAGS)
+
 test_env_replace_LDADD = \
        libsystemd-basic.la
 
@@ -793,22 +933,44 @@ test_strv_SOURCES = \
        src/test-strv.c \
        src/specifier.c
 
+test_strv_CFLAGS = \
+       $(AM_CFLAGS)
+
 test_strv_LDADD = \
        libsystemd-basic.la
 
+test_login_SOURCES = \
+       src/test-login.c
+
+test_login_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_login_LDADD = \
+       libsystemd-basic.la \
+        libsystemd-login.la
+
 test_install_SOURCES = \
        src/test-install.c \
-       src/install.c \
-       src/path-lookup.c \
-       src/unit-name.c
+        src/install.c \
+        src/path-lookup.c \
+        src/unit-name.c
 
 test_install_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
        libsystemd-basic.la
 
+systemd_stdout_syslog_bridge_SOURCES = \
+       src/stdout-syslog-bridge.c \
+       src/tcpwrap.c
+
+systemd_stdout_syslog_bridge_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(LIBWRAP_LIBS)
+
 systemd_initctl_SOURCES = \
        src/initctl.c \
        src/dbus-common.c
@@ -837,6 +999,15 @@ systemd_update_utmp_LDADD = \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
+systemd_random_seed_SOURCES = \
+       src/random-seed.c
+
+systemd_random_seed_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_random_seed_LDADD = \
+       libsystemd-basic.la
+
 systemd_shutdownd_SOURCES = \
        src/utmp-wtmp.c \
        src/shutdownd.c
@@ -848,39 +1019,148 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
-systemd_shutdown_SOURCES = \
-       src/mount-setup.c \
-       src/umount.c \
-       src/shutdown.c
+systemd_hostnamed_SOURCES = \
+       src/hostnamed.c \
+        src/dbus-common.c \
+        src/polkit.c
 
-systemd_shutdown_CFLAGS = \
+systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(DBUS_CFLAGS)
 
-systemd_shutdown_LDADD = \
+systemd_hostnamed_LDADD = \
        libsystemd-basic.la \
-       $(UDEV_LIBS)
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
 
-systemd_modules_load_SOURCES = \
-       src/modules-load.c
+systemd_localed_SOURCES = \
+       src/localed.c \
+        src/dbus-common.c \
+        src/polkit.c
 
-systemd_modules_load_CFLAGS = \
-       $(KMOD_CFLAGS)
+systemd_localed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
 
-systemd_modules_load_LDADD = \
+systemd_localed_LDADD = \
        libsystemd-basic.la \
-       $(KMOD_LIBS)
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
 
-systemd_tmpfiles_SOURCES = \
-       src/tmpfiles.c
+dist_pkgdata_DATA = \
+        src/kbd-model-map
 
-systemd_tmpfiles_LDADD = \
-       libsystemd-basic.la
+dist_noinst_SCRIPT = \
+        src/generate-kbd-model-map
 
-systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup.c \
-       src/machine-id-main.c \
-       src/sd-id128.c
+systemd_timedated_SOURCES = \
+       src/timedated.c \
+        src/dbus-common.c \
+        src/polkit.c
+
+systemd_timedated_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_timedated_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
+systemd_logind_SOURCES = \
+       src/logind.c \
+       src/logind-dbus.c \
+        src/logind-device.c \
+        src/logind-seat.c \
+        src/logind-seat-dbus.c \
+        src/logind-session.c \
+        src/logind-session-dbus.c \
+        src/logind-user.c \
+        src/logind-user-dbus.c \
+        src/dbus-common.c \
+        src/dbus-loop.c \
+        src/cgroup-util.c \
+        src/polkit.c
+
+nodist_systemd_logind_SOURCES = \
+        src/logind-gperf.c
+
+EXTRA_DIST += \
+        src/logind-gperf.gperf
+
+systemd_logind_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_logind_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS) \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
+systemd_uaccess_SOURCES = \
+       src/uaccess.c
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+       src/logind-acl.c
+
+systemd_uaccess_SOURCES += \
+       src/logind-acl.c
+endif
+
+systemd_uaccess_CFLAGS = \
+       $(AM_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_uaccess_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       libsystemd-login.la \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
+systemd_shutdown_SOURCES = \
+       src/mount-setup.c \
+       src/umount.c \
+       src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
+systemd_modules_load_SOURCES = \
+       src/modules-load.c
+
+systemd_modules_load_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_modules_load_LDADD = \
+       libsystemd-basic.la
+
+systemd_tmpfiles_SOURCES = \
+       src/tmpfiles.c
+
+systemd_tmpfiles_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_tmpfiles_LDADD = \
+       libsystemd-basic.la
+
+systemd_machine_id_setup_SOURCES = \
+       src/machine-id-setup.c \
+       src/machine-id-main.c
+
+systemd_machine_id_setup_CFLAGS = \
+       $(AM_CFLAGS)
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-basic.la
@@ -888,9 +1168,21 @@ systemd_machine_id_setup_LDADD = \
 systemd_sysctl_SOURCES = \
        src/sysctl.c
 
+systemd_sysctl_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_sysctl_LDADD = \
        libsystemd-basic.la
 
+systemd_binfmt_SOURCES = \
+       src/binfmt.c
+
+systemd_binfmt_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_binfmt_LDADD = \
+       libsystemd-basic.la
+
 systemd_fsck_SOURCES = \
        src/fsck.c \
        src/dbus-common.c
@@ -905,9 +1197,21 @@ systemd_fsck_LDADD = \
        $(UDEV_LIBS) \
        $(DBUS_LIBS)
 
+systemd_quotacheck_SOURCES = \
+       src/quotacheck.c
+
+systemd_quotacheck_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_quotacheck_LDADD = \
+       libsystemd-basic.la
+
 systemd_timestamp_SOURCES = \
        src/timestamp.c
 
+systemd_timestamp_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_timestamp_LDADD = \
        libsystemd-basic.la
 
@@ -925,20 +1229,63 @@ systemd_ac_power_LDADD = \
 systemd_detect_virt_SOURCES = \
        src/detect-virt.c
 
+systemd_detect_virt_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_detect_virt_LDADD = \
        libsystemd-basic.la
 
+systemd_cryptsetup_SOURCES = \
+       src/cryptsetup.c \
+       src/ask-password-api.c
+
+systemd_cryptsetup_CFLAGS = \
+       $(LIBCRYPTSETUP_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(AM_CFLAGS)
+
+systemd_cryptsetup_LDADD = \
+       $(LIBCRYPTSETUP_LIBS) \
+       $(UDEV_LIBS) \
+       libsystemd-basic.la
+
+systemd_cryptsetup_generator_SOURCES = \
+       src/cryptsetup-generator.c \
+       src/unit-name.c
+
+systemd_cryptsetup_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_cryptsetup_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_getty_generator_SOURCES = \
        src/getty-generator.c \
        src/unit-name.c
 
+systemd_getty_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_getty_generator_LDADD = \
        libsystemd-basic.la
 
-systemd_rc_local_generator_SOURCES = \
-       src/rc-local-generator.c
+systemd_user_sessions_SOURCES = \
+       src/user-sessions.c \
+       src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_user_sessions_LDADD = \
+       libsystemd-basic.la
+
+systemd_vconsole_setup_SOURCES = \
+       src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+       $(AM_CFLAGS)
 
-systemd_rc_local_generator_LDADD = \
+systemd_vconsole_setup_LDADD = \
        libsystemd-basic.la
 
 systemd_remount_api_vfs_SOURCES = \
@@ -946,6 +1293,9 @@ systemd_remount_api_vfs_SOURCES = \
        src/mount-setup.c \
        src/exit-status.c
 
+systemd_remount_api_vfs_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_remount_api_vfs_LDADD = \
        libsystemd-basic.la
 
@@ -961,6 +1311,17 @@ systemd_cgroups_agent_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+systemd_kmsg_syslogd_SOURCES = \
+       src/kmsg-syslogd.c \
+       src/fdset.c
+
+systemd_kmsg_syslogd_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_kmsg_syslogd_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
+
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
@@ -970,10 +1331,9 @@ systemctl_SOURCES = \
        src/cgroup-util.c \
        src/exit-status.c \
        src/unit-name.c \
-       src/pager.c \
-       src/install.c \
-       src/spawn-agent.c \
-       src/logs-show.c
+        src/pager.c \
+        src/install.c \
+        src/spawn-agent.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -982,13 +1342,29 @@ systemctl_CFLAGS = \
 systemctl_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
        $(DBUS_LIBS)
 
+systemd_loginctl_SOURCES = \
+       src/loginctl.c \
+       src/dbus-common.c \
+       src/cgroup-show.c \
+       src/cgroup-util.c \
+        src/pager.c \
+        src/sysfs-show.c
+
+systemd_loginctl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS)
+
+systemd_loginctl_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS) \
+        $(UDEV_LIBS)
+
 systemd_notify_SOURCES = \
        src/notify.c \
-       src/readahead/sd-readahead.c
+       src/sd-readahead.c
 
 systemd_notify_LDADD = \
        libsystemd-basic.la \
@@ -1007,921 +1383,125 @@ systemd_reply_password_SOURCES = \
 systemd_reply_password_LDADD = \
        libsystemd-basic.la
 
-systemd_cgls_SOURCES = \
-       src/cgls.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c
-
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
-
-systemd_cgtop_SOURCES = \
-       src/cgtop.c \
-        src/cgroup-util.c
-
-systemd_cgtop_LDADD = \
-       libsystemd-basic.la
+systemd_readahead_collect_SOURCES = \
+       src/readahead-collect.c \
+       src/readahead-common.c
 
-systemd_nspawn_SOURCES = \
-       src/nspawn.c \
-       src/cgroup-util.c \
-       src/loopback-setup.c
+systemd_readahead_collect_CFLAGS = \
+       $(UDEV_CFLAGS)
 
-systemd_nspawn_LDADD = \
+systemd_readahead_collect_LDADD = \
        libsystemd-basic.la \
-       libsystemd-daemon.la
-
-systemd_stdio_bridge_SOURCES = \
-       src/bridge.c
-
-systemd_stdio_bridge_LDADD = \
-       libsystemd-basic.la
-
-systemadm_SOURCES = \
-       src/systemadm.vala \
-       src/systemd-interfaces.vala \
-       src/wraplabel.vala
-
-systemadm_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
-
-systemadm_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=gee-1.0 \
-       -g
-
-systemadm_LDADD = \
-       $(GTK_LIBS)
-
-systemd_gnome_ask_password_agent_SOURCES = \
-       src/gnome-ask-password-agent.vala
-
-systemd_gnome_ask_password_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBNOTIFY_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
-
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=linux \
-       --pkg=gio-unix-2.0 \
-       --pkg=libnotify \
-       -g
-
-systemd_gnome_ask_password_agent_LDADD = \
-       $(LIBNOTIFY_LIBS) \
-       $(GTK_LIBS)
-
-systemd_tty_ask_password_agent_SOURCES = \
-       src/tty-ask-password-agent.c \
-       src/ask-password-api.c \
-       src/utmp-wtmp.c
-
-systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-basic.la
-
-# ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
-
-libsystemd_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden \
-       -DSD_EXPORT_SYMBOLS
+       libsystemd-daemon.la \
+       $(UDEV_LIBS)
 
-libsystemd_daemon_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+systemd_readahead_replay_SOURCES = \
+       src/readahead-replay.c \
+       src/readahead-common.c
 
-pkginclude_HEADERS += \
-       src/systemd/sd-daemon.h
+systemd_readahead_replay_CFLAGS = \
+       $(UDEV_CFLAGS)
 
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
-       fi
+systemd_readahead_replay_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(UDEV_LIBS)
 
-INSTALL_EXEC_HOOKS += \
-       libsystemd-daemon-install-hook
-
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-daemon-uninstall-hook
-
-lib_LTLIBRARIES += \
-       libsystemd-daemon.la
-
-pkgconfiglib_DATA += \
-       src/libsystemd-daemon.pc
-
-MANPAGES += \
-       man/sd-daemon.7 \
-       man/sd_notify.3 \
-       man/sd_listen_fds.3 \
-       man/sd_is_fifo.3 \
-       man/sd_booted.3
-
-MANPAGES_ALIAS += \
-       man/sd_is_socket.3 \
-       man/sd_is_socket_unix.3 \
-       man/sd_is_socket_inet.3 \
-       man/sd_is_mq.3 \
-       man/sd_notifyf.3
-
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_is_mq.3: man/sd_is_fifo.3
-man/sd_notifyf.3: man/sd_notify.3
-
-EXTRA_DIST += \
-       src/libsystemd-daemon.pc.in \
-       src/libsystemd-daemon.sym
-
-# ------------------------------------------------------------------------------
-libsystemd_id128_la_SOURCES = \
-       src/sd-id128.c
-
-libsystemd_id128_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_id128_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
-
-libsystemd_id128_la_LIBADD = \
-       libsystemd-basic.la
-
-test_id128_SOURCES = \
-       src/test-id128.c \
-       src/sd-id128.c
-
-test_id128_LDADD = \
-       libsystemd-basic.la
-
-noinst_PROGRAMS += \
-       test-id128
-
-pkginclude_HEADERS += \
-       src/systemd/sd-id128.h
-
-lib_LTLIBRARIES += \
-       libsystemd-id128.la
-
-pkgconfiglib_DATA += \
-       src/libsystemd-id128.pc
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-id128-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-INSTALL_EXEC_HOOKS += \
-       libsystemd-id128-install-hook
-
-libsystemd-id128-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
-
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-id128-uninstall-hook
-
-EXTRA_DIST += \
-       src/libsystemd-id128.pc.in \
-       src/libsystemd-id128.sym
-
-# ------------------------------------------------------------------------------
-systemd_journald_SOURCES = \
-       src/journal/journald.c \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/journal/journal-rate-limit.c \
-       src/sd-id128.c \
-       src/cgroup-util.c
-
-if HAVE_ACL
-systemd_journald_SOURCES += \
-       src/acl-util.c
-endif
-
-nodist_systemd_journald_SOURCES = \
-       src/journal/journald-gperf.c
-
-systemd_journald_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(ACL_CFLAGS)
-
-systemd_journald_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-login.la \
-       $(ACL_LIBS)
-
-if HAVE_XZ
-systemd_journald_SOURCES += \
-       src/journal/compress.c
-systemd_journald_CFLAGS += \
-       $(XZ_CFLAGS)
-systemd_journald_LDADD += \
-       $(XZ_LIBS)
-endif
-
-systemd_cat_SOURCES = \
-       src/journal/cat.c
-
-systemd_cat_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-journal.la
-
-systemd_journalctl_SOURCES = \
-       src/journal/journalctl.c \
-       src/pager.c \
-       src/logs-show.c
-
-systemd_journalctl_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la
-
-if HAVE_XZ
-systemd_journalctl_SOURCES += \
-       src/journal/compress.c
-systemd_journalctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS)
-systemd_journalctl_LDADD += \
-       $(XZ_LIBS)
-endif
-
-test_journal_SOURCES = \
-       src/journal/test-journal.c \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/journal/journal-send.c \
-       src/sd-id128.c
-
-test_journal_LDADD = \
-       libsystemd-basic.la
-
-if HAVE_XZ
-test_journal_SOURCES += \
-       src/journal/compress.c
-
-test_journal_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(XZ_CFLAGS)
-
-test_journal_LDADD += \
-       $(XZ_LIBS)
-endif
-
-libsystemd_journal_la_SOURCES = \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/lookup3.c \
-       src/journal/journal-send.c
-
-libsystemd_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_journal_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
-
-libsystemd_journal_la_LIBADD = \
-       libsystemd-basic.la \
-       libsystemd-id128.la
-
-if HAVE_XZ
-libsystemd_journal_la_SOURCES += \
-       src/journal/compress.c
-
-libsystemd_journal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_la_LIBADD += \
-       $(XZ_LIBS)
-endif
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-journal-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-INSTALL_EXEC_HOOKS += \
-       libsystemd-journal-install-hook
-
-libsystemd-journal-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-journal-uninstall-hook
-
-noinst_PROGRAMS += \
-       test-journal
-
-pkginclude_HEADERS += \
-       src/systemd/sd-journal.h \
-       src/systemd/sd-messages.h
-
-lib_LTLIBRARIES += \
-       libsystemd-journal.la
-
-rootlibexec_PROGRAMS += \
-       systemd-journald
-
-rootbin_PROGRAMS += \
-       systemd-journalctl
-
-bin_PROGRAMS += \
-       systemd-cat
-
-dist_systemunit_DATA += \
-       units/systemd-journald.socket
-
-nodist_systemunit_DATA += \
-       units/systemd-journald.service
-
-dist_pkgsysconf_DATA += \
-       src/journal/systemd-journald.conf
-
-pkgconfiglib_DATA += \
-       src/journal/libsystemd-journal.pc
-
-journal-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/sockets.target.wants \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-journald.socket && \
-               $(LN_S) ../systemd-journald.socket )
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-journald.service && \
-               $(LN_S) ../systemd-journald.service )
-
-INSTALL_DATA_HOOKS += \
-       journal-install-data-hook
-
-EXTRA_DIST += \
-       src/journal/journald.h \
-       src/journal/journal-def.h \
-       src/journal/journal-internal.h \
-       src/journal/journal-file.h \
-       src/journal/lookup3.h \
-       src/journal/compress.h \
-       src/journal/journal-rate-limit.h \
-       src/journal/libsystemd-journal.pc.in \
-       src/journal/libsystemd-journal.sym \
-       units/systemd-journald.service.in \
-       src/journal/journald-gperf.gperf
-
-CLEANFILES += \
-       src/journal/journald-gperf.c
-
-# ------------------------------------------------------------------------------
-if ENABLE_COREDUMP
-systemd_coredump_SOURCES = \
-       src/journal/coredump.c
-
-systemd_coredump_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-journal.la \
-       libsystemd-login.la
-
-rootlibexec_PROGRAMS += \
-       systemd-coredump
-
-sysctl_DATA = \
-       sysctl.d/coredump.conf
-
-EXTRA_DIST += \
-       sysctl.d/coredump.conf.in
-
-CLEANFILES += \
-       sysctl.d/coredump.conf
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_BINFMT
-systemd_binfmt_SOURCES = \
-       src/binfmt/binfmt.c
-
-systemd_binfmt_LDADD = \
-       libsystemd-basic.la
-
-rootlibexec_PROGRAMS += \
-       systemd-binfmt
-
-dist_systemunit_DATA += \
-       units/proc-sys-fs-binfmt_misc.automount \
-       units/proc-sys-fs-binfmt_misc.mount
-
-nodist_systemunit_DATA += \
-       units/systemd-binfmt.service
-
-binfmt-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(prefix)/lib/binfmt.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-binfmt.service \
-                       proc-sys-fs-binfmt_misc.automount && \
-               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
-               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
-
-INSTALL_DATA_HOOKS += \
-       binfmt-install-data-hook
-
-MANPAGES += \
-       man/binfmt.d.5
-
-EXTRA_DIST += \
-       units/systemd-binfmt.service.in
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_VCONSOLE
-systemd_vconsole_setup_SOURCES = \
-       src/vconsole/vconsole-setup.c
-
-systemd_vconsole_setup_LDADD = \
-       libsystemd-basic.la
-
-rootlibexec_PROGRAMS += \
-       systemd-vconsole-setup
-
-nodist_systemunit_DATA += \
-       units/systemd-vconsole-setup.service
-
-vconsole-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-vconsole-setup.service && \
-               $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
-
-INSTALL_DATA_HOOKS += \
-       vconsole-install-data-hook
-
-MANPAGES += \
-       man/vconsole.conf.5
-
-EXTRA_DIST += \
-       units/systemd-vconsole-setup.service.in
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_READAHEAD
-systemd_readahead_collect_SOURCES = \
-       src/readahead/readahead-collect.c \
-       src/readahead/readahead-common.c
-
-systemd_readahead_collect_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(UDEV_LIBS)
-
-systemd_readahead_collect_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_readahead_replay_SOURCES = \
-       src/readahead/readahead-replay.c \
-       src/readahead/readahead-common.c
-
-systemd_readahead_replay_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_readahead_replay_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(UDEV_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-readahead-collect \
-       systemd-readahead-replay
-
-dist_systemunit_DATA += \
-       units/systemd-readahead-done.timer
-
-nodist_systemunit_DATA += \
-       units/systemd-readahead-collect.service \
-       units/systemd-readahead-replay.service \
-       units/systemd-readahead-done.service
-
-EXTRA_DIST += \
-       src/systemd/sd-readahead.h \
-       src/readahead/readahead-common.h \
-       units/systemd-readahead-collect.service.in \
-       units/systemd-readahead-replay.service.in \
-       units/systemd-readahead-done.service.in
-
-MANPAGES += \
-       man/sd_readahead.3 \
-       man/sd-readahead.7
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_QUOTACHECK
-rootlibexec_PROGRAMS += \
-       systemd-quotacheck
-
-nodist_systemunit_DATA += \
-       units/quotacheck.service
-
-EXTRA_DIST += \
-       units/quotacheck.service.in
-
-systemd_quotacheck_SOURCES = \
-       src/quotacheck.c
-
-systemd_quotacheck_LDADD = \
-       libsystemd-basic.la
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_RANDOMSEED
-rootlibexec_PROGRAMS += \
-       systemd-random-seed
-
-nodist_systemunit_DATA += \
-       units/systemd-random-seed-save.service \
-       units/systemd-random-seed-load.service
-
-EXTRA_DIST += \
-       units/systemd-random-seed-save.service.in \
-       units/systemd-random-seed-load.service.in
-
-systemd_random_seed_SOURCES = \
-       src/random-seed.c
-
-systemd_random_seed_LDADD = \
-       libsystemd-basic.la
-
-randomseed-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-               rm -f systemd-random-seed-save.service && \
-               $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-random-seed-load.service && \
-               $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service )
-
-INSTALL_DATA_HOOKS += \
-       randomseed-install-data-hook
-endif
-
-# ------------------------------------------------------------------------------
-if HAVE_LIBCRYPTSETUP
-rootlibexec_PROGRAMS += \
-       systemd-cryptsetup
-
-systemgenerator_PROGRAMS += \
-       systemd-cryptsetup-generator
-
-dist_systemunit_DATA += \
-       units/cryptsetup.target
-
-systemd_cryptsetup_SOURCES = \
-       src/cryptsetup/cryptsetup.c \
-       src/ask-password-api.c
-
-systemd_cryptsetup_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBCRYPTSETUP_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_cryptsetup_LDADD = \
-       $(LIBCRYPTSETUP_LIBS) \
-       $(UDEV_LIBS) \
-       libsystemd-basic.la
-
-systemd_cryptsetup_generator_SOURCES = \
-       src/cryptsetup/cryptsetup-generator.c \
-       src/unit-name.c
-
-systemd_cryptsetup_generator_LDADD = \
-       libsystemd-basic.la
-
-cryptsetup-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f cryptsetup.target && \
-               $(LN_S) ../cryptsetup.target cryptsetup.target )
-
-INSTALL_DATA_HOOKS += \
-       cryptsetup-install-data-hook
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_HOSTNAMED
-systemd_hostnamed_SOURCES = \
-       src/hostname/hostnamed.c \
-       src/dbus-common.c \
-       src/polkit.c
-
-systemd_hostnamed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_hostnamed_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-hostnamed
-
-nodist_systemunit_DATA += \
-       units/systemd-hostnamed.service
-
-dist_dbuspolicy_DATA += \
-       src/hostname/org.freedesktop.hostname1.conf
-
-dist_dbussystemservice_DATA += \
-       src/hostname/org.freedesktop.hostname1.service
-
-polkitpolicy_in_files += \
-       src/hostname/org.freedesktop.hostname1.policy.in
-
-dbusinterface_DATA += \
-       org.freedesktop.hostname1.xml
-
-org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-hostnamed-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.hostname1.service && \
-               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
-
-INSTALL_DATA_HOOKS += \
-       hostnamed-install-data-hook
-
-EXTRA_DIST += \
-       units/systemd-hostnamed.service.in
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_LOCALED
-systemd_localed_SOURCES = \
-       src/locale/localed.c \
-       src/dbus-common.c \
-       src/polkit.c
-
-systemd_localed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_localed_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
-
-nodist_systemunit_DATA += \
-       units/systemd-localed.service
-
-rootlibexec_PROGRAMS += \
-       systemd-localed
-
-dist_dbuspolicy_DATA += \
-       src/locale/org.freedesktop.locale1.conf
-
-dist_dbussystemservice_DATA += \
-       src/locale/org.freedesktop.locale1.service
-
-polkitpolicy_in_files += \
-       src/locale/org.freedesktop.locale1.policy.in
-
-dbusinterface_DATA += \
-       org.freedesktop.locale1.xml
-
-org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-localed-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.locale1.service && \
-               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
-
-INSTALL_DATA_HOOKS += \
-       localed-install-data-hook
-
-EXTRA_DIST += \
-       units/systemd-localed.service.in
-
-dist_pkgdata_DATA = \
-       src/locale/kbd-model-map
-
-dist_noinst_SCRIPT = \
-       src/locale/generate-kbd-model-map
-
-update-kbd-model-map:
-       src/locale/generate-kbd-model-map > src/locale/kbd-model-map
-
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_TIMEDATED
-systemd_timedated_SOURCES = \
-       src/timedate/timedated.c \
-       src/dbus-common.c \
-       src/polkit.c
-
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_timedated_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-timedated
-
-dist_dbussystemservice_DATA += \
-       src/timedate/org.freedesktop.timedate1.service
-
-dist_dbuspolicy_DATA += \
-       src/timedate/org.freedesktop.timedate1.conf
-
-nodist_systemunit_DATA += \
-       units/systemd-timedated.service
-
-polkitpolicy_in_files += \
-       src/timedate/org.freedesktop.timedate1.policy.in
-
-org.freedesktop.timedate1.xml: systemd-timedated
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-dbusinterface_DATA += \
-       org.freedesktop.timedate1.xml
-
-timedated-install-data-hook:
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.timedate1.service  && \
-               $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
-
-INSTALL_DATA_HOOKS += \
-       timedated-install-data-hook
-
-EXTRA_DIST += \
-       units/systemd-timedated.service.in
-endif
-
-# ------------------------------------------------------------------------------
-if ENABLE_LOGIND
-systemd_logind_SOURCES = \
-       src/login/logind.c \
-       src/login/logind-dbus.c \
-       src/login/logind-device.c \
-       src/login/logind-seat.c \
-       src/login/logind-seat-dbus.c \
-       src/login/logind-session.c \
-       src/login/logind-session-dbus.c \
-       src/login/logind-user.c \
-       src/login/logind-user-dbus.c \
-       src/dbus-common.c \
-       src/dbus-loop.c \
+systemd_cgls_SOURCES = \
+       src/cgls.c \
+       src/cgroup-show.c \
        src/cgroup-util.c \
-       src/polkit.c
-
-nodist_systemd_logind_SOURCES = \
-       src/login/logind-gperf.c
-
-if HAVE_ACL
-systemd_logind_SOURCES += \
-       src/login/logind-acl.c \
-       src/acl-util.c
-endif
-
-systemd_logind_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(ACL_CFLAGS)
-
-systemd_logind_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS) \
-       $(ACL_LIBS)
-
-systemd_user_sessions_SOURCES = \
-       src/login/user-sessions.c \
-       src/cgroup-util.c
+        src/pager.c
 
-systemd_user_sessions_LDADD = \
-       libsystemd-basic.la
+systemd_cgls_CFLAGS = \
+       $(AM_CFLAGS)
 
-rootlibexec_PROGRAMS += \
-       systemd-logind \
-       systemd-user-sessions
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
 
-systemd_loginctl_SOURCES = \
-       src/login/loginctl.c \
-       src/login/sysfs-show.c \
-       src/dbus-common.c \
-       src/cgroup-show.c \
+systemd_nspawn_SOURCES = \
+       src/nspawn.c \
        src/cgroup-util.c \
-       src/pager.c
+        src/loopback-setup.c
 
-systemd_loginctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS)
 
-systemd_loginctl_LDADD = \
+systemd_nspawn_LDADD = \
        libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS)
+       libsystemd-daemon.la
 
-rootbin_PROGRAMS += \
-       systemd-loginctl
+systemd_stdio_bridge_SOURCES = \
+       src/bridge.c
 
-test_login_SOURCES = \
-       src/login/test-login.c
+systemd_stdio_bridge_LDADD = \
+       libsystemd-basic.la
 
-test_login_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-login.la
+systemadm_SOURCES = \
+       src/systemadm.vala \
+       src/systemd-interfaces.vala
+
+systemadm_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
 
-noinst_PROGRAMS += \
-       test-login
+systemadm_VALAFLAGS = \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       -g
 
-libsystemd_login_la_SOURCES = \
-       src/login/sd-login.c \
-       src/cgroup-util.c
+systemadm_LDADD = \
+       $(GTK_LIBS)
 
-libsystemd_login_la_CFLAGS = \
+systemd_gnome_ask_password_agent_SOURCES = \
+       src/gnome-ask-password-agent.vala
+
+systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
-       -fvisibility=hidden
+       $(LIBNOTIFY_CFLAGS) \
+       $(GTK_CFLAGS) \
+       -Wno-unused-variable \
+       -Wno-unused-function \
+       -Wno-shadow \
+       -Wno-format-nonliteral
 
-libsystemd_login_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
+systemd_gnome_ask_password_agent_VALAFLAGS = \
+       --pkg=posix \
+       --pkg=gtk+-2.0 \
+       --pkg=linux \
+       --pkg=gio-unix-2.0 \
+       --pkg=libnotify
+if LIBNOTIFY07
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -D LIBNOTIFY07
+endif
+systemd_gnome_ask_password_agent_VALAFLAGS += \
+       -g
 
-libsystemd_login_la_LIBADD = \
+systemd_gnome_ask_password_agent_LDADD = \
+       $(LIBNOTIFY_LIBS) \
+       $(GTK_LIBS)
+
+systemd_tty_ask_password_agent_SOURCES = \
+       src/tty-ask-password-agent.c \
+       src/ask-password-api.c \
+       src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
        libsystemd-basic.la
 
-if HAVE_PAM
 pam_systemd_la_SOURCES = \
-       src/login/pam-module.c \
-       src/dbus-common.c
+       src/pam-module.c \
+        src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       $(DBUS_CFLAGS) \
+        $(PAM_CFLAGS) \
+        $(DBUS_CFLAGS) \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -1935,183 +1515,66 @@ pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(PAM_LIBS) \
-       $(DBUS_LIBS)
+        $(DBUS_LIBS)
 
-pamlib_LTLIBRARIES = \
-       pam_systemd.la
-endif
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
+libsystemd_daemon_la_CFLAGS = \
+        $(AM_CFLAGS) \
+       -fvisibility=hidden \
+        -DSD_EXPORT_SYMBOLS
+
+libsystemd_daemon_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-login-install-hook:
+libsystemd-daemon-install-hook:
        if test "$(libdir)" != "$(rootlibdir)"; then \
                mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
                so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
        fi
 
-INSTALL_EXEC_HOOKS += \
-       libsystemd-login-install-hook
-
-libsystemd-login-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
-
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-login-uninstall-hook
-
-nodist_systemunit_DATA += \
-       units/systemd-logind.service \
-       units/systemd-user-sessions.service
-
-dist_dbussystemservice_DATA += \
-       src/login/org.freedesktop.login1.service
-
-dist_dbuspolicy_DATA += \
-       src/login/org.freedesktop.login1.conf
-
-dist_pkgsysconf_DATA += \
-       src/login/systemd-logind.conf
-
-pkginclude_HEADERS += \
-       src/systemd/sd-login.h
-
-lib_LTLIBRARIES += \
-       libsystemd-login.la
-
-pkgconfiglib_DATA += \
-       src/login/libsystemd-login.pc
-
-polkitpolicy_in_files += \
-       src/login/org.freedesktop.login1.policy.in
-
-logind-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-                $(DESTDIR)$(localstatedir)/lib/systemd
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f dbus-org.freedesktop.login1.service && \
-               $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f systemd-logind.service systemd-user-sessions.service && \
-               $(LN_S) ../systemd-logind.service systemd-logind.service && \
-               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
-
-INSTALL_DATA_HOOKS += \
-       logind-install-data-hook
-
-systemd_multi_seat_x_SOURCES = \
-       src/login/multi-seat-x.c
-
-systemd_multi_seat_x_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_multi_seat_x_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-multi-seat-x
-
-systemd_uaccess_SOURCES = \
-       src/login/uaccess.c
-
-if HAVE_ACL
-systemd_uaccess_SOURCES += \
-       src/login/logind-acl.c \
-       src/acl-util.c
-endif
-
-systemd_uaccess_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(ACL_CFLAGS)
-
-systemd_uaccess_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-login.la \
-       $(UDEV_LIBS) \
-       $(ACL_LIBS)
-
-rootlibexec_PROGRAMS += \
-       systemd-uaccess
+libsystemd-daemon-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
-dist_udevrules_DATA += \
-       src/login/70-uaccess.rules
+libsystemd_login_la_SOURCES = \
+        src/sd-login.c \
+        src/cgroup-util.c
 
-dist_udevrules_DATA += \
-       src/login/71-seat.rules
+libsystemd_login_la_CFLAGS = \
+        $(AM_CFLAGS) \
+       -fvisibility=hidden
 
-nodist_udevrules_DATA += \
-       src/login/73-seat-late.rules
+libsystemd_login_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+        -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
 
-MANPAGES += \
-       man/systemd-logind.conf.5 \
-       man/sd-login.7 \
-       man/systemd-loginctl.1 \
-       man/sd_login_monitor_new.3 \
-       man/sd_pid_get_session.3 \
-       man/sd_uid_get_state.3 \
-       man/sd_session_is_active.3 \
-       man/sd_seat_get_active.3 \
-       man/sd_get_seats.3
-
-MANPAGES_ALIAS += \
-       man/sd_login_monitor_unref.3 \
-       man/sd_login_monitor_flush.3 \
-       man/sd_login_monitor_get_fd.3 \
-       man/sd_session_get_uid.3 \
-       man/sd_session_get_seat.3 \
-       man/sd_pid_get_owner_uid.3 \
-       man/sd_pid_get_unit.3 \
-       man/sd_uid_is_on_seat.3 \
-       man/sd_uid_get_sessions.3 \
-       man/sd_uid_get_seats.3 \
-       man/sd_seat_get_sessions.3 \
-       man/sd_seat_can_multi_session.3 \
-       man/sd_get_sessions.3 \
-       man/sd_get_uids.3
-
-man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
-man/sd_session_get_uid.3: man/sd_session_is_active.3
-man/sd_session_get_seat.3: man/sd_session_is_active.3
-man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_pid_get_unit.3: man/sd_pid_get_session.3
-man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
-man/sd_uid_get_seats.3: man/sd_uid_get_state.3
-man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
-man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
-man/sd_get_sessions.3: man/sd_get_seats.3
-man/sd_get_uids.3: man/sd_get_seats.3
+libsystemd_login_la_LIBADD = \
+       libsystemd-basic.la
 
-EXTRA_DIST += \
-       src/login/logind-gperf.gperf \
-       src/login/libsystemd-login.pc.in \
-       src/login/libsystemd-login.sym \
-       src/login/logind.h \
-       src/login/logind-device.h \
-       src/login/logind-seat.h \
-       src/login/logind-session.h \
-       src/login/logind-user.h \
-       src/login/logind-acl.h \
-       src/login/73-seat-late.rules.in \
-       units/systemd-logind.service.in \
-       units/systemd-user-sessions.service.in
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-login-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+       fi
 
-CLEANFILES += \
-       src/login/logind-gperf.c \
-       src/login/73-seat-late.rules
-endif
-# ------------------------------------------------------------------------------
+libsystemd-login-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+       $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                -e 's,@rootbindir\@,$(rootbindir),g' \
                -e 's,@bindir\@,$(bindir),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
@@ -2136,9 +1599,6 @@ units/%: units/%.in Makefile
 man/%: man/%.in Makefile
        $(SED_PROCESS)
 
-sysctl.d/%: sysctl.d/%.in Makefile
-       $(SED_PROCESS)
-
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
@@ -2158,7 +1618,7 @@ src/%: src/%.m4
 
 src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+        $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
 
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -2174,7 +1634,7 @@ units/%: units/%.m4 Makefile
 units/user/%: units/%.m4 Makefile
        $(M4_PROCESS_USER)
 
-CLEANFILES += \
+CLEANFILES = \
        $(nodist_systemunit_DATA) \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
@@ -2182,10 +1642,12 @@ CLEANFILES += \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA) \
-       src/load-fragment-gperf.gperf \
-       src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c \
-       src/99-systemd.rules
+        src/73-seat-late.rules \
+        src/99-systemd.rules \
+        src/load-fragment-gperf.gperf \
+        src/load-fragment-gperf.c \
+        src/load-fragment-gperf-nulstr.c \
+        src/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -2195,7 +1657,7 @@ endif
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
        --nonet \
-       --stringparam funcsynopsis.style ansi
+       --param funcsynopsis.style "'ansi'"
 
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -2208,11 +1670,11 @@ XSLTPROC_PROCESS_MAN_IN = \
 
 XSLTPROC_PROCESS_HTML = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \
+       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
        mv ${@:.in=} $@
 
 man/%.1: man/%.xml
@@ -2265,10 +1727,25 @@ org.freedesktop.systemd1.%.xml: systemd
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
+org.freedesktop.hostname1.xml: systemd-hostnamed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.locale1.xml: systemd-localed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.timedate1.xml: systemd-timedated
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
 CLEANFILES += \
        $(dbusinterface_DATA)
 
-systemd-install-data-hook:
+install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
                $(DESTDIR)$(sysconfdir)/tmpfiles.d \
@@ -2279,6 +1756,11 @@ systemd-install-data-hook:
                $(DESTDIR)$(systemshutdowndir) \
                $(DESTDIR)$(systemgeneratordir) \
                $(DESTDIR)$(usergeneratordir)
+if ENABLE_BINFMT
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d
+endif
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(userunitdir) \
@@ -2306,9 +1788,11 @@ systemd-install-data-hook:
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-shutdownd.socket && \
+               rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
+               $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
+               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
+               $(LN_S) ../syslog.socket syslog.socket )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -2325,8 +1809,10 @@ systemd-install-data-hook:
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-               rm -f systemd-update-utmp-shutdown.service && \
-               $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
+               rm -f systemd-update-utmp-shutdown.service \
+                       systemd-random-seed-save.service && \
+               $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
+               $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-api-vfs.service \
                        fsck-root.service \
@@ -2355,41 +1841,71 @@ systemd-install-data-hook:
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target autovt@.service && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.login1.service autovt@.service && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target && \
-               $(LN_S) getty@.service autovt@.service )
+                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
+                $(LN_S) getty@.service autovt@.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target systemd-ask-password-wall.path && \
+               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path systemd-logind.service && \
                $(LN_S) ../getty.target getty.target && \
-               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f getty@tty1.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
+               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
+               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path && \
+                $(LN_S) ../systemd-logind.service systemd-logind.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.mount \
                        dev-mqueue.mount \
-                       sys-kernel-config.mount \
+                        sys-kernel-config.mount \
                        sys-kernel-debug.mount \
                        sys-kernel-security.mount \
                        sys-fs-fuse-connections.mount \
+                       systemd-vconsole-setup.service \
                        systemd-modules-load.service \
+                       systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
-                       systemd-ask-password-console.path && \
+                       systemd-ask-password-console.path \
+                       systemd-kmsg-syslogd.service \
+                       cryptsetup.target && \
                $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
                $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
-               $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
+                $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
                $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
                $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
                $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
+               $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
+               $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-               $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
+               $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
+               $(LN_S) ../systemd-kmsg-syslogd.service && \
+               $(LN_S) ../cryptsetup.target cryptsetup.target )
+if ENABLE_BINFMT
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-binfmt.service \
+                       proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+               $(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
+if ENABLE_TIMEDATED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+endif
+if ENABLE_LOCALED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.locale1.service && \
+                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
+endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -2441,6 +1957,9 @@ endif
 
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
@@ -2455,6 +1974,9 @@ endif
 
 if TARGET_MANDRIVA
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
@@ -2468,6 +1990,30 @@ if TARGET_MANDRIVA
                $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
+if TARGET_SLP
+       rm -rf $(DESTDIR)$(systemunitdir)/runlevel?.target*
+
+       ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+               rm -f fsck-root.service media.mount && \
+               $(LN_S) ../var-lib.automount var-lib.automount && \
+               $(LN_S) ../var-cache.automount var-cache.automount && \
+               $(LN_S) ../var-log.automount var-log.automount && \
+               $(LN_S) ../var-lock.mount var-lock.mount )
+
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+               rm -f getty@tty1.service serial-getty@serial_console && \
+               $(LN_S) $(systemunitdir)/serial-getty@.service serial-getty@serial_console.service )
+
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f   proc-sys-fs-binfmt_misc.automount \
+                       sys-kernel-security.automount \
+                       cryptsetup.target )
+else
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+               rm -f getty@tty1.service && \
+                       $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
+endif
+
 if TARGET_DEBIAN_OR_UBUNTU
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel5.target && \
@@ -2476,6 +2022,9 @@ endif
 
 if TARGET_SUSE
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
@@ -2484,31 +2033,15 @@ if TARGET_SUSE
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 endif
 
-if TARGET_MAGEIA
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-               rm -f halt-local.service && \
-               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service && \
-               $(LN_S) prefdm.service display-manager.service && \
-               $(LN_S) prefdm.service dm.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-endif
-
 if HAVE_SYSV_COMPAT
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f var-lock.mount && \
                $(LN_S) ../var-lock.mount var-lock.mount )
 endif
 
-install-exec-hook: $(INSTALL_EXEC_HOOKS)
+install-exec-hook: libsystemd-daemon-install-hook libsystemd-login-install-hook
 
-uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
-
-install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
+uninstall-hook: libsystemd-daemon-uninstall-hook libsystemd-login-uninstall-hook
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -2517,14 +2050,15 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-       --with-rootprefix=$$dc_install_base/$(prefix)
-
+       --with-rootdir=$$dc_install_base/$(rootdir)
 
 upload: all distcheck
-       cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
-       scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
-       scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
+       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
        scp man/*.html tango:public/systemd-man/
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+update-kbd-model-map:
+       src/generate-kbd-model-map > src/kbd-model-map
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644 (file)
index 1c4ae86..0000000
+++ /dev/null
@@ -1,8483 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#  This file is part of systemd.
-#
-#  Copyright 2011 Lennart Poettering
-#  Copyright 2011 Kay Sievers
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@TARGET_GENTOO_TRUE@am__append_1 = \
-@TARGET_GENTOO_TRUE@   -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-@TARGET_GENTOO_TRUE@   -DKBD_SETFONT=\"/usr/bin/setfont\" \
-@TARGET_GENTOO_TRUE@   -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ARCH_TRUE@@TARGET_GENTOO_FALSE@am__append_2 = \
-@TARGET_ARCH_TRUE@@TARGET_GENTOO_FALSE@        -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-@TARGET_ARCH_TRUE@@TARGET_GENTOO_FALSE@        -DKBD_SETFONT=\"/usr/bin/setfont\" \
-@TARGET_ARCH_TRUE@@TARGET_GENTOO_FALSE@        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@am__append_3 = \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@       -DKBD_SETFONT=\"/usr/bin/setfont\" \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_TRUE@@TARGET_GENTOO_FALSE@       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@am__append_4 = \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@        -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_TRUE@        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@am__append_5 = \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@    -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@    -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_TRUE@    -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_6 = \
-@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@     -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@     -DKBD_SETFONT=\"/usr/bin/setfont\" \
-@TARGET_ANGSTROM_TRUE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@     -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_7 = \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@        -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_TRUE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@am__append_8 = \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@       -DKBD_SETFONT=\"/bin/setfont\" \
-@TARGET_ANGSTROM_FALSE@@TARGET_ARCH_FALSE@@TARGET_FRUGALWARE_FALSE@@TARGET_GENTOO_FALSE@@TARGET_MAGEIA_FALSE@@TARGET_MANDRIVA_FALSE@@TARGET_MEEGO_FALSE@       -DDEFAULT_FONT=\"latarcyrheb-sun16\"
-
-rootbin_PROGRAMS = systemctl$(EXEEXT) systemd-notify$(EXEEXT) \
-       systemd-ask-password$(EXEEXT) \
-       systemd-tty-ask-password-agent$(EXEEXT) \
-       systemd-tmpfiles$(EXEEXT) systemd-machine-id-setup$(EXEEXT) \
-       systemd-journalctl$(EXEEXT) $(am__EXEEXT_3)
-bin_PROGRAMS = systemd-cgls$(EXEEXT) systemd-cgtop$(EXEEXT) \
-       systemd-stdio-bridge$(EXEEXT) systemd-nspawn$(EXEEXT) \
-       $(am__EXEEXT_1) systemd-cat$(EXEEXT)
-@HAVE_GTK_TRUE@am__append_9 = \
-@HAVE_GTK_TRUE@        systemadm \
-@HAVE_GTK_TRUE@        systemd-gnome-ask-password-agent
-
-rootlibexec_PROGRAMS = systemd$(EXEEXT) systemd-cgroups-agent$(EXEEXT) \
-       systemd-initctl$(EXEEXT) systemd-update-utmp$(EXEEXT) \
-       systemd-shutdownd$(EXEEXT) systemd-shutdown$(EXEEXT) \
-       systemd-modules-load$(EXEEXT) systemd-remount-api-vfs$(EXEEXT) \
-       systemd-reply-password$(EXEEXT) systemd-fsck$(EXEEXT) \
-       systemd-timestamp$(EXEEXT) systemd-ac-power$(EXEEXT) \
-       systemd-detect-virt$(EXEEXT) systemd-sysctl$(EXEEXT) \
-       systemd-journald$(EXEEXT) $(am__EXEEXT_4) $(am__EXEEXT_5) \
-       $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \
-       $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \
-       $(am__EXEEXT_12) $(am__EXEEXT_13) $(am__EXEEXT_14)
-systemgenerator_PROGRAMS = systemd-getty-generator$(EXEEXT) \
-       $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) \
-       $(am__EXEEXT_18) $(am__EXEEXT_19)
-noinst_PROGRAMS = test-engine$(EXEEXT) test-job-type$(EXEEXT) \
-       test-ns$(EXEEXT) test-loopback$(EXEEXT) test-hostname$(EXEEXT) \
-       test-daemon$(EXEEXT) test-cgroup$(EXEEXT) \
-       test-env-replace$(EXEEXT) test-strv$(EXEEXT) \
-       test-install$(EXEEXT) test-id128$(EXEEXT) \
-       test-journal$(EXEEXT) $(am__EXEEXT_2)
-@HAVE_SYSV_COMPAT_TRUE@am__append_10 = \
-@HAVE_SYSV_COMPAT_TRUE@        tmpfiles.d/legacy.conf
-
-@HAVE_SYSV_COMPAT_TRUE@am__append_11 = \
-@HAVE_SYSV_COMPAT_TRUE@        units/var-lock.mount
-
-@TARGET_FEDORA_TRUE@am__append_12 = \
-@TARGET_FEDORA_TRUE@   units/fedora/prefdm.service \
-@TARGET_FEDORA_TRUE@   units/fedora/rc-local.service \
-@TARGET_FEDORA_TRUE@   units/fedora/halt-local.service
-
-@TARGET_FEDORA_TRUE@am__append_13 = \
-@TARGET_FEDORA_TRUE@   systemd-rc-local-generator
-
-@TARGET_MANDRIVA_TRUE@am__append_14 = \
-@TARGET_MANDRIVA_TRUE@ units/mandriva/prefdm.service \
-@TARGET_MANDRIVA_TRUE@ units/fedora/rc-local.service \
-@TARGET_MANDRIVA_TRUE@ units/fedora/halt-local.service
-
-@TARGET_MANDRIVA_TRUE@am__append_15 = \
-@TARGET_MANDRIVA_TRUE@ systemd-rc-local-generator
-
-@TARGET_FRUGALWARE_TRUE@am__append_16 = \
-@TARGET_FRUGALWARE_TRUE@       units/frugalware/display-manager.service
-
-@TARGET_SUSE_TRUE@am__append_17 = \
-@TARGET_SUSE_TRUE@     units/suse/rc-local.service \
-@TARGET_SUSE_TRUE@     units/suse/halt-local.service
-
-@TARGET_SUSE_TRUE@am__append_18 = \
-@TARGET_SUSE_TRUE@     systemd-rc-local-generator
-
-@TARGET_MAGEIA_TRUE@am__append_19 = \
-@TARGET_MAGEIA_TRUE@   units/mageia/prefdm.service \
-@TARGET_MAGEIA_TRUE@   units/fedora/rc-local.service \
-@TARGET_MAGEIA_TRUE@   units/fedora/halt-local.service
-
-@TARGET_MAGEIA_TRUE@am__append_20 = \
-@TARGET_MAGEIA_TRUE@   systemd-rc-local-generator
-
-@HAVE_PLYMOUTH_TRUE@am__append_21 = \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-start.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-read-write.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-quit.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-quit-wait.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-reboot.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-kexec.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-poweroff.service \
-@HAVE_PLYMOUTH_TRUE@   units/plymouth-halt.service \
-@HAVE_PLYMOUTH_TRUE@   units/systemd-ask-password-plymouth.path
-
-@HAVE_PLYMOUTH_TRUE@am__append_22 = \
-@HAVE_PLYMOUTH_TRUE@   units/systemd-ask-password-plymouth.service
-
-@HAVE_PLYMOUTH_TRUE@am__append_23 = \
-@HAVE_PLYMOUTH_TRUE@   units/systemd-ask-password-plymouth.service.in
-
-@ENABLE_MANPAGES_TRUE@am__append_24 = \
-@ENABLE_MANPAGES_TRUE@ $(XML_FILES) \
-@ENABLE_MANPAGES_TRUE@ $(XML_IN_FILES) \
-@ENABLE_MANPAGES_TRUE@ ${nodist_man_MANS:=.in} \
-@ENABLE_MANPAGES_TRUE@ ${XML_IN_FILES:.xml.in=.html.in}
-
-@HAVE_ACL_TRUE@am__append_25 = \
-@HAVE_ACL_TRUE@        src/acl-util.c
-
-@HAVE_XZ_TRUE@am__append_26 = \
-@HAVE_XZ_TRUE@ src/journal/compress.c
-
-@HAVE_XZ_TRUE@am__append_27 = \
-@HAVE_XZ_TRUE@ $(XZ_CFLAGS)
-
-@HAVE_XZ_TRUE@am__append_28 = \
-@HAVE_XZ_TRUE@ $(XZ_LIBS)
-
-@HAVE_XZ_TRUE@am__append_29 = \
-@HAVE_XZ_TRUE@ src/journal/compress.c
-
-@HAVE_XZ_TRUE@am__append_30 = \
-@HAVE_XZ_TRUE@ $(XZ_LIBS)
-
-@HAVE_XZ_TRUE@am__append_31 = \
-@HAVE_XZ_TRUE@ src/journal/compress.c
-
-@HAVE_XZ_TRUE@am__append_32 = \
-@HAVE_XZ_TRUE@ $(XZ_LIBS)
-
-@HAVE_XZ_TRUE@am__append_33 = \
-@HAVE_XZ_TRUE@ src/journal/compress.c
-
-@HAVE_XZ_TRUE@am__append_34 = \
-@HAVE_XZ_TRUE@ $(XZ_CFLAGS)
-
-@HAVE_XZ_TRUE@am__append_35 = \
-@HAVE_XZ_TRUE@ $(XZ_LIBS)
-
-@ENABLE_COREDUMP_TRUE@am__append_36 = \
-@ENABLE_COREDUMP_TRUE@ systemd-coredump
-
-@ENABLE_COREDUMP_TRUE@am__append_37 = \
-@ENABLE_COREDUMP_TRUE@ sysctl.d/coredump.conf.in
-
-@ENABLE_COREDUMP_TRUE@am__append_38 = \
-@ENABLE_COREDUMP_TRUE@ sysctl.d/coredump.conf
-
-@ENABLE_BINFMT_TRUE@am__append_39 = \
-@ENABLE_BINFMT_TRUE@   systemd-binfmt
-
-@ENABLE_BINFMT_TRUE@am__append_40 = \
-@ENABLE_BINFMT_TRUE@   units/proc-sys-fs-binfmt_misc.automount \
-@ENABLE_BINFMT_TRUE@   units/proc-sys-fs-binfmt_misc.mount
-
-@ENABLE_BINFMT_TRUE@am__append_41 = \
-@ENABLE_BINFMT_TRUE@   units/systemd-binfmt.service
-
-@ENABLE_BINFMT_TRUE@am__append_42 = \
-@ENABLE_BINFMT_TRUE@   binfmt-install-data-hook
-
-@ENABLE_BINFMT_TRUE@am__append_43 = \
-@ENABLE_BINFMT_TRUE@   man/binfmt.d.5
-
-@ENABLE_BINFMT_TRUE@am__append_44 = \
-@ENABLE_BINFMT_TRUE@   units/systemd-binfmt.service.in
-
-@ENABLE_VCONSOLE_TRUE@am__append_45 = \
-@ENABLE_VCONSOLE_TRUE@ systemd-vconsole-setup
-
-@ENABLE_VCONSOLE_TRUE@am__append_46 = \
-@ENABLE_VCONSOLE_TRUE@ units/systemd-vconsole-setup.service
-
-@ENABLE_VCONSOLE_TRUE@am__append_47 = \
-@ENABLE_VCONSOLE_TRUE@ vconsole-install-data-hook
-
-@ENABLE_VCONSOLE_TRUE@am__append_48 = \
-@ENABLE_VCONSOLE_TRUE@ man/vconsole.conf.5
-
-@ENABLE_VCONSOLE_TRUE@am__append_49 = \
-@ENABLE_VCONSOLE_TRUE@ units/systemd-vconsole-setup.service.in
-
-@ENABLE_READAHEAD_TRUE@am__append_50 = \
-@ENABLE_READAHEAD_TRUE@        systemd-readahead-collect \
-@ENABLE_READAHEAD_TRUE@        systemd-readahead-replay
-
-@ENABLE_READAHEAD_TRUE@am__append_51 = \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-done.timer
-
-@ENABLE_READAHEAD_TRUE@am__append_52 = \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-collect.service \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-replay.service \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-done.service
-
-@ENABLE_READAHEAD_TRUE@am__append_53 = \
-@ENABLE_READAHEAD_TRUE@        src/systemd/sd-readahead.h \
-@ENABLE_READAHEAD_TRUE@        src/readahead/readahead-common.h \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-collect.service.in \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-replay.service.in \
-@ENABLE_READAHEAD_TRUE@        units/systemd-readahead-done.service.in
-
-@ENABLE_READAHEAD_TRUE@am__append_54 = \
-@ENABLE_READAHEAD_TRUE@        man/sd_readahead.3 \
-@ENABLE_READAHEAD_TRUE@        man/sd-readahead.7
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_QUOTACHECK_TRUE@am__append_55 = \
-@ENABLE_QUOTACHECK_TRUE@       systemd-quotacheck
-
-@ENABLE_QUOTACHECK_TRUE@am__append_56 = \
-@ENABLE_QUOTACHECK_TRUE@       units/quotacheck.service
-
-@ENABLE_QUOTACHECK_TRUE@am__append_57 = \
-@ENABLE_QUOTACHECK_TRUE@       units/quotacheck.service.in
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_RANDOMSEED_TRUE@am__append_58 = \
-@ENABLE_RANDOMSEED_TRUE@       systemd-random-seed
-
-@ENABLE_RANDOMSEED_TRUE@am__append_59 = \
-@ENABLE_RANDOMSEED_TRUE@       units/systemd-random-seed-save.service \
-@ENABLE_RANDOMSEED_TRUE@       units/systemd-random-seed-load.service
-
-@ENABLE_RANDOMSEED_TRUE@am__append_60 = \
-@ENABLE_RANDOMSEED_TRUE@       units/systemd-random-seed-save.service.in \
-@ENABLE_RANDOMSEED_TRUE@       units/systemd-random-seed-load.service.in
-
-@ENABLE_RANDOMSEED_TRUE@am__append_61 = \
-@ENABLE_RANDOMSEED_TRUE@       randomseed-install-data-hook
-
-
-# ------------------------------------------------------------------------------
-@HAVE_LIBCRYPTSETUP_TRUE@am__append_62 = \
-@HAVE_LIBCRYPTSETUP_TRUE@      systemd-cryptsetup
-
-@HAVE_LIBCRYPTSETUP_TRUE@am__append_63 = \
-@HAVE_LIBCRYPTSETUP_TRUE@      systemd-cryptsetup-generator
-
-@HAVE_LIBCRYPTSETUP_TRUE@am__append_64 = \
-@HAVE_LIBCRYPTSETUP_TRUE@      units/cryptsetup.target
-
-@HAVE_LIBCRYPTSETUP_TRUE@am__append_65 = \
-@HAVE_LIBCRYPTSETUP_TRUE@      cryptsetup-install-data-hook
-
-@ENABLE_HOSTNAMED_TRUE@am__append_66 = \
-@ENABLE_HOSTNAMED_TRUE@        systemd-hostnamed
-
-@ENABLE_HOSTNAMED_TRUE@am__append_67 = \
-@ENABLE_HOSTNAMED_TRUE@        units/systemd-hostnamed.service
-
-@ENABLE_HOSTNAMED_TRUE@am__append_68 = \
-@ENABLE_HOSTNAMED_TRUE@        src/hostname/org.freedesktop.hostname1.conf
-
-@ENABLE_HOSTNAMED_TRUE@am__append_69 = \
-@ENABLE_HOSTNAMED_TRUE@        src/hostname/org.freedesktop.hostname1.service
-
-@ENABLE_HOSTNAMED_TRUE@am__append_70 = \
-@ENABLE_HOSTNAMED_TRUE@        src/hostname/org.freedesktop.hostname1.policy.in
-
-@ENABLE_HOSTNAMED_TRUE@am__append_71 = \
-@ENABLE_HOSTNAMED_TRUE@        org.freedesktop.hostname1.xml
-
-@ENABLE_HOSTNAMED_TRUE@am__append_72 = \
-@ENABLE_HOSTNAMED_TRUE@        hostnamed-install-data-hook
-
-@ENABLE_HOSTNAMED_TRUE@am__append_73 = \
-@ENABLE_HOSTNAMED_TRUE@        units/systemd-hostnamed.service.in
-
-@ENABLE_LOCALED_TRUE@am__append_74 = \
-@ENABLE_LOCALED_TRUE@  units/systemd-localed.service
-
-@ENABLE_LOCALED_TRUE@am__append_75 = \
-@ENABLE_LOCALED_TRUE@  systemd-localed
-
-@ENABLE_LOCALED_TRUE@am__append_76 = \
-@ENABLE_LOCALED_TRUE@  src/locale/org.freedesktop.locale1.conf
-
-@ENABLE_LOCALED_TRUE@am__append_77 = \
-@ENABLE_LOCALED_TRUE@  src/locale/org.freedesktop.locale1.service
-
-@ENABLE_LOCALED_TRUE@am__append_78 = \
-@ENABLE_LOCALED_TRUE@  src/locale/org.freedesktop.locale1.policy.in
-
-@ENABLE_LOCALED_TRUE@am__append_79 = \
-@ENABLE_LOCALED_TRUE@  org.freedesktop.locale1.xml
-
-@ENABLE_LOCALED_TRUE@am__append_80 = \
-@ENABLE_LOCALED_TRUE@  localed-install-data-hook
-
-@ENABLE_LOCALED_TRUE@am__append_81 = \
-@ENABLE_LOCALED_TRUE@  units/systemd-localed.service.in
-
-@ENABLE_TIMEDATED_TRUE@am__append_82 = \
-@ENABLE_TIMEDATED_TRUE@        systemd-timedated
-
-@ENABLE_TIMEDATED_TRUE@am__append_83 = \
-@ENABLE_TIMEDATED_TRUE@        src/timedate/org.freedesktop.timedate1.service
-
-@ENABLE_TIMEDATED_TRUE@am__append_84 = \
-@ENABLE_TIMEDATED_TRUE@        src/timedate/org.freedesktop.timedate1.conf
-
-@ENABLE_TIMEDATED_TRUE@am__append_85 = \
-@ENABLE_TIMEDATED_TRUE@        units/systemd-timedated.service
-
-@ENABLE_TIMEDATED_TRUE@am__append_86 = \
-@ENABLE_TIMEDATED_TRUE@        src/timedate/org.freedesktop.timedate1.policy.in
-
-@ENABLE_TIMEDATED_TRUE@am__append_87 = \
-@ENABLE_TIMEDATED_TRUE@        org.freedesktop.timedate1.xml
-
-@ENABLE_TIMEDATED_TRUE@am__append_88 = \
-@ENABLE_TIMEDATED_TRUE@        timedated-install-data-hook
-
-@ENABLE_TIMEDATED_TRUE@am__append_89 = \
-@ENABLE_TIMEDATED_TRUE@        units/systemd-timedated.service.in
-
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@am__append_90 = \
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@    src/login/logind-acl.c \
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@    src/acl-util.c
-
-@ENABLE_LOGIND_TRUE@am__append_91 = systemd-logind \
-@ENABLE_LOGIND_TRUE@   systemd-user-sessions systemd-multi-seat-x \
-@ENABLE_LOGIND_TRUE@   systemd-uaccess
-@ENABLE_LOGIND_TRUE@am__append_92 = \
-@ENABLE_LOGIND_TRUE@   systemd-loginctl
-
-@ENABLE_LOGIND_TRUE@am__append_93 = \
-@ENABLE_LOGIND_TRUE@   test-login
-
-@ENABLE_LOGIND_TRUE@am__append_94 = \
-@ENABLE_LOGIND_TRUE@   libsystemd-login-install-hook
-
-@ENABLE_LOGIND_TRUE@am__append_95 = \
-@ENABLE_LOGIND_TRUE@   libsystemd-login-uninstall-hook
-
-@ENABLE_LOGIND_TRUE@am__append_96 = \
-@ENABLE_LOGIND_TRUE@   units/systemd-logind.service \
-@ENABLE_LOGIND_TRUE@   units/systemd-user-sessions.service
-
-@ENABLE_LOGIND_TRUE@am__append_97 = \
-@ENABLE_LOGIND_TRUE@   src/login/org.freedesktop.login1.service
-
-@ENABLE_LOGIND_TRUE@am__append_98 = \
-@ENABLE_LOGIND_TRUE@   src/login/org.freedesktop.login1.conf
-
-@ENABLE_LOGIND_TRUE@am__append_99 = \
-@ENABLE_LOGIND_TRUE@   src/login/systemd-logind.conf
-
-@ENABLE_LOGIND_TRUE@am__append_100 = \
-@ENABLE_LOGIND_TRUE@   src/systemd/sd-login.h
-
-@ENABLE_LOGIND_TRUE@am__append_101 = \
-@ENABLE_LOGIND_TRUE@   libsystemd-login.la
-
-@ENABLE_LOGIND_TRUE@am__append_102 = \
-@ENABLE_LOGIND_TRUE@   src/login/libsystemd-login.pc
-
-@ENABLE_LOGIND_TRUE@am__append_103 = \
-@ENABLE_LOGIND_TRUE@   src/login/org.freedesktop.login1.policy.in
-
-@ENABLE_LOGIND_TRUE@am__append_104 = \
-@ENABLE_LOGIND_TRUE@   logind-install-data-hook
-
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@am__append_105 = \
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@    src/login/logind-acl.c \
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@    src/acl-util.c
-
-@ENABLE_LOGIND_TRUE@am__append_106 = src/login/70-uaccess.rules \
-@ENABLE_LOGIND_TRUE@   src/login/71-seat.rules
-@ENABLE_LOGIND_TRUE@am__append_107 = \
-@ENABLE_LOGIND_TRUE@   src/login/73-seat-late.rules
-
-@ENABLE_LOGIND_TRUE@am__append_108 = \
-@ENABLE_LOGIND_TRUE@   man/systemd-logind.conf.5 \
-@ENABLE_LOGIND_TRUE@   man/sd-login.7 \
-@ENABLE_LOGIND_TRUE@   man/systemd-loginctl.1 \
-@ENABLE_LOGIND_TRUE@   man/sd_login_monitor_new.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_pid_get_session.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_uid_get_state.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_session_is_active.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_seat_get_active.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_get_seats.3
-
-@ENABLE_LOGIND_TRUE@am__append_109 = \
-@ENABLE_LOGIND_TRUE@   man/sd_login_monitor_unref.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_login_monitor_flush.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_login_monitor_get_fd.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_session_get_uid.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_session_get_seat.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_pid_get_owner_uid.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_pid_get_unit.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_uid_is_on_seat.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_uid_get_sessions.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_uid_get_seats.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_seat_get_sessions.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_seat_can_multi_session.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_get_sessions.3 \
-@ENABLE_LOGIND_TRUE@   man/sd_get_uids.3
-
-@ENABLE_LOGIND_TRUE@am__append_110 = \
-@ENABLE_LOGIND_TRUE@   src/login/logind-gperf.gperf \
-@ENABLE_LOGIND_TRUE@   src/login/libsystemd-login.pc.in \
-@ENABLE_LOGIND_TRUE@   src/login/libsystemd-login.sym \
-@ENABLE_LOGIND_TRUE@   src/login/logind.h \
-@ENABLE_LOGIND_TRUE@   src/login/logind-device.h \
-@ENABLE_LOGIND_TRUE@   src/login/logind-seat.h \
-@ENABLE_LOGIND_TRUE@   src/login/logind-session.h \
-@ENABLE_LOGIND_TRUE@   src/login/logind-user.h \
-@ENABLE_LOGIND_TRUE@   src/login/logind-acl.h \
-@ENABLE_LOGIND_TRUE@   src/login/73-seat-late.rules.in \
-@ENABLE_LOGIND_TRUE@   units/systemd-logind.service.in \
-@ENABLE_LOGIND_TRUE@   units/systemd-user-sessions.service.in
-
-@ENABLE_LOGIND_TRUE@am__append_111 = \
-@ENABLE_LOGIND_TRUE@   src/login/logind-gperf.c \
-@ENABLE_LOGIND_TRUE@   src/login/73-seat-late.rules
-
-@HAVE_VALAC_TRUE@am__append_112 = \
-@HAVE_VALAC_TRUE@      ${systemadm_SOURCES:.vala=.c}
-
-@HAVE_XSLTPROC_TRUE@am__append_113 = \
-@HAVE_XSLTPROC_TRUE@   $(dist_man_MANS) \
-@HAVE_XSLTPROC_TRUE@   ${nodist_man_MANS:=.in} \
-@HAVE_XSLTPROC_TRUE@   ${XML_FILES:.xml=.html} \
-@HAVE_XSLTPROC_TRUE@   ${XML_IN_FILES:.xml.in=.html.in}
-
-subdir = .
-DIST_COMMON = README $(am__configure_deps) \
-       $(am__dist_dbuspolicy_DATA_DIST) \
-       $(am__dist_dbussystemservice_DATA_DIST) \
-       $(am__dist_noinst_DATA_DIST) $(am__dist_pkgdata_DATA_DIST) \
-       $(am__dist_pkgsysconf_DATA_DIST) \
-       $(am__dist_systemunit_DATA_DIST) \
-       $(am__dist_tmpfiles_DATA_DIST) $(am__dist_udevrules_DATA_DIST) \
-       $(am__pkginclude_HEADERS_DIST) $(dist_bashcompletion_DATA) \
-       $(dist_bin_SCRIPTS) $(dist_doc_DATA) $(dist_man_MANS) \
-       $(dist_userunit_DATA) $(srcdir)/Makefile.am \
-       $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-       $(top_srcdir)/configure NEWS TODO compile config.guess \
-       config.sub depcomp install-sh libsystemd_basic_la_vala.stamp \
-       libsystemd_core_la_vala.stamp libsystemd_daemon_la_vala.stamp \
-       libsystemd_id128_la_vala.stamp \
-       libsystemd_journal_la_vala.stamp \
-       libsystemd_login_la_vala.stamp ltmain.sh missing \
-       pam_systemd_la_vala.stamp src/gnome-ask-password-agent.c \
-       src/systemadm.c src/systemd-interfaces.c src/wraplabel.c \
-       systemadm_vala.stamp systemctl_vala.stamp \
-       systemd_ac_power_vala.stamp systemd_ask_password_vala.stamp \
-       systemd_binfmt_vala.stamp systemd_cat_vala.stamp \
-       systemd_cgls_vala.stamp systemd_cgroups_agent_vala.stamp \
-       systemd_cgtop_vala.stamp systemd_coredump_vala.stamp \
-       systemd_cryptsetup_generator_vala.stamp \
-       systemd_cryptsetup_vala.stamp systemd_detect_virt_vala.stamp \
-       systemd_fsck_vala.stamp systemd_getty_generator_vala.stamp \
-       systemd_gnome_ask_password_agent_vala.stamp \
-       systemd_hostnamed_vala.stamp systemd_initctl_vala.stamp \
-       systemd_journalctl_vala.stamp systemd_journald_vala.stamp \
-       systemd_localed_vala.stamp systemd_loginctl_vala.stamp \
-       systemd_logind_vala.stamp systemd_machine_id_setup_vala.stamp \
-       systemd_modules_load_vala.stamp \
-       systemd_multi_seat_x_vala.stamp systemd_notify_vala.stamp \
-       systemd_nspawn_vala.stamp systemd_quotacheck_vala.stamp \
-       systemd_random_seed_vala.stamp \
-       systemd_rc_local_generator_vala.stamp \
-       systemd_readahead_collect_vala.stamp \
-       systemd_readahead_replay_vala.stamp \
-       systemd_remount_api_vfs_vala.stamp \
-       systemd_reply_password_vala.stamp systemd_shutdown_vala.stamp \
-       systemd_shutdownd_vala.stamp systemd_stdio_bridge_vala.stamp \
-       systemd_sysctl_vala.stamp systemd_timedated_vala.stamp \
-       systemd_timestamp_vala.stamp systemd_tmpfiles_vala.stamp \
-       systemd_tty_ask_password_agent_vala.stamp \
-       systemd_uaccess_vala.stamp systemd_update_utmp_vala.stamp \
-       systemd_user_sessions_vala.stamp systemd_vala.stamp \
-       systemd_vconsole_setup_vala.stamp test_cgroup_vala.stamp \
-       test_daemon_vala.stamp test_engine_vala.stamp \
-       test_env_replace_vala.stamp test_hostname_vala.stamp \
-       test_id128_vala.stamp test_install_vala.stamp \
-       test_job_type_vala.stamp test_journal_vala.stamp \
-       test_login_vala.stamp test_loopback_vala.stamp \
-       test_ns_vala.stamp test_strv_vala.stamp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \
-       $(top_srcdir)/m4/attributes.m4 $(top_srcdir)/m4/intltool.m4 \
-       $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-       $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-       $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pamlibdir)" \
-       "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rootbindir)" \
-       "$(DESTDIR)$(rootlibexecdir)" \
-       "$(DESTDIR)$(systemgeneratordir)" "$(DESTDIR)$(bindir)" \
-       "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \
-       "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \
-       "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusinterfacedir)" \
-       "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(dbuspolicydir)" \
-       "$(DESTDIR)$(dbussystemservicedir)" "$(DESTDIR)$(docdir)" \
-       "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgsysconfdir)" \
-       "$(DESTDIR)$(systemunitdir)" "$(DESTDIR)$(tmpfilesdir)" \
-       "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(userunitdir)" \
-       "$(DESTDIR)$(polkitpolicydir)" "$(DESTDIR)$(systemunitdir)" \
-       "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(userunitdir)" \
-       "$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgconfiglibdir)" \
-       "$(DESTDIR)$(sysctldir)" "$(DESTDIR)$(pkgincludedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
-       $(pamlib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libsystemd_basic_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_libsystemd_basic_la_OBJECTS = src/libsystemd_basic_la-util.lo \
-       src/libsystemd_basic_la-virt.lo \
-       src/libsystemd_basic_la-label.lo \
-       src/libsystemd_basic_la-hashmap.lo \
-       src/libsystemd_basic_la-set.lo src/libsystemd_basic_la-strv.lo \
-       src/libsystemd_basic_la-conf-parser.lo \
-       src/libsystemd_basic_la-socket-util.lo \
-       src/libsystemd_basic_la-log.lo \
-       src/libsystemd_basic_la-ratelimit.lo \
-       src/libsystemd_basic_la-exit-status.lo
-libsystemd_basic_la_OBJECTS = $(am_libsystemd_basic_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-libsystemd_basic_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsystemd_basic_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-libsystemd_core_la_DEPENDENCIES = libsystemd-basic.la \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
-am_libsystemd_core_la_OBJECTS = src/libsystemd_core_la-unit.lo \
-       src/libsystemd_core_la-job.lo \
-       src/libsystemd_core_la-manager.lo \
-       src/libsystemd_core_la-path-lookup.lo \
-       src/libsystemd_core_la-load-fragment.lo \
-       src/libsystemd_core_la-service.lo \
-       src/libsystemd_core_la-automount.lo \
-       src/libsystemd_core_la-mount.lo src/libsystemd_core_la-swap.lo \
-       src/libsystemd_core_la-device.lo \
-       src/libsystemd_core_la-target.lo \
-       src/libsystemd_core_la-snapshot.lo \
-       src/libsystemd_core_la-socket.lo \
-       src/libsystemd_core_la-timer.lo src/libsystemd_core_la-path.lo \
-       src/libsystemd_core_la-load-dropin.lo \
-       src/libsystemd_core_la-execute.lo \
-       src/libsystemd_core_la-utmp-wtmp.lo \
-       src/libsystemd_core_la-dbus.lo \
-       src/libsystemd_core_la-dbus-manager.lo \
-       src/libsystemd_core_la-dbus-unit.lo \
-       src/libsystemd_core_la-dbus-job.lo \
-       src/libsystemd_core_la-dbus-service.lo \
-       src/libsystemd_core_la-dbus-socket.lo \
-       src/libsystemd_core_la-dbus-timer.lo \
-       src/libsystemd_core_la-dbus-target.lo \
-       src/libsystemd_core_la-dbus-mount.lo \
-       src/libsystemd_core_la-dbus-automount.lo \
-       src/libsystemd_core_la-dbus-swap.lo \
-       src/libsystemd_core_la-dbus-snapshot.lo \
-       src/libsystemd_core_la-dbus-device.lo \
-       src/libsystemd_core_la-dbus-execute.lo \
-       src/libsystemd_core_la-dbus-path.lo \
-       src/libsystemd_core_la-cgroup.lo \
-       src/libsystemd_core_la-mount-setup.lo \
-       src/libsystemd_core_la-hostname-setup.lo \
-       src/libsystemd_core_la-selinux-setup.lo \
-       src/libsystemd_core_la-loopback-setup.lo \
-       src/libsystemd_core_la-kmod-setup.lo \
-       src/libsystemd_core_la-locale-setup.lo \
-       src/libsystemd_core_la-machine-id-setup.lo \
-       src/libsystemd_core_la-specifier.lo \
-       src/libsystemd_core_la-unit-name.lo \
-       src/libsystemd_core_la-fdset.lo \
-       src/libsystemd_core_la-namespace.lo \
-       src/libsystemd_core_la-tcpwrap.lo \
-       src/libsystemd_core_la-cgroup-util.lo \
-       src/libsystemd_core_la-condition.lo \
-       src/libsystemd_core_la-dbus-common.lo \
-       src/libsystemd_core_la-sd-daemon.lo \
-       src/libsystemd_core_la-install.lo \
-       src/libsystemd_core_la-cgroup-attr.lo \
-       src/libsystemd_core_la-sd-id128.lo
-nodist_libsystemd_core_la_OBJECTS =  \
-       src/libsystemd_core_la-load-fragment-gperf.lo \
-       src/libsystemd_core_la-load-fragment-gperf-nulstr.lo
-libsystemd_core_la_OBJECTS = $(am_libsystemd_core_la_OBJECTS) \
-       $(nodist_libsystemd_core_la_OBJECTS)
-libsystemd_core_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsystemd_core_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-libsystemd_daemon_la_LIBADD =
-am_libsystemd_daemon_la_OBJECTS =  \
-       src/libsystemd_daemon_la-sd-daemon.lo
-libsystemd_daemon_la_OBJECTS = $(am_libsystemd_daemon_la_OBJECTS)
-libsystemd_daemon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsystemd_daemon_la_CFLAGS) $(CFLAGS) \
-       $(libsystemd_daemon_la_LDFLAGS) $(LDFLAGS) -o $@
-libsystemd_id128_la_DEPENDENCIES = libsystemd-basic.la
-am_libsystemd_id128_la_OBJECTS = src/libsystemd_id128_la-sd-id128.lo
-libsystemd_id128_la_OBJECTS = $(am_libsystemd_id128_la_OBJECTS)
-libsystemd_id128_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsystemd_id128_la_CFLAGS) $(CFLAGS) \
-       $(libsystemd_id128_la_LDFLAGS) $(LDFLAGS) -o $@
-@HAVE_XZ_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-libsystemd_journal_la_DEPENDENCIES = libsystemd-basic.la \
-       libsystemd-id128.la $(am__DEPENDENCIES_2)
-am__libsystemd_journal_la_SOURCES_DIST = src/journal/sd-journal.c \
-       src/journal/journal-file.c src/journal/lookup3.c \
-       src/journal/journal-send.c src/journal/compress.c
-@HAVE_XZ_TRUE@am__objects_1 =  \
-@HAVE_XZ_TRUE@ src/journal/libsystemd_journal_la-compress.lo
-am_libsystemd_journal_la_OBJECTS =  \
-       src/journal/libsystemd_journal_la-sd-journal.lo \
-       src/journal/libsystemd_journal_la-journal-file.lo \
-       src/journal/libsystemd_journal_la-lookup3.lo \
-       src/journal/libsystemd_journal_la-journal-send.lo \
-       $(am__objects_1)
-libsystemd_journal_la_OBJECTS = $(am_libsystemd_journal_la_OBJECTS)
-libsystemd_journal_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsystemd_journal_la_CFLAGS) $(CFLAGS) \
-       $(libsystemd_journal_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_LOGIND_TRUE@libsystemd_login_la_DEPENDENCIES =  \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la
-am__libsystemd_login_la_SOURCES_DIST = src/login/sd-login.c \
-       src/cgroup-util.c
-@ENABLE_LOGIND_TRUE@am_libsystemd_login_la_OBJECTS =  \
-@ENABLE_LOGIND_TRUE@   src/login/libsystemd_login_la-sd-login.lo \
-@ENABLE_LOGIND_TRUE@   src/libsystemd_login_la-cgroup-util.lo
-libsystemd_login_la_OBJECTS = $(am_libsystemd_login_la_OBJECTS)
-libsystemd_login_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsystemd_login_la_CFLAGS) $(CFLAGS) \
-       $(libsystemd_login_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_LOGIND_TRUE@am_libsystemd_login_la_rpath = -rpath $(libdir)
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@pam_systemd_la_DEPENDENCIES =  \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    libsystemd-daemon.la \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(am__DEPENDENCIES_1) \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(am__DEPENDENCIES_1)
-am__pam_systemd_la_SOURCES_DIST = src/login/pam-module.c \
-       src/dbus-common.c
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@am_pam_systemd_la_OBJECTS = src/login/pam_systemd_la-pam-module.lo \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    src/pam_systemd_la-dbus-common.lo
-pam_systemd_la_OBJECTS = $(am_pam_systemd_la_OBJECTS)
-pam_systemd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(pam_systemd_la_CFLAGS) $(CFLAGS) $(pam_systemd_la_LDFLAGS) \
-       $(LDFLAGS) -o $@
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@am_pam_systemd_la_rpath = -rpath \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(pamlibdir)
-@HAVE_GTK_TRUE@am__EXEEXT_1 = systemadm$(EXEEXT) \
-@HAVE_GTK_TRUE@        systemd-gnome-ask-password-agent$(EXEEXT)
-@ENABLE_LOGIND_TRUE@am__EXEEXT_2 = test-login$(EXEEXT)
-@ENABLE_LOGIND_TRUE@am__EXEEXT_3 = systemd-loginctl$(EXEEXT)
-@ENABLE_COREDUMP_TRUE@am__EXEEXT_4 = systemd-coredump$(EXEEXT)
-@ENABLE_BINFMT_TRUE@am__EXEEXT_5 = systemd-binfmt$(EXEEXT)
-@ENABLE_VCONSOLE_TRUE@am__EXEEXT_6 = systemd-vconsole-setup$(EXEEXT)
-@ENABLE_READAHEAD_TRUE@am__EXEEXT_7 =  \
-@ENABLE_READAHEAD_TRUE@        systemd-readahead-collect$(EXEEXT) \
-@ENABLE_READAHEAD_TRUE@        systemd-readahead-replay$(EXEEXT)
-@ENABLE_QUOTACHECK_TRUE@am__EXEEXT_8 = systemd-quotacheck$(EXEEXT)
-@ENABLE_RANDOMSEED_TRUE@am__EXEEXT_9 = systemd-random-seed$(EXEEXT)
-@HAVE_LIBCRYPTSETUP_TRUE@am__EXEEXT_10 = systemd-cryptsetup$(EXEEXT)
-@ENABLE_HOSTNAMED_TRUE@am__EXEEXT_11 = systemd-hostnamed$(EXEEXT)
-@ENABLE_LOCALED_TRUE@am__EXEEXT_12 = systemd-localed$(EXEEXT)
-@ENABLE_TIMEDATED_TRUE@am__EXEEXT_13 = systemd-timedated$(EXEEXT)
-@ENABLE_LOGIND_TRUE@am__EXEEXT_14 = systemd-logind$(EXEEXT) \
-@ENABLE_LOGIND_TRUE@   systemd-user-sessions$(EXEEXT) \
-@ENABLE_LOGIND_TRUE@   systemd-multi-seat-x$(EXEEXT) \
-@ENABLE_LOGIND_TRUE@   systemd-uaccess$(EXEEXT)
-@TARGET_FEDORA_TRUE@am__EXEEXT_15 =  \
-@TARGET_FEDORA_TRUE@   systemd-rc-local-generator$(EXEEXT)
-@TARGET_MANDRIVA_TRUE@am__EXEEXT_16 =  \
-@TARGET_MANDRIVA_TRUE@ systemd-rc-local-generator$(EXEEXT)
-@TARGET_SUSE_TRUE@am__EXEEXT_17 = systemd-rc-local-generator$(EXEEXT)
-@TARGET_MAGEIA_TRUE@am__EXEEXT_18 =  \
-@TARGET_MAGEIA_TRUE@   systemd-rc-local-generator$(EXEEXT)
-@HAVE_LIBCRYPTSETUP_TRUE@am__EXEEXT_19 = systemd-cryptsetup-generator$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(rootbin_PROGRAMS) \
-       $(rootlibexec_PROGRAMS) $(systemgenerator_PROGRAMS)
-am_systemadm_OBJECTS = src/systemadm-systemadm.$(OBJEXT) \
-       src/systemadm-systemd-interfaces.$(OBJEXT) \
-       src/systemadm-wraplabel.$(OBJEXT)
-systemadm_OBJECTS = $(am_systemadm_OBJECTS)
-systemadm_DEPENDENCIES = $(am__DEPENDENCIES_1)
-systemadm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(systemadm_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_systemctl_OBJECTS = src/systemctl-systemctl.$(OBJEXT) \
-       src/systemctl-utmp-wtmp.$(OBJEXT) \
-       src/systemctl-dbus-common.$(OBJEXT) \
-       src/systemctl-path-lookup.$(OBJEXT) \
-       src/systemctl-cgroup-show.$(OBJEXT) \
-       src/systemctl-cgroup-util.$(OBJEXT) \
-       src/systemctl-exit-status.$(OBJEXT) \
-       src/systemctl-unit-name.$(OBJEXT) \
-       src/systemctl-pager.$(OBJEXT) src/systemctl-install.$(OBJEXT) \
-       src/systemctl-spawn-agent.$(OBJEXT) \
-       src/systemctl-logs-show.$(OBJEXT)
-systemctl_OBJECTS = $(am_systemctl_OBJECTS)
-systemctl_DEPENDENCIES = libsystemd-basic.la libsystemd-daemon.la \
-       libsystemd-journal.la libsystemd-id128.la \
-       $(am__DEPENDENCIES_1)
-systemctl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(systemctl_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_systemd_OBJECTS = src/systemd-main.$(OBJEXT)
-systemd_OBJECTS = $(am_systemd_OBJECTS)
-systemd_DEPENDENCIES = libsystemd-core.la
-systemd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(systemd_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_systemd_ac_power_OBJECTS = src/systemd_ac_power-ac-power.$(OBJEXT)
-systemd_ac_power_OBJECTS = $(am_systemd_ac_power_OBJECTS)
-systemd_ac_power_DEPENDENCIES = libsystemd-basic.la \
-       $(am__DEPENDENCIES_1)
-systemd_ac_power_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_ac_power_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am_systemd_ask_password_OBJECTS = src/ask-password.$(OBJEXT) \
-       src/ask-password-api.$(OBJEXT)
-systemd_ask_password_OBJECTS = $(am_systemd_ask_password_OBJECTS)
-systemd_ask_password_DEPENDENCIES = libsystemd-basic.la
-am__systemd_binfmt_SOURCES_DIST = src/binfmt/binfmt.c
-@ENABLE_BINFMT_TRUE@am_systemd_binfmt_OBJECTS =  \
-@ENABLE_BINFMT_TRUE@   src/binfmt/binfmt.$(OBJEXT)
-systemd_binfmt_OBJECTS = $(am_systemd_binfmt_OBJECTS)
-@ENABLE_BINFMT_TRUE@systemd_binfmt_DEPENDENCIES = libsystemd-basic.la
-am_systemd_cat_OBJECTS = src/journal/cat.$(OBJEXT)
-systemd_cat_OBJECTS = $(am_systemd_cat_OBJECTS)
-systemd_cat_DEPENDENCIES = libsystemd-basic.la libsystemd-journal.la
-am_systemd_cgls_OBJECTS = src/cgls.$(OBJEXT) src/cgroup-show.$(OBJEXT) \
-       src/cgroup-util.$(OBJEXT) src/pager.$(OBJEXT)
-systemd_cgls_OBJECTS = $(am_systemd_cgls_OBJECTS)
-systemd_cgls_DEPENDENCIES = libsystemd-basic.la
-am_systemd_cgroups_agent_OBJECTS =  \
-       src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT) \
-       src/systemd_cgroups_agent-dbus-common.$(OBJEXT)
-systemd_cgroups_agent_OBJECTS = $(am_systemd_cgroups_agent_OBJECTS)
-systemd_cgroups_agent_DEPENDENCIES = libsystemd-basic.la \
-       $(am__DEPENDENCIES_1)
-systemd_cgroups_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am_systemd_cgtop_OBJECTS = src/cgtop.$(OBJEXT) \
-       src/cgroup-util.$(OBJEXT)
-systemd_cgtop_OBJECTS = $(am_systemd_cgtop_OBJECTS)
-systemd_cgtop_DEPENDENCIES = libsystemd-basic.la
-am__systemd_coredump_SOURCES_DIST = src/journal/coredump.c
-@ENABLE_COREDUMP_TRUE@am_systemd_coredump_OBJECTS =  \
-@ENABLE_COREDUMP_TRUE@ src/journal/coredump.$(OBJEXT)
-systemd_coredump_OBJECTS = $(am_systemd_coredump_OBJECTS)
-@ENABLE_COREDUMP_TRUE@systemd_coredump_DEPENDENCIES =  \
-@ENABLE_COREDUMP_TRUE@ libsystemd-basic.la \
-@ENABLE_COREDUMP_TRUE@ libsystemd-journal.la \
-@ENABLE_COREDUMP_TRUE@ libsystemd-login.la
-am__systemd_cryptsetup_SOURCES_DIST = src/cryptsetup/cryptsetup.c \
-       src/ask-password-api.c
-@HAVE_LIBCRYPTSETUP_TRUE@am_systemd_cryptsetup_OBJECTS = src/cryptsetup/systemd_cryptsetup-cryptsetup.$(OBJEXT) \
-@HAVE_LIBCRYPTSETUP_TRUE@      src/systemd_cryptsetup-ask-password-api.$(OBJEXT)
-systemd_cryptsetup_OBJECTS = $(am_systemd_cryptsetup_OBJECTS)
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_DEPENDENCIES =  \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(am__DEPENDENCIES_1) \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(am__DEPENDENCIES_1) \
-@HAVE_LIBCRYPTSETUP_TRUE@      libsystemd-basic.la
-systemd_cryptsetup_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_cryptsetup_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am__systemd_cryptsetup_generator_SOURCES_DIST =  \
-       src/cryptsetup/cryptsetup-generator.c src/unit-name.c
-@HAVE_LIBCRYPTSETUP_TRUE@am_systemd_cryptsetup_generator_OBJECTS = src/cryptsetup/cryptsetup-generator.$(OBJEXT) \
-@HAVE_LIBCRYPTSETUP_TRUE@      src/unit-name.$(OBJEXT)
-systemd_cryptsetup_generator_OBJECTS =  \
-       $(am_systemd_cryptsetup_generator_OBJECTS)
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_generator_DEPENDENCIES =  \
-@HAVE_LIBCRYPTSETUP_TRUE@      libsystemd-basic.la
-am_systemd_detect_virt_OBJECTS = src/detect-virt.$(OBJEXT)
-systemd_detect_virt_OBJECTS = $(am_systemd_detect_virt_OBJECTS)
-systemd_detect_virt_DEPENDENCIES = libsystemd-basic.la
-am_systemd_fsck_OBJECTS = src/systemd_fsck-fsck.$(OBJEXT) \
-       src/systemd_fsck-dbus-common.$(OBJEXT)
-systemd_fsck_OBJECTS = $(am_systemd_fsck_OBJECTS)
-systemd_fsck_DEPENDENCIES = libsystemd-basic.la $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
-systemd_fsck_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(systemd_fsck_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_systemd_getty_generator_OBJECTS = src/getty-generator.$(OBJEXT) \
-       src/unit-name.$(OBJEXT)
-systemd_getty_generator_OBJECTS =  \
-       $(am_systemd_getty_generator_OBJECTS)
-systemd_getty_generator_DEPENDENCIES = libsystemd-basic.la
-am_systemd_gnome_ask_password_agent_OBJECTS = src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.$(OBJEXT)
-systemd_gnome_ask_password_agent_OBJECTS =  \
-       $(am_systemd_gnome_ask_password_agent_OBJECTS)
-systemd_gnome_ask_password_agent_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_1)
-systemd_gnome_ask_password_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_gnome_ask_password_agent_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__systemd_hostnamed_SOURCES_DIST = src/hostname/hostnamed.c \
-       src/dbus-common.c src/polkit.c
-@ENABLE_HOSTNAMED_TRUE@am_systemd_hostnamed_OBJECTS = src/hostname/systemd_hostnamed-hostnamed.$(OBJEXT) \
-@ENABLE_HOSTNAMED_TRUE@        src/systemd_hostnamed-dbus-common.$(OBJEXT) \
-@ENABLE_HOSTNAMED_TRUE@        src/systemd_hostnamed-polkit.$(OBJEXT)
-systemd_hostnamed_OBJECTS = $(am_systemd_hostnamed_OBJECTS)
-@ENABLE_HOSTNAMED_TRUE@systemd_hostnamed_DEPENDENCIES =  \
-@ENABLE_HOSTNAMED_TRUE@        libsystemd-basic.la \
-@ENABLE_HOSTNAMED_TRUE@        libsystemd-daemon.la \
-@ENABLE_HOSTNAMED_TRUE@        $(am__DEPENDENCIES_1)
-systemd_hostnamed_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_hostnamed_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am_systemd_initctl_OBJECTS = src/systemd_initctl-initctl.$(OBJEXT) \
-       src/systemd_initctl-dbus-common.$(OBJEXT)
-systemd_initctl_OBJECTS = $(am_systemd_initctl_OBJECTS)
-systemd_initctl_DEPENDENCIES = libsystemd-basic.la \
-       libsystemd-daemon.la $(am__DEPENDENCIES_1)
-systemd_initctl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_initctl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am__systemd_journalctl_SOURCES_DIST = src/journal/journalctl.c \
-       src/pager.c src/logs-show.c src/journal/compress.c
-@HAVE_XZ_TRUE@am__objects_2 = src/journal/systemd_journalctl-compress.$(OBJEXT)
-am_systemd_journalctl_OBJECTS =  \
-       src/journal/systemd_journalctl-journalctl.$(OBJEXT) \
-       src/systemd_journalctl-pager.$(OBJEXT) \
-       src/systemd_journalctl-logs-show.$(OBJEXT) $(am__objects_2)
-systemd_journalctl_OBJECTS = $(am_systemd_journalctl_OBJECTS)
-systemd_journalctl_DEPENDENCIES = libsystemd-basic.la \
-       libsystemd-journal.la libsystemd-id128.la \
-       $(am__DEPENDENCIES_2)
-systemd_journalctl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_journalctl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am__systemd_journald_SOURCES_DIST = src/journal/journald.c \
-       src/journal/sd-journal.c src/journal/journal-file.c \
-       src/journal/lookup3.c src/journal/journal-rate-limit.c \
-       src/sd-id128.c src/cgroup-util.c src/acl-util.c \
-       src/journal/compress.c
-@HAVE_ACL_TRUE@am__objects_3 =  \
-@HAVE_ACL_TRUE@        src/systemd_journald-acl-util.$(OBJEXT)
-@HAVE_XZ_TRUE@am__objects_4 =  \
-@HAVE_XZ_TRUE@ src/journal/systemd_journald-compress.$(OBJEXT)
-am_systemd_journald_OBJECTS =  \
-       src/journal/systemd_journald-journald.$(OBJEXT) \
-       src/journal/systemd_journald-sd-journal.$(OBJEXT) \
-       src/journal/systemd_journald-journal-file.$(OBJEXT) \
-       src/journal/systemd_journald-lookup3.$(OBJEXT) \
-       src/journal/systemd_journald-journal-rate-limit.$(OBJEXT) \
-       src/systemd_journald-sd-id128.$(OBJEXT) \
-       src/systemd_journald-cgroup-util.$(OBJEXT) $(am__objects_3) \
-       $(am__objects_4)
-nodist_systemd_journald_OBJECTS =  \
-       src/journal/systemd_journald-journald-gperf.$(OBJEXT)
-systemd_journald_OBJECTS = $(am_systemd_journald_OBJECTS) \
-       $(nodist_systemd_journald_OBJECTS)
-systemd_journald_DEPENDENCIES = libsystemd-basic.la \
-       libsystemd-daemon.la libsystemd-login.la $(am__DEPENDENCIES_1) \
-       $(am__DEPENDENCIES_2)
-systemd_journald_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_journald_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am__systemd_localed_SOURCES_DIST = src/locale/localed.c \
-       src/dbus-common.c src/polkit.c
-@ENABLE_LOCALED_TRUE@am_systemd_localed_OBJECTS = src/locale/systemd_localed-localed.$(OBJEXT) \
-@ENABLE_LOCALED_TRUE@  src/systemd_localed-dbus-common.$(OBJEXT) \
-@ENABLE_LOCALED_TRUE@  src/systemd_localed-polkit.$(OBJEXT)
-systemd_localed_OBJECTS = $(am_systemd_localed_OBJECTS)
-@ENABLE_LOCALED_TRUE@systemd_localed_DEPENDENCIES =  \
-@ENABLE_LOCALED_TRUE@  libsystemd-basic.la libsystemd-daemon.la \
-@ENABLE_LOCALED_TRUE@  $(am__DEPENDENCIES_1)
-systemd_localed_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_localed_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am__systemd_loginctl_SOURCES_DIST = src/login/loginctl.c \
-       src/login/sysfs-show.c src/dbus-common.c src/cgroup-show.c \
-       src/cgroup-util.c src/pager.c
-@ENABLE_LOGIND_TRUE@am_systemd_loginctl_OBJECTS = src/login/systemd_loginctl-loginctl.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_loginctl-sysfs-show.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_loginctl-dbus-common.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_loginctl-cgroup-show.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_loginctl-cgroup-util.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_loginctl-pager.$(OBJEXT)
-systemd_loginctl_OBJECTS = $(am_systemd_loginctl_OBJECTS)
-@ENABLE_LOGIND_TRUE@systemd_loginctl_DEPENDENCIES =  \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la $(am__DEPENDENCIES_1) \
-@ENABLE_LOGIND_TRUE@   $(am__DEPENDENCIES_1)
-systemd_loginctl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_loginctl_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am__systemd_logind_SOURCES_DIST = src/login/logind.c \
-       src/login/logind-dbus.c src/login/logind-device.c \
-       src/login/logind-seat.c src/login/logind-seat-dbus.c \
-       src/login/logind-session.c src/login/logind-session-dbus.c \
-       src/login/logind-user.c src/login/logind-user-dbus.c \
-       src/dbus-common.c src/dbus-loop.c src/cgroup-util.c \
-       src/polkit.c src/login/logind-acl.c src/acl-util.c
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@am__objects_5 = src/login/systemd_logind-logind-acl.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@    src/systemd_logind-acl-util.$(OBJEXT)
-@ENABLE_LOGIND_TRUE@am_systemd_logind_OBJECTS =  \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-dbus.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-device.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-seat.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-seat-dbus.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-session.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-session-dbus.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-user.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/login/systemd_logind-logind-user-dbus.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_logind-dbus-common.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_logind-dbus-loop.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_logind-cgroup-util.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/systemd_logind-polkit.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   $(am__objects_5)
-@ENABLE_LOGIND_TRUE@nodist_systemd_logind_OBJECTS = src/login/systemd_logind-logind-gperf.$(OBJEXT)
-systemd_logind_OBJECTS = $(am_systemd_logind_OBJECTS) \
-       $(nodist_systemd_logind_OBJECTS)
-@ENABLE_LOGIND_TRUE@systemd_logind_DEPENDENCIES = libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-daemon.la $(am__DEPENDENCIES_1) \
-@ENABLE_LOGIND_TRUE@   $(am__DEPENDENCIES_1) \
-@ENABLE_LOGIND_TRUE@   $(am__DEPENDENCIES_1)
-systemd_logind_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_logind_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
-       $@
-am_systemd_machine_id_setup_OBJECTS = src/machine-id-setup.$(OBJEXT) \
-       src/machine-id-main.$(OBJEXT) src/sd-id128.$(OBJEXT)
-systemd_machine_id_setup_OBJECTS =  \
-       $(am_systemd_machine_id_setup_OBJECTS)
-systemd_machine_id_setup_DEPENDENCIES = libsystemd-basic.la
-am_systemd_modules_load_OBJECTS =  \
-       src/systemd_modules_load-modules-load.$(OBJEXT)
-systemd_modules_load_OBJECTS = $(am_systemd_modules_load_OBJECTS)
-systemd_modules_load_DEPENDENCIES = libsystemd-basic.la \
-       $(am__DEPENDENCIES_1)
-systemd_modules_load_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_modules_load_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am__systemd_multi_seat_x_SOURCES_DIST = src/login/multi-seat-x.c
-@ENABLE_LOGIND_TRUE@am_systemd_multi_seat_x_OBJECTS = src/login/systemd_multi_seat_x-multi-seat-x.$(OBJEXT)
-systemd_multi_seat_x_OBJECTS = $(am_systemd_multi_seat_x_OBJECTS)
-@ENABLE_LOGIND_TRUE@systemd_multi_seat_x_DEPENDENCIES =  \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la $(am__DEPENDENCIES_1)
-systemd_multi_seat_x_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_multi_seat_x_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am_systemd_notify_OBJECTS = src/notify.$(OBJEXT) \
-       src/readahead/sd-readahead.$(OBJEXT)
-systemd_notify_OBJECTS = $(am_systemd_notify_OBJECTS)
-systemd_notify_DEPENDENCIES = libsystemd-basic.la libsystemd-daemon.la
-am_systemd_nspawn_OBJECTS = src/nspawn.$(OBJEXT) \
-       src/cgroup-util.$(OBJEXT) src/loopback-setup.$(OBJEXT)
-systemd_nspawn_OBJECTS = $(am_systemd_nspawn_OBJECTS)
-systemd_nspawn_DEPENDENCIES = libsystemd-basic.la libsystemd-daemon.la
-am__systemd_quotacheck_SOURCES_DIST = src/quotacheck.c
-@ENABLE_QUOTACHECK_TRUE@am_systemd_quotacheck_OBJECTS =  \
-@ENABLE_QUOTACHECK_TRUE@       src/quotacheck.$(OBJEXT)
-systemd_quotacheck_OBJECTS = $(am_systemd_quotacheck_OBJECTS)
-@ENABLE_QUOTACHECK_TRUE@systemd_quotacheck_DEPENDENCIES =  \
-@ENABLE_QUOTACHECK_TRUE@       libsystemd-basic.la
-am__systemd_random_seed_SOURCES_DIST = src/random-seed.c
-@ENABLE_RANDOMSEED_TRUE@am_systemd_random_seed_OBJECTS =  \
-@ENABLE_RANDOMSEED_TRUE@       src/random-seed.$(OBJEXT)
-systemd_random_seed_OBJECTS = $(am_systemd_random_seed_OBJECTS)
-@ENABLE_RANDOMSEED_TRUE@systemd_random_seed_DEPENDENCIES =  \
-@ENABLE_RANDOMSEED_TRUE@       libsystemd-basic.la
-am_systemd_rc_local_generator_OBJECTS =  \
-       src/rc-local-generator.$(OBJEXT)
-systemd_rc_local_generator_OBJECTS =  \
-       $(am_systemd_rc_local_generator_OBJECTS)
-systemd_rc_local_generator_DEPENDENCIES = libsystemd-basic.la
-am__systemd_readahead_collect_SOURCES_DIST =  \
-       src/readahead/readahead-collect.c \
-       src/readahead/readahead-common.c
-@ENABLE_READAHEAD_TRUE@am_systemd_readahead_collect_OBJECTS = src/readahead/systemd_readahead_collect-readahead-collect.$(OBJEXT) \
-@ENABLE_READAHEAD_TRUE@        src/readahead/systemd_readahead_collect-readahead-common.$(OBJEXT)
-systemd_readahead_collect_OBJECTS =  \
-       $(am_systemd_readahead_collect_OBJECTS)
-@ENABLE_READAHEAD_TRUE@systemd_readahead_collect_DEPENDENCIES =  \
-@ENABLE_READAHEAD_TRUE@        libsystemd-basic.la \
-@ENABLE_READAHEAD_TRUE@        libsystemd-daemon.la \
-@ENABLE_READAHEAD_TRUE@        $(am__DEPENDENCIES_1)
-systemd_readahead_collect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_readahead_collect_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am__systemd_readahead_replay_SOURCES_DIST =  \
-       src/readahead/readahead-replay.c \
-       src/readahead/readahead-common.c
-@ENABLE_READAHEAD_TRUE@am_systemd_readahead_replay_OBJECTS = src/readahead/systemd_readahead_replay-readahead-replay.$(OBJEXT) \
-@ENABLE_READAHEAD_TRUE@        src/readahead/systemd_readahead_replay-readahead-common.$(OBJEXT)
-systemd_readahead_replay_OBJECTS =  \
-       $(am_systemd_readahead_replay_OBJECTS)
-@ENABLE_READAHEAD_TRUE@systemd_readahead_replay_DEPENDENCIES =  \
-@ENABLE_READAHEAD_TRUE@        libsystemd-basic.la \
-@ENABLE_READAHEAD_TRUE@        libsystemd-daemon.la \
-@ENABLE_READAHEAD_TRUE@        $(am__DEPENDENCIES_1)
-systemd_readahead_replay_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_readahead_replay_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am_systemd_remount_api_vfs_OBJECTS = src/remount-api-vfs.$(OBJEXT) \
-       src/mount-setup.$(OBJEXT) src/exit-status.$(OBJEXT)
-systemd_remount_api_vfs_OBJECTS =  \
-       $(am_systemd_remount_api_vfs_OBJECTS)
-systemd_remount_api_vfs_DEPENDENCIES = libsystemd-basic.la
-am_systemd_reply_password_OBJECTS = src/reply-password.$(OBJEXT)
-systemd_reply_password_OBJECTS = $(am_systemd_reply_password_OBJECTS)
-systemd_reply_password_DEPENDENCIES = libsystemd-basic.la
-am_systemd_shutdown_OBJECTS =  \
-       src/systemd_shutdown-mount-setup.$(OBJEXT) \
-       src/systemd_shutdown-umount.$(OBJEXT) \
-       src/systemd_shutdown-shutdown.$(OBJEXT)
-systemd_shutdown_OBJECTS = $(am_systemd_shutdown_OBJECTS)
-systemd_shutdown_DEPENDENCIES = libsystemd-basic.la \
-       $(am__DEPENDENCIES_1)
-systemd_shutdown_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_shutdown_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am_systemd_shutdownd_OBJECTS =  \
-       src/systemd_shutdownd-utmp-wtmp.$(OBJEXT) \
-       src/systemd_shutdownd-shutdownd.$(OBJEXT)
-systemd_shutdownd_OBJECTS = $(am_systemd_shutdownd_OBJECTS)
-systemd_shutdownd_DEPENDENCIES = libsystemd-basic.la \
-       libsystemd-daemon.la
-systemd_shutdownd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_shutdownd_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am_systemd_stdio_bridge_OBJECTS = src/bridge.$(OBJEXT)
-systemd_stdio_bridge_OBJECTS = $(am_systemd_stdio_bridge_OBJECTS)
-systemd_stdio_bridge_DEPENDENCIES = libsystemd-basic.la
-am_systemd_sysctl_OBJECTS = src/sysctl.$(OBJEXT)
-systemd_sysctl_OBJECTS = $(am_systemd_sysctl_OBJECTS)
-systemd_sysctl_DEPENDENCIES = libsystemd-basic.la
-am__systemd_timedated_SOURCES_DIST = src/timedate/timedated.c \
-       src/dbus-common.c src/polkit.c
-@ENABLE_TIMEDATED_TRUE@am_systemd_timedated_OBJECTS = src/timedate/systemd_timedated-timedated.$(OBJEXT) \
-@ENABLE_TIMEDATED_TRUE@        src/systemd_timedated-dbus-common.$(OBJEXT) \
-@ENABLE_TIMEDATED_TRUE@        src/systemd_timedated-polkit.$(OBJEXT)
-systemd_timedated_OBJECTS = $(am_systemd_timedated_OBJECTS)
-@ENABLE_TIMEDATED_TRUE@systemd_timedated_DEPENDENCIES =  \
-@ENABLE_TIMEDATED_TRUE@        libsystemd-basic.la \
-@ENABLE_TIMEDATED_TRUE@        libsystemd-daemon.la \
-@ENABLE_TIMEDATED_TRUE@        $(am__DEPENDENCIES_1)
-systemd_timedated_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_timedated_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am_systemd_timestamp_OBJECTS = src/timestamp.$(OBJEXT)
-systemd_timestamp_OBJECTS = $(am_systemd_timestamp_OBJECTS)
-systemd_timestamp_DEPENDENCIES = libsystemd-basic.la
-am_systemd_tmpfiles_OBJECTS = src/tmpfiles.$(OBJEXT)
-systemd_tmpfiles_OBJECTS = $(am_systemd_tmpfiles_OBJECTS)
-systemd_tmpfiles_DEPENDENCIES = libsystemd-basic.la
-am_systemd_tty_ask_password_agent_OBJECTS =  \
-       src/tty-ask-password-agent.$(OBJEXT) \
-       src/ask-password-api.$(OBJEXT) src/utmp-wtmp.$(OBJEXT)
-systemd_tty_ask_password_agent_OBJECTS =  \
-       $(am_systemd_tty_ask_password_agent_OBJECTS)
-systemd_tty_ask_password_agent_DEPENDENCIES = libsystemd-basic.la
-am__systemd_uaccess_SOURCES_DIST = src/login/uaccess.c \
-       src/login/logind-acl.c src/acl-util.c
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@am__objects_6 = src/login/systemd_uaccess-logind-acl.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@@HAVE_ACL_TRUE@    src/systemd_uaccess-acl-util.$(OBJEXT)
-@ENABLE_LOGIND_TRUE@am_systemd_uaccess_OBJECTS = src/login/systemd_uaccess-uaccess.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   $(am__objects_6)
-systemd_uaccess_OBJECTS = $(am_systemd_uaccess_OBJECTS)
-@ENABLE_LOGIND_TRUE@systemd_uaccess_DEPENDENCIES =  \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la libsystemd-daemon.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-login.la $(am__DEPENDENCIES_1) \
-@ENABLE_LOGIND_TRUE@   $(am__DEPENDENCIES_1)
-systemd_uaccess_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_uaccess_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-am_systemd_update_utmp_OBJECTS =  \
-       src/systemd_update_utmp-update-utmp.$(OBJEXT) \
-       src/systemd_update_utmp-dbus-common.$(OBJEXT) \
-       src/systemd_update_utmp-utmp-wtmp.$(OBJEXT)
-systemd_update_utmp_OBJECTS = $(am_systemd_update_utmp_OBJECTS)
-systemd_update_utmp_DEPENDENCIES = libsystemd-basic.la \
-       $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-systemd_update_utmp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(systemd_update_utmp_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-am__systemd_user_sessions_SOURCES_DIST = src/login/user-sessions.c \
-       src/cgroup-util.c
-@ENABLE_LOGIND_TRUE@am_systemd_user_sessions_OBJECTS =  \
-@ENABLE_LOGIND_TRUE@   src/login/user-sessions.$(OBJEXT) \
-@ENABLE_LOGIND_TRUE@   src/cgroup-util.$(OBJEXT)
-systemd_user_sessions_OBJECTS = $(am_systemd_user_sessions_OBJECTS)
-@ENABLE_LOGIND_TRUE@systemd_user_sessions_DEPENDENCIES =  \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la
-am__systemd_vconsole_setup_SOURCES_DIST =  \
-       src/vconsole/vconsole-setup.c
-@ENABLE_VCONSOLE_TRUE@am_systemd_vconsole_setup_OBJECTS =  \
-@ENABLE_VCONSOLE_TRUE@ src/vconsole/vconsole-setup.$(OBJEXT)
-systemd_vconsole_setup_OBJECTS = $(am_systemd_vconsole_setup_OBJECTS)
-@ENABLE_VCONSOLE_TRUE@systemd_vconsole_setup_DEPENDENCIES =  \
-@ENABLE_VCONSOLE_TRUE@ libsystemd-basic.la
-am_test_cgroup_OBJECTS = src/test-cgroup.$(OBJEXT) \
-       src/cgroup-util.$(OBJEXT)
-test_cgroup_OBJECTS = $(am_test_cgroup_OBJECTS)
-test_cgroup_DEPENDENCIES = libsystemd-basic.la
-am_test_daemon_OBJECTS = src/test-daemon.$(OBJEXT)
-test_daemon_OBJECTS = $(am_test_daemon_OBJECTS)
-test_daemon_DEPENDENCIES = libsystemd-basic.la libsystemd-daemon.la
-am_test_engine_OBJECTS = src/test_engine-test-engine.$(OBJEXT)
-test_engine_OBJECTS = $(am_test_engine_OBJECTS)
-test_engine_DEPENDENCIES = $(systemd_LDADD)
-test_engine_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_engine_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_env_replace_OBJECTS = src/test-env-replace.$(OBJEXT)
-test_env_replace_OBJECTS = $(am_test_env_replace_OBJECTS)
-test_env_replace_DEPENDENCIES = libsystemd-basic.la
-am_test_hostname_OBJECTS = src/test-hostname.$(OBJEXT) \
-       src/hostname-setup.$(OBJEXT)
-test_hostname_OBJECTS = $(am_test_hostname_OBJECTS)
-test_hostname_DEPENDENCIES = libsystemd-basic.la
-am_test_id128_OBJECTS = src/test-id128.$(OBJEXT) \
-       src/sd-id128.$(OBJEXT)
-test_id128_OBJECTS = $(am_test_id128_OBJECTS)
-test_id128_DEPENDENCIES = libsystemd-basic.la
-am_test_install_OBJECTS = src/test_install-test-install.$(OBJEXT) \
-       src/test_install-install.$(OBJEXT) \
-       src/test_install-path-lookup.$(OBJEXT) \
-       src/test_install-unit-name.$(OBJEXT)
-test_install_OBJECTS = $(am_test_install_OBJECTS)
-test_install_DEPENDENCIES = libsystemd-basic.la
-test_install_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_install_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_job_type_OBJECTS = src/test_job_type-test-job-type.$(OBJEXT)
-test_job_type_OBJECTS = $(am_test_job_type_OBJECTS)
-test_job_type_DEPENDENCIES = $(systemd_LDADD)
-test_job_type_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_job_type_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__test_journal_SOURCES_DIST = src/journal/test-journal.c \
-       src/journal/sd-journal.c src/journal/journal-file.c \
-       src/journal/lookup3.c src/journal/journal-send.c \
-       src/sd-id128.c src/journal/compress.c
-@HAVE_XZ_TRUE@am__objects_7 =  \
-@HAVE_XZ_TRUE@ src/journal/test_journal-compress.$(OBJEXT)
-am_test_journal_OBJECTS =  \
-       src/journal/test_journal-test-journal.$(OBJEXT) \
-       src/journal/test_journal-sd-journal.$(OBJEXT) \
-       src/journal/test_journal-journal-file.$(OBJEXT) \
-       src/journal/test_journal-lookup3.$(OBJEXT) \
-       src/journal/test_journal-journal-send.$(OBJEXT) \
-       src/test_journal-sd-id128.$(OBJEXT) $(am__objects_7)
-test_journal_OBJECTS = $(am_test_journal_OBJECTS)
-test_journal_DEPENDENCIES = libsystemd-basic.la $(am__DEPENDENCIES_2)
-test_journal_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_journal_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am__test_login_SOURCES_DIST = src/login/test-login.c
-@ENABLE_LOGIND_TRUE@am_test_login_OBJECTS =  \
-@ENABLE_LOGIND_TRUE@   src/login/test-login.$(OBJEXT)
-test_login_OBJECTS = $(am_test_login_OBJECTS)
-@ENABLE_LOGIND_TRUE@test_login_DEPENDENCIES = libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-login.la
-am_test_loopback_OBJECTS = src/test-loopback.$(OBJEXT) \
-       src/loopback-setup.$(OBJEXT)
-test_loopback_OBJECTS = $(am_test_loopback_OBJECTS)
-test_loopback_DEPENDENCIES = libsystemd-basic.la
-am_test_ns_OBJECTS = src/test_ns-test-ns.$(OBJEXT)
-test_ns_OBJECTS = $(am_test_ns_OBJECTS)
-test_ns_DEPENDENCIES = $(systemd_LDADD)
-test_ns_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_ns_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-am_test_strv_OBJECTS = src/test-strv.$(OBJEXT) src/specifier.$(OBJEXT)
-test_strv_OBJECTS = $(am_test_strv_OBJECTS)
-test_strv_DEPENDENCIES = libsystemd-basic.la
-SCRIPTS = $(dist_bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-       $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-       $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-       $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-VALACOMPILE = $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS)
-LTVALACOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=compile $(VALAC) $(AM_VALAFLAGS) \
-       $(VALAFLAGS)
-AM_V_VALAC = $(am__v_VALAC_@AM_V@)
-am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
-am__v_VALAC_0 = @echo "  VALAC " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(libsystemd_basic_la_SOURCES) $(libsystemd_core_la_SOURCES) \
-       $(nodist_libsystemd_core_la_SOURCES) \
-       $(libsystemd_daemon_la_SOURCES) $(libsystemd_id128_la_SOURCES) \
-       $(libsystemd_journal_la_SOURCES) \
-       $(libsystemd_login_la_SOURCES) $(pam_systemd_la_SOURCES) \
-       $(systemadm_SOURCES) $(systemctl_SOURCES) $(systemd_SOURCES) \
-       $(systemd_ac_power_SOURCES) $(systemd_ask_password_SOURCES) \
-       $(systemd_binfmt_SOURCES) $(systemd_cat_SOURCES) \
-       $(systemd_cgls_SOURCES) $(systemd_cgroups_agent_SOURCES) \
-       $(systemd_cgtop_SOURCES) $(systemd_coredump_SOURCES) \
-       $(systemd_cryptsetup_SOURCES) \
-       $(systemd_cryptsetup_generator_SOURCES) \
-       $(systemd_detect_virt_SOURCES) $(systemd_fsck_SOURCES) \
-       $(systemd_getty_generator_SOURCES) \
-       $(systemd_gnome_ask_password_agent_SOURCES) \
-       $(systemd_hostnamed_SOURCES) $(systemd_initctl_SOURCES) \
-       $(systemd_journalctl_SOURCES) $(systemd_journald_SOURCES) \
-       $(nodist_systemd_journald_SOURCES) $(systemd_localed_SOURCES) \
-       $(systemd_loginctl_SOURCES) $(systemd_logind_SOURCES) \
-       $(nodist_systemd_logind_SOURCES) \
-       $(systemd_machine_id_setup_SOURCES) \
-       $(systemd_modules_load_SOURCES) \
-       $(systemd_multi_seat_x_SOURCES) $(systemd_notify_SOURCES) \
-       $(systemd_nspawn_SOURCES) $(systemd_quotacheck_SOURCES) \
-       $(systemd_random_seed_SOURCES) \
-       $(systemd_rc_local_generator_SOURCES) \
-       $(systemd_readahead_collect_SOURCES) \
-       $(systemd_readahead_replay_SOURCES) \
-       $(systemd_remount_api_vfs_SOURCES) \
-       $(systemd_reply_password_SOURCES) $(systemd_shutdown_SOURCES) \
-       $(systemd_shutdownd_SOURCES) $(systemd_stdio_bridge_SOURCES) \
-       $(systemd_sysctl_SOURCES) $(systemd_timedated_SOURCES) \
-       $(systemd_timestamp_SOURCES) $(systemd_tmpfiles_SOURCES) \
-       $(systemd_tty_ask_password_agent_SOURCES) \
-       $(systemd_uaccess_SOURCES) $(systemd_update_utmp_SOURCES) \
-       $(systemd_user_sessions_SOURCES) \
-       $(systemd_vconsole_setup_SOURCES) $(test_cgroup_SOURCES) \
-       $(test_daemon_SOURCES) $(test_engine_SOURCES) \
-       $(test_env_replace_SOURCES) $(test_hostname_SOURCES) \
-       $(test_id128_SOURCES) $(test_install_SOURCES) \
-       $(test_job_type_SOURCES) $(test_journal_SOURCES) \
-       $(test_login_SOURCES) $(test_loopback_SOURCES) \
-       $(test_ns_SOURCES) $(test_strv_SOURCES)
-DIST_SOURCES = $(libsystemd_basic_la_SOURCES) \
-       $(libsystemd_core_la_SOURCES) $(libsystemd_daemon_la_SOURCES) \
-       $(libsystemd_id128_la_SOURCES) \
-       $(am__libsystemd_journal_la_SOURCES_DIST) \
-       $(am__libsystemd_login_la_SOURCES_DIST) \
-       $(am__pam_systemd_la_SOURCES_DIST) $(systemadm_SOURCES) \
-       $(systemctl_SOURCES) $(systemd_SOURCES) \
-       $(systemd_ac_power_SOURCES) $(systemd_ask_password_SOURCES) \
-       $(am__systemd_binfmt_SOURCES_DIST) $(systemd_cat_SOURCES) \
-       $(systemd_cgls_SOURCES) $(systemd_cgroups_agent_SOURCES) \
-       $(systemd_cgtop_SOURCES) $(am__systemd_coredump_SOURCES_DIST) \
-       $(am__systemd_cryptsetup_SOURCES_DIST) \
-       $(am__systemd_cryptsetup_generator_SOURCES_DIST) \
-       $(systemd_detect_virt_SOURCES) $(systemd_fsck_SOURCES) \
-       $(systemd_getty_generator_SOURCES) \
-       $(systemd_gnome_ask_password_agent_SOURCES) \
-       $(am__systemd_hostnamed_SOURCES_DIST) \
-       $(systemd_initctl_SOURCES) \
-       $(am__systemd_journalctl_SOURCES_DIST) \
-       $(am__systemd_journald_SOURCES_DIST) \
-       $(am__systemd_localed_SOURCES_DIST) \
-       $(am__systemd_loginctl_SOURCES_DIST) \
-       $(am__systemd_logind_SOURCES_DIST) \
-       $(systemd_machine_id_setup_SOURCES) \
-       $(systemd_modules_load_SOURCES) \
-       $(am__systemd_multi_seat_x_SOURCES_DIST) \
-       $(systemd_notify_SOURCES) $(systemd_nspawn_SOURCES) \
-       $(am__systemd_quotacheck_SOURCES_DIST) \
-       $(am__systemd_random_seed_SOURCES_DIST) \
-       $(systemd_rc_local_generator_SOURCES) \
-       $(am__systemd_readahead_collect_SOURCES_DIST) \
-       $(am__systemd_readahead_replay_SOURCES_DIST) \
-       $(systemd_remount_api_vfs_SOURCES) \
-       $(systemd_reply_password_SOURCES) $(systemd_shutdown_SOURCES) \
-       $(systemd_shutdownd_SOURCES) $(systemd_stdio_bridge_SOURCES) \
-       $(systemd_sysctl_SOURCES) \
-       $(am__systemd_timedated_SOURCES_DIST) \
-       $(systemd_timestamp_SOURCES) $(systemd_tmpfiles_SOURCES) \
-       $(systemd_tty_ask_password_agent_SOURCES) \
-       $(am__systemd_uaccess_SOURCES_DIST) \
-       $(systemd_update_utmp_SOURCES) \
-       $(am__systemd_user_sessions_SOURCES_DIST) \
-       $(am__systemd_vconsole_setup_SOURCES_DIST) \
-       $(test_cgroup_SOURCES) $(test_daemon_SOURCES) \
-       $(test_engine_SOURCES) $(test_env_replace_SOURCES) \
-       $(test_hostname_SOURCES) $(test_id128_SOURCES) \
-       $(test_install_SOURCES) $(test_job_type_SOURCES) \
-       $(am__test_journal_SOURCES_DIST) \
-       $(am__test_login_SOURCES_DIST) $(test_loopback_SOURCES) \
-       $(test_ns_SOURCES) $(test_strv_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-       html-recursive info-recursive install-data-recursive \
-       install-dvi-recursive install-exec-recursive \
-       install-html-recursive install-info-recursive \
-       install-pdf-recursive install-ps-recursive install-recursive \
-       installcheck-recursive installdirs-recursive pdf-recursive \
-       ps-recursive uninstall-recursive
-man1dir = $(mandir)/man1
-man3dir = $(mandir)/man3
-man5dir = $(mandir)/man5
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-NROFF = nroff
-MANS = $(dist_man_MANS) $(nodist_man_MANS)
-am__dist_dbuspolicy_DATA_DIST = src/org.freedesktop.systemd1.conf \
-       src/hostname/org.freedesktop.hostname1.conf \
-       src/locale/org.freedesktop.locale1.conf \
-       src/timedate/org.freedesktop.timedate1.conf \
-       src/login/org.freedesktop.login1.conf
-am__dist_dbussystemservice_DATA_DIST =  \
-       src/org.freedesktop.systemd1.service \
-       src/hostname/org.freedesktop.hostname1.service \
-       src/locale/org.freedesktop.locale1.service \
-       src/timedate/org.freedesktop.timedate1.service \
-       src/login/org.freedesktop.login1.service
-am__dist_noinst_DATA_DIST = ${patsubst %.1,%.xml,${patsubst \
-       %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst \
-       %.8,%.xml,$(MANPAGES)}}}}}
-am__dist_pkgdata_DATA_DIST = src/locale/kbd-model-map
-am__dist_pkgsysconf_DATA_DIST = src/system.conf src/user.conf \
-       src/journal/systemd-journald.conf \
-       src/login/systemd-logind.conf
-am__dist_systemunit_DATA_DIST = units/graphical.target \
-       units/multi-user.target units/emergency.service \
-       units/emergency.target units/sysinit.target units/basic.target \
-       units/getty.target units/halt.target units/kexec.target \
-       units/local-fs.target units/local-fs-pre.target \
-       units/remote-fs.target units/remote-fs-pre.target \
-       units/network.target units/nss-lookup.target \
-       units/mail-transfer-agent.target units/http-daemon.target \
-       units/poweroff.target units/reboot.target units/rescue.target \
-       units/rpcbind.target units/time-sync.target \
-       units/shutdown.target units/final.target units/umount.target \
-       units/sigpwr.target units/sockets.target units/swap.target \
-       units/systemd-initctl.socket units/systemd-shutdownd.socket \
-       units/syslog.socket units/dev-hugepages.mount \
-       units/dev-mqueue.mount units/sys-kernel-config.mount \
-       units/sys-kernel-debug.mount units/sys-kernel-security.mount \
-       units/sys-fs-fuse-connections.mount units/var-run.mount \
-       units/media.mount units/remount-rootfs.service \
-       units/printer.target 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 units/syslog.target \
-       units/var-lock.mount units/fedora/prefdm.service \
-       units/fedora/rc-local.service units/fedora/halt-local.service \
-       units/mandriva/prefdm.service \
-       units/frugalware/display-manager.service \
-       units/suse/rc-local.service units/suse/halt-local.service \
-       units/mageia/prefdm.service units/plymouth-start.service \
-       units/plymouth-read-write.service units/plymouth-quit.service \
-       units/plymouth-quit-wait.service units/plymouth-reboot.service \
-       units/plymouth-kexec.service units/plymouth-poweroff.service \
-       units/plymouth-halt.service \
-       units/systemd-ask-password-plymouth.path \
-       units/systemd-journald.socket \
-       units/proc-sys-fs-binfmt_misc.automount \
-       units/proc-sys-fs-binfmt_misc.mount \
-       units/systemd-readahead-done.timer units/cryptsetup.target
-am__dist_tmpfiles_DATA_DIST = tmpfiles.d/systemd.conf \
-       tmpfiles.d/tmp.conf tmpfiles.d/x11.conf tmpfiles.d/legacy.conf
-am__dist_udevrules_DATA_DIST = src/login/70-uaccess.rules \
-       src/login/71-seat.rules
-DATA = $(dbusinterface_DATA) $(dist_bashcompletion_DATA) \
-       $(dist_dbuspolicy_DATA) $(dist_dbussystemservice_DATA) \
-       $(dist_doc_DATA) $(dist_noinst_DATA) $(dist_pkgdata_DATA) \
-       $(dist_pkgsysconf_DATA) $(dist_systemunit_DATA) \
-       $(dist_tmpfiles_DATA) $(dist_udevrules_DATA) \
-       $(dist_userunit_DATA) $(nodist_noinst_DATA) \
-       $(nodist_polkitpolicy_DATA) $(nodist_systemunit_DATA) \
-       $(nodist_udevrules_DATA) $(nodist_userunit_DATA) \
-       $(pkgconfigdata_DATA) $(pkgconfiglib_DATA) $(sysctl_DATA)
-am__pkginclude_HEADERS_DIST = src/systemd/sd-daemon.h \
-       src/systemd/sd-id128.h src/systemd/sd-journal.h \
-       src/systemd/sd-messages.h src/systemd/sd-login.h
-HEADERS = $(pkginclude_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-       $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-       distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.xz
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-pkgincludedir = $(includedir)/systemd
-ACLOCAL = @ACLOCAL@
-ACL_LIBS = @ACL_LIBS@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUDIT_LIBS = @AUDIT_LIBS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAP_LIBS = @CAP_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_LIBS = @DBUS_LIBS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMSGFMT = @GMSGFMT@
-GPERF = @GPERF@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-KMOD_CFLAGS = @KMOD_CFLAGS@
-KMOD_LIBS = @KMOD_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBCRYPTSETUP_CFLAGS = @LIBCRYPTSETUP_CFLAGS@
-LIBCRYPTSETUP_LIBS = @LIBCRYPTSETUP_LIBS@
-LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
-LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBWRAP_LIBS = @LIBWRAP_LIBS@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-M4 = @M4@
-M4_DEFINES = @M4_DEFINES@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJCOPY = @OBJCOPY@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PAM_LIBS = @PAM_LIBS@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SELINUX_CFLAGS = @SELINUX_CFLAGS@
-SELINUX_LIBS = @SELINUX_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRINGS = @STRINGS@
-STRIP = @STRIP@
-SYSTEM_SYSVINIT_PATH = @SYSTEM_SYSVINIT_PATH@
-SYSTEM_SYSVRCND_PATH = @SYSTEM_SYSVRCND_PATH@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-USE_NLS = @USE_NLS@
-VALAC = @VALAC@
-VAPIDIR = @VAPIDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XSLTPROC = @XSLTPROC@
-XZ_CFLAGS = @XZ_CFLAGS@
-XZ_LIBS = @XZ_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-dbusinterfacedir = @dbusinterfacedir@
-
-# Dirs of external packages
-dbuspolicydir = @dbuspolicydir@
-dbussessionservicedir = @dbussessionservicedir@
-dbussystemservicedir = @dbussystemservicedir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pamlibdir = @pamlibdir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-rootlibdir = @rootlibdir@
-
-# And these are the special ones for /
-rootprefix = @rootprefix@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-udevrulesdir = @udevrulesdir@
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = po
-LIBSYSTEMD_LOGIN_CURRENT = 2
-LIBSYSTEMD_LOGIN_REVISION = 0
-LIBSYSTEMD_LOGIN_AGE = 2
-LIBSYSTEMD_DAEMON_CURRENT = 0
-LIBSYSTEMD_DAEMON_REVISION = 1
-LIBSYSTEMD_DAEMON_AGE = 0
-LIBSYSTEMD_ID128_CURRENT = 0
-LIBSYSTEMD_ID128_REVISION = 2
-LIBSYSTEMD_ID128_AGE = 0
-LIBSYSTEMD_JOURNAL_CURRENT = 0
-LIBSYSTEMD_JOURNAL_REVISION = 2
-LIBSYSTEMD_JOURNAL_AGE = 0
-pkgconfigdatadir = $(datadir)/pkgconfig
-pkgconfiglibdir = $(libdir)/pkgconfig
-polkitpolicydir = $(datadir)/polkit-1/actions
-bashcompletiondir = $(sysconfdir)/bash_completion.d
-
-# Our own, non-special dirs
-pkgsysconfdir = $(sysconfdir)/systemd
-userunitdir = $(prefix)/lib/systemd/user
-tmpfilesdir = $(prefix)/lib/tmpfiles.d
-sysctldir = $(prefix)/lib/sysctl.d
-usergeneratordir = $(pkglibexecdir)/user-generators
-rootbindir = $(rootprefix)/bin
-rootlibexecdir = $(rootprefix)/lib/systemd
-systemgeneratordir = $(rootlibexecdir)/system-generators
-systemshutdowndir = $(rootlibexecdir)/system-shutdown
-systemunitdir = $(rootprefix)/lib/systemd/system
-CLEANFILES = src/journal/journald-gperf.c $(am__append_38) \
-       $(am__append_111) $(nodist_systemunit_DATA) \
-       $(nodist_userunit_DATA) $(nodist_man_MANS) \
-       ${XML_IN_FILES:.xml.in=.html} $(pkgconfigdata_DATA) \
-       $(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \
-       src/load-fragment-gperf.gperf src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c src/99-systemd.rules \
-       $(am__append_112) $(am__append_113) $(dbusinterface_DATA)
-
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs. We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-EXTRA_DIST = units/getty@.service.m4 units/serial-getty@.service.m4 \
-       units/console-shell.service.m4 units/rescue.service.m4 \
-       units/systemd-initctl.service.in \
-       units/systemd-shutdownd.service.in \
-       units/systemd-modules-load.service.in \
-       units/systemd-remount-api-vfs.service.in \
-       units/systemd-update-utmp-runlevel.service.in \
-       units/systemd-update-utmp-shutdown.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 units/halt.service.in \
-       units/poweroff.service.in units/reboot.service.in \
-       units/kexec.service.in units/user/exit.service.in \
-       units/fsck@.service.in units/fsck-root.service.in \
-       units/user@.service.in src/systemd.pc.in introspect.awk \
-       src/99-systemd.rules.in man/custom-html.xsl $(am__append_23) \
-       $(polkitpolicy_in_files) $(polkitpolicy_in_in_files) \
-       src/load-fragment-gperf.gperf.m4 src/util.h src/virt.h \
-       src/label.h src/hashmap.h src/set.h src/strv.h \
-       src/conf-parser.h src/socket-util.h src/log.h src/ratelimit.h \
-       src/exit-status.h src/unit.h src/job.h src/manager.h \
-       src/path-lookup.h src/load-fragment.h src/service.h \
-       src/automount.h src/mount.h src/swap.h src/device.h \
-       src/target.h src/snapshot.h src/socket.h src/timer.h \
-       src/path.h src/load-dropin.h src/execute.h src/utmp-wtmp.h \
-       src/dbus.h src/dbus-manager.h src/dbus-unit.h src/dbus-job.h \
-       src/dbus-service.h src/dbus-socket.h src/dbus-timer.h \
-       src/dbus-target.h src/dbus-mount.h src/dbus-automount.h \
-       src/dbus-swap.h src/dbus-snapshot.h src/dbus-device.h \
-       src/dbus-execute.h src/dbus-path.h src/cgroup.h \
-       src/mount-setup.h src/hostname-setup.h src/selinux-setup.h \
-       src/loopback-setup.h src/kmod-setup.h src/locale-setup.h \
-       src/machine-id-setup.h src/specifier.h src/unit-name.h \
-       src/fdset.h src/namespace.h src/tcpwrap.h src/cgroup-util.h \
-       src/condition.h src/dbus-common.h src/install.h \
-       src/cgroup-attr.h src/macro.h src/def.h src/ioprio.h \
-       src/missing.h src/list.h src/securebits.h \
-       src/linux/auto_dev-ioctl.h src/linux/fanotify.h src/initreq.h \
-       src/special.h src/dbus-common.h src/bus-errors.h \
-       src/cgroup-show.h src/build.h src/shutdownd.h src/umount.h \
-       src/ask-password-api.h src/pager.h src/sysfs-show.h \
-       src/polkit.h src/dbus-loop.h src/spawn-agent.h src/acl-util.h \
-       src/logs-show.h $(am__append_24) src/libsystemd-daemon.pc.in \
-       src/libsystemd-daemon.sym src/libsystemd-id128.pc.in \
-       src/libsystemd-id128.sym src/journal/journald.h \
-       src/journal/journal-def.h src/journal/journal-internal.h \
-       src/journal/journal-file.h src/journal/lookup3.h \
-       src/journal/compress.h src/journal/journal-rate-limit.h \
-       src/journal/libsystemd-journal.pc.in \
-       src/journal/libsystemd-journal.sym \
-       units/systemd-journald.service.in \
-       src/journal/journald-gperf.gperf $(am__append_37) \
-       $(am__append_44) $(am__append_49) $(am__append_53) \
-       $(am__append_57) $(am__append_60) $(am__append_73) \
-       $(am__append_81) $(am__append_89) $(am__append_110)
-INSTALL_EXEC_HOOKS = libsystemd-daemon-install-hook \
-       libsystemd-id128-install-hook libsystemd-journal-install-hook \
-       $(am__append_94)
-UNINSTALL_EXEC_HOOKS = libsystemd-daemon-uninstall-hook \
-       libsystemd-id128-uninstall-hook \
-       libsystemd-journal-uninstall-hook $(am__append_95)
-INSTALL_DATA_HOOKS = journal-install-data-hook $(am__append_42) \
-       $(am__append_47) $(am__append_61) $(am__append_65) \
-       $(am__append_72) $(am__append_80) $(am__append_88) \
-       $(am__append_104)
-pkginclude_HEADERS = src/systemd/sd-daemon.h src/systemd/sd-id128.h \
-       src/systemd/sd-journal.h src/systemd/sd-messages.h \
-       $(am__append_100)
-lib_LTLIBRARIES = libsystemd-daemon.la libsystemd-id128.la \
-       libsystemd-journal.la $(am__append_101)
-pkgconfiglib_DATA = src/libsystemd-daemon.pc src/libsystemd-id128.pc \
-       src/journal/libsystemd-journal.pc $(am__append_102)
-polkitpolicy_in_files = $(am__append_70) $(am__append_78) \
-       $(am__append_86) $(am__append_103)
-dist_udevrules_DATA = $(am__append_106)
-AM_CPPFLAGS = -include $(top_builddir)/config.h \
-       -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-       -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-       -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-       -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-       -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-       -DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
-       -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-       -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-       -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-       -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-       -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-       -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-       -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-       -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-       -DROOTPREFIX=\"$(rootprefix)\" -DRUNTIME_DIR=\"/run\" \
-       -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-       -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-       -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-       -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-       -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-       -DX_SERVER=\"$(bindir)/X\" -I $(top_srcdir)/src -I \
-       $(top_srcdir)/src/readahead -I $(top_srcdir)/src/login -I \
-       $(top_srcdir)/src/journal -I $(top_srcdir)/src/systemd \
-       $(am__append_1) $(am__append_2) $(am__append_3) \
-       $(am__append_4) $(am__append_5) $(am__append_6) \
-       $(am__append_7) $(am__append_8)
-dist_bin_SCRIPTS = \
-       src/systemd-analyze
-
-dist_pkgsysconf_DATA = src/system.conf src/user.conf \
-       src/journal/systemd-journald.conf $(am__append_99)
-dist_dbuspolicy_DATA = src/org.freedesktop.systemd1.conf \
-       $(am__append_68) $(am__append_76) $(am__append_84) \
-       $(am__append_98)
-dist_dbussystemservice_DATA = src/org.freedesktop.systemd1.service \
-       $(am__append_69) $(am__append_77) $(am__append_83) \
-       $(am__append_97)
-nodist_udevrules_DATA = src/99-systemd.rules $(am__append_107)
-dbusinterface_DATA = org.freedesktop.systemd1.Manager.xml \
-       org.freedesktop.systemd1.Job.xml \
-       org.freedesktop.systemd1.Unit.xml \
-       org.freedesktop.systemd1.Service.xml \
-       org.freedesktop.systemd1.Socket.xml \
-       org.freedesktop.systemd1.Timer.xml \
-       org.freedesktop.systemd1.Target.xml \
-       org.freedesktop.systemd1.Device.xml \
-       org.freedesktop.systemd1.Mount.xml \
-       org.freedesktop.systemd1.Automount.xml \
-       org.freedesktop.systemd1.Snapshot.xml \
-       org.freedesktop.systemd1.Swap.xml \
-       org.freedesktop.systemd1.Path.xml $(am__append_71) \
-       $(am__append_79) $(am__append_87)
-dist_bashcompletion_DATA = \
-       src/systemd-bash-completion.sh
-
-dist_tmpfiles_DATA = tmpfiles.d/systemd.conf tmpfiles.d/tmp.conf \
-       tmpfiles.d/x11.conf $(am__append_10)
-dist_systemunit_DATA = units/graphical.target units/multi-user.target \
-       units/emergency.service units/emergency.target \
-       units/sysinit.target units/basic.target units/getty.target \
-       units/halt.target units/kexec.target units/local-fs.target \
-       units/local-fs-pre.target units/remote-fs.target \
-       units/remote-fs-pre.target units/network.target \
-       units/nss-lookup.target units/mail-transfer-agent.target \
-       units/http-daemon.target units/poweroff.target \
-       units/reboot.target units/rescue.target units/rpcbind.target \
-       units/time-sync.target units/shutdown.target \
-       units/final.target units/umount.target units/sigpwr.target \
-       units/sockets.target units/swap.target \
-       units/systemd-initctl.socket units/systemd-shutdownd.socket \
-       units/syslog.socket units/dev-hugepages.mount \
-       units/dev-mqueue.mount units/sys-kernel-config.mount \
-       units/sys-kernel-debug.mount units/sys-kernel-security.mount \
-       units/sys-fs-fuse-connections.mount units/var-run.mount \
-       units/media.mount units/remount-rootfs.service \
-       units/printer.target 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 units/syslog.target \
-       $(am__append_11) $(am__append_12) $(am__append_14) \
-       $(am__append_16) $(am__append_17) $(am__append_19) \
-       $(am__append_21) units/systemd-journald.socket \
-       $(am__append_40) $(am__append_51) $(am__append_64)
-nodist_systemunit_DATA = units/getty@.service \
-       units/serial-getty@.service units/console-shell.service \
-       units/systemd-initctl.service units/systemd-shutdownd.service \
-       units/systemd-modules-load.service \
-       units/systemd-remount-api-vfs.service \
-       units/systemd-update-utmp-runlevel.service \
-       units/systemd-update-utmp-shutdown.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 units/halt.service \
-       units/poweroff.service units/reboot.service \
-       units/kexec.service units/fsck@.service \
-       units/fsck-root.service units/rescue.service \
-       units/user@.service $(am__append_22) \
-       units/systemd-journald.service $(am__append_41) \
-       $(am__append_46) $(am__append_52) $(am__append_56) \
-       $(am__append_59) $(am__append_67) $(am__append_74) \
-       $(am__append_85) $(am__append_96)
-dist_userunit_DATA = \
-       units/user/default.target \
-       units/user/exit.target
-
-nodist_userunit_DATA = \
-       units/user/exit.service
-
-dist_doc_DATA = \
-       README \
-        NEWS \
-       LICENSE \
-       DISTRO_PORTING
-
-pkgconfigdata_DATA = \
-       src/systemd.pc
-
-
-# First passed through sed, followed by intltool
-polkitpolicy_in_in_files = \
-       src/org.freedesktop.systemd1.policy.in.in
-
-nodist_polkitpolicy_DATA = \
-       $(polkitpolicy_in_files:.policy.in=.policy) \
-       $(polkitpolicy_in_in_files:.policy.in.in=.policy)
-
-noinst_LTLIBRARIES = \
-       libsystemd-basic.la \
-       libsystemd-core.la
-
-libsystemd_basic_la_SOURCES = \
-       src/util.c \
-       src/virt.c \
-       src/label.c \
-       src/hashmap.c \
-       src/set.c \
-       src/strv.c \
-       src/conf-parser.c \
-       src/socket-util.c \
-       src/log.c \
-       src/ratelimit.c \
-       src/exit-status.c
-
-libsystemd_basic_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(SELINUX_CFLAGS)
-
-libsystemd_basic_la_LIBADD = \
-       $(SELINUX_LIBS) \
-       $(CAP_LIBS)
-
-libsystemd_core_la_SOURCES = \
-       src/unit.c \
-       src/job.c \
-       src/manager.c \
-       src/path-lookup.c \
-       src/load-fragment.c \
-       src/service.c \
-       src/automount.c \
-       src/mount.c \
-       src/swap.c \
-       src/device.c \
-       src/target.c \
-       src/snapshot.c \
-       src/socket.c \
-       src/timer.c \
-       src/path.c \
-       src/load-dropin.c \
-       src/execute.c \
-       src/utmp-wtmp.c \
-       src/dbus.c \
-       src/dbus-manager.c \
-       src/dbus-unit.c \
-       src/dbus-job.c \
-       src/dbus-service.c \
-       src/dbus-socket.c \
-       src/dbus-timer.c \
-       src/dbus-target.c \
-       src/dbus-mount.c \
-       src/dbus-automount.c \
-       src/dbus-swap.c \
-       src/dbus-snapshot.c \
-       src/dbus-device.c \
-       src/dbus-execute.c \
-       src/dbus-path.c \
-       src/cgroup.c \
-       src/mount-setup.c \
-       src/hostname-setup.c \
-       src/selinux-setup.c \
-       src/loopback-setup.c \
-       src/kmod-setup.c \
-       src/locale-setup.c \
-       src/machine-id-setup.c \
-       src/specifier.c \
-       src/unit-name.c \
-       src/fdset.c \
-       src/namespace.c \
-       src/tcpwrap.c \
-       src/cgroup-util.c \
-       src/condition.c \
-       src/dbus-common.c \
-       src/sd-daemon.c \
-       src/install.c \
-       src/cgroup-attr.c \
-       src/sd-id128.c
-
-nodist_libsystemd_core_la_SOURCES = \
-       src/load-fragment-gperf.c \
-       src/load-fragment-gperf-nulstr.c
-
-libsystemd_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(LIBWRAP_CFLAGS) \
-       $(PAM_CFLAGS) \
-       $(AUDIT_CFLAGS) \
-       $(KMOD_CFLAGS)
-
-libsystemd_core_la_LIBADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(UDEV_LIBS) \
-       $(LIBWRAP_LIBS) \
-       $(PAM_LIBS) \
-       $(AUDIT_LIBS) \
-       $(CAP_LIBS) \
-       $(KMOD_LIBS)
-
-MANPAGES = man/systemd.1 man/systemctl.1 man/systemadm.1 \
-       man/systemd-cgls.1 man/systemd-cgtop.1 man/systemd-nspawn.1 \
-       man/systemd-tmpfiles.8 man/systemd-notify.1 man/systemd.unit.5 \
-       man/systemd.service.5 man/systemd.socket.5 man/systemd.mount.5 \
-       man/systemd.automount.5 man/systemd.swap.5 man/systemd.timer.5 \
-       man/systemd.path.5 man/systemd.target.5 man/systemd.device.5 \
-       man/systemd.snapshot.5 man/systemd.exec.5 man/daemon.7 \
-       man/runlevel.8 man/telinit.8 man/halt.8 man/shutdown.8 \
-       man/pam_systemd.8 man/systemd.conf.5 man/tmpfiles.d.5 \
-       man/hostname.5 man/timezone.5 man/machine-id.5 \
-       man/locale.conf.5 man/os-release.5 man/machine-info.5 \
-       man/modules-load.d.5 man/sysctl.d.5 man/systemd-ask-password.1 \
-       man/sd-daemon.7 man/sd_notify.3 man/sd_listen_fds.3 \
-       man/sd_is_fifo.3 man/sd_booted.3 $(am__append_43) \
-       $(am__append_48) $(am__append_54) $(am__append_108)
-MANPAGES_ALIAS = man/reboot.8 man/poweroff.8 man/init.1 \
-       man/sd_is_socket.3 man/sd_is_socket_unix.3 \
-       man/sd_is_socket_inet.3 man/sd_is_mq.3 man/sd_notifyf.3 \
-       $(am__append_109)
-@ENABLE_MANPAGES_TRUE@dist_man_MANS = \
-@ENABLE_MANPAGES_TRUE@ $(MANPAGES) \
-@ENABLE_MANPAGES_TRUE@ $(MANPAGES_ALIAS)
-
-@ENABLE_MANPAGES_TRUE@nodist_man_MANS = \
-@ENABLE_MANPAGES_TRUE@ man/systemd.special.7
-
-@ENABLE_MANPAGES_TRUE@XML_FILES = \
-@ENABLE_MANPAGES_TRUE@ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
-
-@ENABLE_MANPAGES_TRUE@XML_IN_FILES = \
-@ENABLE_MANPAGES_TRUE@ ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
-
-@ENABLE_MANPAGES_TRUE@dist_noinst_DATA = \
-@ENABLE_MANPAGES_TRUE@ ${XML_FILES:.xml=.html}
-
-@ENABLE_MANPAGES_TRUE@nodist_noinst_DATA = \
-@ENABLE_MANPAGES_TRUE@ ${XML_IN_FILES:.xml.in=.html}
-
-systemd_SOURCES = \
-       src/main.c
-
-systemd_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_LDADD = \
-       libsystemd-core.la
-
-test_engine_SOURCES = \
-       src/test-engine.c
-
-test_engine_CFLAGS = $(systemd_CFLAGS)
-test_engine_LDADD = $(systemd_LDADD)
-test_job_type_SOURCES = \
-       src/test-job-type.c
-
-test_job_type_CFLAGS = $(systemd_CFLAGS)
-test_job_type_LDADD = $(systemd_LDADD)
-test_ns_SOURCES = \
-       src/test-ns.c
-
-test_ns_CFLAGS = $(systemd_CFLAGS)
-test_ns_LDADD = $(systemd_LDADD)
-test_loopback_SOURCES = \
-       src/test-loopback.c \
-       src/loopback-setup.c
-
-test_loopback_LDADD = \
-       libsystemd-basic.la
-
-test_hostname_SOURCES = \
-       src/test-hostname.c \
-       src/hostname-setup.c
-
-test_hostname_LDADD = \
-       libsystemd-basic.la
-
-test_daemon_SOURCES = \
-       src/test-daemon.c
-
-test_daemon_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
-
-test_cgroup_SOURCES = \
-       src/test-cgroup.c \
-       src/cgroup-util.c
-
-test_cgroup_LDADD = \
-       libsystemd-basic.la
-
-test_env_replace_SOURCES = \
-       src/test-env-replace.c
-
-test_env_replace_LDADD = \
-       libsystemd-basic.la
-
-test_strv_SOURCES = \
-       src/test-strv.c \
-       src/specifier.c
-
-test_strv_LDADD = \
-       libsystemd-basic.la
-
-test_install_SOURCES = \
-       src/test-install.c \
-       src/install.c \
-       src/path-lookup.c \
-       src/unit-name.c
-
-test_install_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-test_install_LDADD = \
-       libsystemd-basic.la
-
-systemd_initctl_SOURCES = \
-       src/initctl.c \
-       src/dbus-common.c
-
-systemd_initctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_initctl_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       $(DBUS_LIBS)
-
-systemd_update_utmp_SOURCES = \
-       src/update-utmp.c \
-       src/dbus-common.c \
-       src/utmp-wtmp.c
-
-systemd_update_utmp_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(AUDIT_CFLAGS)
-
-systemd_update_utmp_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(AUDIT_LIBS)
-
-systemd_shutdownd_SOURCES = \
-       src/utmp-wtmp.c \
-       src/shutdownd.c
-
-systemd_shutdownd_CFLAGS = \
-       $(AM_CFLAGS)
-
-systemd_shutdownd_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
-
-systemd_shutdown_SOURCES = \
-       src/mount-setup.c \
-       src/umount.c \
-       src/shutdown.c
-
-systemd_shutdown_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_shutdown_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
-
-systemd_modules_load_SOURCES = \
-       src/modules-load.c
-
-systemd_modules_load_CFLAGS = \
-       $(KMOD_CFLAGS)
-
-systemd_modules_load_LDADD = \
-       libsystemd-basic.la \
-       $(KMOD_LIBS)
-
-systemd_tmpfiles_SOURCES = \
-       src/tmpfiles.c
-
-systemd_tmpfiles_LDADD = \
-       libsystemd-basic.la
-
-systemd_machine_id_setup_SOURCES = \
-       src/machine-id-setup.c \
-       src/machine-id-main.c \
-       src/sd-id128.c
-
-systemd_machine_id_setup_LDADD = \
-       libsystemd-basic.la
-
-systemd_sysctl_SOURCES = \
-       src/sysctl.c
-
-systemd_sysctl_LDADD = \
-       libsystemd-basic.la
-
-systemd_fsck_SOURCES = \
-       src/fsck.c \
-       src/dbus-common.c
-
-systemd_fsck_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_fsck_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS) \
-       $(DBUS_LIBS)
-
-systemd_timestamp_SOURCES = \
-       src/timestamp.c
-
-systemd_timestamp_LDADD = \
-       libsystemd-basic.la
-
-systemd_ac_power_SOURCES = \
-       src/ac-power.c
-
-systemd_ac_power_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(UDEV_CFLAGS)
-
-systemd_ac_power_LDADD = \
-       libsystemd-basic.la \
-       $(UDEV_LIBS)
-
-systemd_detect_virt_SOURCES = \
-       src/detect-virt.c
-
-systemd_detect_virt_LDADD = \
-       libsystemd-basic.la
-
-systemd_getty_generator_SOURCES = \
-       src/getty-generator.c \
-       src/unit-name.c
-
-systemd_getty_generator_LDADD = \
-       libsystemd-basic.la
-
-systemd_rc_local_generator_SOURCES = \
-       src/rc-local-generator.c
-
-systemd_rc_local_generator_LDADD = \
-       libsystemd-basic.la
-
-systemd_remount_api_vfs_SOURCES = \
-       src/remount-api-vfs.c \
-       src/mount-setup.c \
-       src/exit-status.c
-
-systemd_remount_api_vfs_LDADD = \
-       libsystemd-basic.la
-
-systemd_cgroups_agent_SOURCES = \
-       src/cgroups-agent.c \
-       src/dbus-common.c
-
-systemd_cgroups_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_cgroups_agent_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
-
-systemctl_SOURCES = \
-       src/systemctl.c \
-       src/utmp-wtmp.c \
-       src/dbus-common.c \
-       src/path-lookup.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/exit-status.c \
-       src/unit-name.c \
-       src/pager.c \
-       src/install.c \
-       src/spawn-agent.c \
-       src/logs-show.c
-
-systemctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemctl_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la \
-       libsystemd-journal.la \
-       libsystemd-id128.la \
-       $(DBUS_LIBS)
-
-systemd_notify_SOURCES = \
-       src/notify.c \
-       src/readahead/sd-readahead.c
-
-systemd_notify_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
-
-systemd_ask_password_SOURCES = \
-       src/ask-password.c \
-       src/ask-password-api.c
-
-systemd_ask_password_LDADD = \
-       libsystemd-basic.la
-
-systemd_reply_password_SOURCES = \
-       src/reply-password.c
-
-systemd_reply_password_LDADD = \
-       libsystemd-basic.la
-
-systemd_cgls_SOURCES = \
-       src/cgls.c \
-       src/cgroup-show.c \
-       src/cgroup-util.c \
-       src/pager.c
-
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
-
-systemd_cgtop_SOURCES = \
-       src/cgtop.c \
-        src/cgroup-util.c
-
-systemd_cgtop_LDADD = \
-       libsystemd-basic.la
-
-systemd_nspawn_SOURCES = \
-       src/nspawn.c \
-       src/cgroup-util.c \
-       src/loopback-setup.c
-
-systemd_nspawn_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-daemon.la
-
-systemd_stdio_bridge_SOURCES = \
-       src/bridge.c
-
-systemd_stdio_bridge_LDADD = \
-       libsystemd-basic.la
-
-systemadm_SOURCES = \
-       src/systemadm.vala \
-       src/systemd-interfaces.vala \
-       src/wraplabel.vala
-
-systemadm_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
-
-systemadm_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=gee-1.0 \
-       -g
-
-systemadm_LDADD = \
-       $(GTK_LIBS)
-
-systemd_gnome_ask_password_agent_SOURCES = \
-       src/gnome-ask-password-agent.vala
-
-systemd_gnome_ask_password_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(LIBNOTIFY_CFLAGS) \
-       $(GTK_CFLAGS) \
-       -Wno-unused-variable \
-       -Wno-unused-function \
-       -Wno-shadow \
-       -Wno-format-nonliteral
-
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-       --pkg=posix \
-       --pkg=gtk+-2.0 \
-       --pkg=linux \
-       --pkg=gio-unix-2.0 \
-       --pkg=libnotify \
-       -g
-
-systemd_gnome_ask_password_agent_LDADD = \
-       $(LIBNOTIFY_LIBS) \
-       $(GTK_LIBS)
-
-systemd_tty_ask_password_agent_SOURCES = \
-       src/tty-ask-password-agent.c \
-       src/ask-password-api.c \
-       src/utmp-wtmp.c
-
-systemd_tty_ask_password_agent_LDADD = \
-       libsystemd-basic.la
-
-
-# ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
-
-libsystemd_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden \
-       -DSD_EXPORT_SYMBOLS
-
-libsystemd_daemon_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
-
-
-# ------------------------------------------------------------------------------
-libsystemd_id128_la_SOURCES = \
-       src/sd-id128.c
-
-libsystemd_id128_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
-libsystemd_id128_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
-
-libsystemd_id128_la_LIBADD = \
-       libsystemd-basic.la
-
-test_id128_SOURCES = \
-       src/test-id128.c \
-       src/sd-id128.c
-
-test_id128_LDADD = \
-       libsystemd-basic.la
-
-
-# ------------------------------------------------------------------------------
-systemd_journald_SOURCES = src/journal/journald.c \
-       src/journal/sd-journal.c src/journal/journal-file.c \
-       src/journal/lookup3.c src/journal/journal-rate-limit.c \
-       src/sd-id128.c src/cgroup-util.c $(am__append_25) \
-       $(am__append_26)
-nodist_systemd_journald_SOURCES = \
-       src/journal/journald-gperf.c
-
-systemd_journald_CFLAGS = $(AM_CFLAGS) $(ACL_CFLAGS) $(am__append_27)
-systemd_journald_LDADD = libsystemd-basic.la libsystemd-daemon.la \
-       libsystemd-login.la $(ACL_LIBS) $(am__append_28)
-systemd_cat_SOURCES = \
-       src/journal/cat.c
-
-systemd_cat_LDADD = \
-       libsystemd-basic.la \
-       libsystemd-journal.la
-
-systemd_journalctl_SOURCES = src/journal/journalctl.c src/pager.c \
-       src/logs-show.c $(am__append_29)
-systemd_journalctl_LDADD = libsystemd-basic.la libsystemd-journal.la \
-       libsystemd-id128.la $(am__append_30)
-@HAVE_XZ_TRUE@systemd_journalctl_CFLAGS = \
-@HAVE_XZ_TRUE@ $(AM_CFLAGS) \
-@HAVE_XZ_TRUE@ $(XZ_CFLAGS)
-
-test_journal_SOURCES = src/journal/test-journal.c \
-       src/journal/sd-journal.c src/journal/journal-file.c \
-       src/journal/lookup3.c src/journal/journal-send.c \
-       src/sd-id128.c $(am__append_31)
-test_journal_LDADD = libsystemd-basic.la $(am__append_32)
-@HAVE_XZ_TRUE@test_journal_CFLAGS = \
-@HAVE_XZ_TRUE@ $(AM_CFLAGS) \
-@HAVE_XZ_TRUE@ $(XZ_CFLAGS)
-
-libsystemd_journal_la_SOURCES = src/journal/sd-journal.c \
-       src/journal/journal-file.c src/journal/lookup3.c \
-       src/journal/journal-send.c $(am__append_33)
-libsystemd_journal_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden \
-       $(am__append_34)
-libsystemd_journal_la_LDFLAGS = \
-       -shared \
-       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
-
-libsystemd_journal_la_LIBADD = libsystemd-basic.la libsystemd-id128.la \
-       $(am__append_35)
-
-# ------------------------------------------------------------------------------
-@ENABLE_COREDUMP_TRUE@systemd_coredump_SOURCES = \
-@ENABLE_COREDUMP_TRUE@ src/journal/coredump.c
-
-@ENABLE_COREDUMP_TRUE@systemd_coredump_LDADD = \
-@ENABLE_COREDUMP_TRUE@ libsystemd-basic.la \
-@ENABLE_COREDUMP_TRUE@ libsystemd-journal.la \
-@ENABLE_COREDUMP_TRUE@ libsystemd-login.la
-
-@ENABLE_COREDUMP_TRUE@sysctl_DATA = \
-@ENABLE_COREDUMP_TRUE@ sysctl.d/coredump.conf
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_BINFMT_TRUE@systemd_binfmt_SOURCES = \
-@ENABLE_BINFMT_TRUE@   src/binfmt/binfmt.c
-
-@ENABLE_BINFMT_TRUE@systemd_binfmt_LDADD = \
-@ENABLE_BINFMT_TRUE@   libsystemd-basic.la
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_VCONSOLE_TRUE@systemd_vconsole_setup_SOURCES = \
-@ENABLE_VCONSOLE_TRUE@ src/vconsole/vconsole-setup.c
-
-@ENABLE_VCONSOLE_TRUE@systemd_vconsole_setup_LDADD = \
-@ENABLE_VCONSOLE_TRUE@ libsystemd-basic.la
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_READAHEAD_TRUE@systemd_readahead_collect_SOURCES = \
-@ENABLE_READAHEAD_TRUE@        src/readahead/readahead-collect.c \
-@ENABLE_READAHEAD_TRUE@        src/readahead/readahead-common.c
-
-@ENABLE_READAHEAD_TRUE@systemd_readahead_collect_LDADD = \
-@ENABLE_READAHEAD_TRUE@        libsystemd-basic.la \
-@ENABLE_READAHEAD_TRUE@        libsystemd-daemon.la \
-@ENABLE_READAHEAD_TRUE@        $(UDEV_LIBS)
-
-@ENABLE_READAHEAD_TRUE@systemd_readahead_collect_CFLAGS = \
-@ENABLE_READAHEAD_TRUE@        $(AM_CFLAGS) \
-@ENABLE_READAHEAD_TRUE@        $(UDEV_CFLAGS)
-
-@ENABLE_READAHEAD_TRUE@systemd_readahead_replay_SOURCES = \
-@ENABLE_READAHEAD_TRUE@        src/readahead/readahead-replay.c \
-@ENABLE_READAHEAD_TRUE@        src/readahead/readahead-common.c
-
-@ENABLE_READAHEAD_TRUE@systemd_readahead_replay_CFLAGS = \
-@ENABLE_READAHEAD_TRUE@        $(AM_CFLAGS) \
-@ENABLE_READAHEAD_TRUE@        $(UDEV_CFLAGS)
-
-@ENABLE_READAHEAD_TRUE@systemd_readahead_replay_LDADD = \
-@ENABLE_READAHEAD_TRUE@        libsystemd-basic.la \
-@ENABLE_READAHEAD_TRUE@        libsystemd-daemon.la \
-@ENABLE_READAHEAD_TRUE@        $(UDEV_LIBS)
-
-@ENABLE_QUOTACHECK_TRUE@systemd_quotacheck_SOURCES = \
-@ENABLE_QUOTACHECK_TRUE@       src/quotacheck.c
-
-@ENABLE_QUOTACHECK_TRUE@systemd_quotacheck_LDADD = \
-@ENABLE_QUOTACHECK_TRUE@       libsystemd-basic.la
-
-@ENABLE_RANDOMSEED_TRUE@systemd_random_seed_SOURCES = \
-@ENABLE_RANDOMSEED_TRUE@       src/random-seed.c
-
-@ENABLE_RANDOMSEED_TRUE@systemd_random_seed_LDADD = \
-@ENABLE_RANDOMSEED_TRUE@       libsystemd-basic.la
-
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_SOURCES = \
-@HAVE_LIBCRYPTSETUP_TRUE@      src/cryptsetup/cryptsetup.c \
-@HAVE_LIBCRYPTSETUP_TRUE@      src/ask-password-api.c
-
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_CFLAGS = \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(AM_CFLAGS) \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(LIBCRYPTSETUP_CFLAGS) \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(UDEV_CFLAGS)
-
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_LDADD = \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(LIBCRYPTSETUP_LIBS) \
-@HAVE_LIBCRYPTSETUP_TRUE@      $(UDEV_LIBS) \
-@HAVE_LIBCRYPTSETUP_TRUE@      libsystemd-basic.la
-
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_generator_SOURCES = \
-@HAVE_LIBCRYPTSETUP_TRUE@      src/cryptsetup/cryptsetup-generator.c \
-@HAVE_LIBCRYPTSETUP_TRUE@      src/unit-name.c
-
-@HAVE_LIBCRYPTSETUP_TRUE@systemd_cryptsetup_generator_LDADD = \
-@HAVE_LIBCRYPTSETUP_TRUE@      libsystemd-basic.la
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_HOSTNAMED_TRUE@systemd_hostnamed_SOURCES = \
-@ENABLE_HOSTNAMED_TRUE@        src/hostname/hostnamed.c \
-@ENABLE_HOSTNAMED_TRUE@        src/dbus-common.c \
-@ENABLE_HOSTNAMED_TRUE@        src/polkit.c
-
-@ENABLE_HOSTNAMED_TRUE@systemd_hostnamed_CFLAGS = \
-@ENABLE_HOSTNAMED_TRUE@        $(AM_CFLAGS) \
-@ENABLE_HOSTNAMED_TRUE@        $(DBUS_CFLAGS)
-
-@ENABLE_HOSTNAMED_TRUE@systemd_hostnamed_LDADD = \
-@ENABLE_HOSTNAMED_TRUE@        libsystemd-basic.la \
-@ENABLE_HOSTNAMED_TRUE@        libsystemd-daemon.la \
-@ENABLE_HOSTNAMED_TRUE@        $(DBUS_LIBS)
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_LOCALED_TRUE@systemd_localed_SOURCES = \
-@ENABLE_LOCALED_TRUE@  src/locale/localed.c \
-@ENABLE_LOCALED_TRUE@  src/dbus-common.c \
-@ENABLE_LOCALED_TRUE@  src/polkit.c
-
-@ENABLE_LOCALED_TRUE@systemd_localed_CFLAGS = \
-@ENABLE_LOCALED_TRUE@  $(AM_CFLAGS) \
-@ENABLE_LOCALED_TRUE@  $(DBUS_CFLAGS)
-
-@ENABLE_LOCALED_TRUE@systemd_localed_LDADD = \
-@ENABLE_LOCALED_TRUE@  libsystemd-basic.la \
-@ENABLE_LOCALED_TRUE@  libsystemd-daemon.la \
-@ENABLE_LOCALED_TRUE@  $(DBUS_LIBS)
-
-@ENABLE_LOCALED_TRUE@dist_pkgdata_DATA = \
-@ENABLE_LOCALED_TRUE@  src/locale/kbd-model-map
-
-@ENABLE_LOCALED_TRUE@dist_noinst_SCRIPT = \
-@ENABLE_LOCALED_TRUE@  src/locale/generate-kbd-model-map
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_TIMEDATED_TRUE@systemd_timedated_SOURCES = \
-@ENABLE_TIMEDATED_TRUE@        src/timedate/timedated.c \
-@ENABLE_TIMEDATED_TRUE@        src/dbus-common.c \
-@ENABLE_TIMEDATED_TRUE@        src/polkit.c
-
-@ENABLE_TIMEDATED_TRUE@systemd_timedated_CFLAGS = \
-@ENABLE_TIMEDATED_TRUE@        $(AM_CFLAGS) \
-@ENABLE_TIMEDATED_TRUE@        $(DBUS_CFLAGS)
-
-@ENABLE_TIMEDATED_TRUE@systemd_timedated_LDADD = \
-@ENABLE_TIMEDATED_TRUE@        libsystemd-basic.la \
-@ENABLE_TIMEDATED_TRUE@        libsystemd-daemon.la \
-@ENABLE_TIMEDATED_TRUE@        $(DBUS_LIBS)
-
-
-# ------------------------------------------------------------------------------
-@ENABLE_LOGIND_TRUE@systemd_logind_SOURCES = src/login/logind.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-dbus.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-device.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-seat.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-seat-dbus.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-session.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-session-dbus.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-user.c \
-@ENABLE_LOGIND_TRUE@   src/login/logind-user-dbus.c \
-@ENABLE_LOGIND_TRUE@   src/dbus-common.c src/dbus-loop.c \
-@ENABLE_LOGIND_TRUE@   src/cgroup-util.c src/polkit.c \
-@ENABLE_LOGIND_TRUE@   $(am__append_90)
-@ENABLE_LOGIND_TRUE@nodist_systemd_logind_SOURCES = \
-@ENABLE_LOGIND_TRUE@   src/login/logind-gperf.c
-
-@ENABLE_LOGIND_TRUE@systemd_logind_CFLAGS = \
-@ENABLE_LOGIND_TRUE@   $(AM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(DBUS_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(UDEV_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(ACL_CFLAGS)
-
-@ENABLE_LOGIND_TRUE@systemd_logind_LDADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-daemon.la \
-@ENABLE_LOGIND_TRUE@   $(DBUS_LIBS) \
-@ENABLE_LOGIND_TRUE@   $(UDEV_LIBS) \
-@ENABLE_LOGIND_TRUE@   $(ACL_LIBS)
-
-@ENABLE_LOGIND_TRUE@systemd_user_sessions_SOURCES = \
-@ENABLE_LOGIND_TRUE@   src/login/user-sessions.c \
-@ENABLE_LOGIND_TRUE@   src/cgroup-util.c
-
-@ENABLE_LOGIND_TRUE@systemd_user_sessions_LDADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la
-
-@ENABLE_LOGIND_TRUE@systemd_loginctl_SOURCES = \
-@ENABLE_LOGIND_TRUE@   src/login/loginctl.c \
-@ENABLE_LOGIND_TRUE@   src/login/sysfs-show.c \
-@ENABLE_LOGIND_TRUE@   src/dbus-common.c \
-@ENABLE_LOGIND_TRUE@   src/cgroup-show.c \
-@ENABLE_LOGIND_TRUE@   src/cgroup-util.c \
-@ENABLE_LOGIND_TRUE@   src/pager.c
-
-@ENABLE_LOGIND_TRUE@systemd_loginctl_CFLAGS = \
-@ENABLE_LOGIND_TRUE@   $(AM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(DBUS_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(UDEV_CFLAGS)
-
-@ENABLE_LOGIND_TRUE@systemd_loginctl_LDADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   $(DBUS_LIBS) \
-@ENABLE_LOGIND_TRUE@   $(UDEV_LIBS)
-
-@ENABLE_LOGIND_TRUE@test_login_SOURCES = \
-@ENABLE_LOGIND_TRUE@   src/login/test-login.c
-
-@ENABLE_LOGIND_TRUE@test_login_LDADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-login.la
-
-@ENABLE_LOGIND_TRUE@libsystemd_login_la_SOURCES = \
-@ENABLE_LOGIND_TRUE@   src/login/sd-login.c \
-@ENABLE_LOGIND_TRUE@   src/cgroup-util.c
-
-@ENABLE_LOGIND_TRUE@libsystemd_login_la_CFLAGS = \
-@ENABLE_LOGIND_TRUE@   $(AM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   -fvisibility=hidden
-
-@ENABLE_LOGIND_TRUE@libsystemd_login_la_LDFLAGS = \
-@ENABLE_LOGIND_TRUE@   -shared \
-@ENABLE_LOGIND_TRUE@   -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-@ENABLE_LOGIND_TRUE@   -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
-
-@ENABLE_LOGIND_TRUE@libsystemd_login_la_LIBADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la
-
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@pam_systemd_la_SOURCES = \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    src/login/pam-module.c \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    src/dbus-common.c
-
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@pam_systemd_la_CFLAGS = \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(AM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(PAM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(DBUS_CFLAGS) \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    -fvisibility=hidden
-
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@pam_systemd_la_LDFLAGS = \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    -module \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    -export-dynamic \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    -avoid-version \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    -shared \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    -export-symbols-regex '^pam_sm_.*'
-
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@pam_systemd_la_LIBADD = \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    libsystemd-daemon.la \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(PAM_LIBS) \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    $(DBUS_LIBS)
-
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@pamlib_LTLIBRARIES = \
-@ENABLE_LOGIND_TRUE@@HAVE_PAM_TRUE@    pam_systemd.la
-
-@ENABLE_LOGIND_TRUE@systemd_multi_seat_x_SOURCES = \
-@ENABLE_LOGIND_TRUE@   src/login/multi-seat-x.c
-
-@ENABLE_LOGIND_TRUE@systemd_multi_seat_x_CFLAGS = \
-@ENABLE_LOGIND_TRUE@   $(AM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(UDEV_CFLAGS)
-
-@ENABLE_LOGIND_TRUE@systemd_multi_seat_x_LDADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   $(UDEV_LIBS)
-
-@ENABLE_LOGIND_TRUE@systemd_uaccess_SOURCES = src/login/uaccess.c \
-@ENABLE_LOGIND_TRUE@   $(am__append_105)
-@ENABLE_LOGIND_TRUE@systemd_uaccess_CFLAGS = \
-@ENABLE_LOGIND_TRUE@   $(AM_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(UDEV_CFLAGS) \
-@ENABLE_LOGIND_TRUE@   $(ACL_CFLAGS)
-
-@ENABLE_LOGIND_TRUE@systemd_uaccess_LDADD = \
-@ENABLE_LOGIND_TRUE@   libsystemd-basic.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-daemon.la \
-@ENABLE_LOGIND_TRUE@   libsystemd-login.la \
-@ENABLE_LOGIND_TRUE@   $(UDEV_LIBS) \
-@ENABLE_LOGIND_TRUE@   $(ACL_LIBS)
-
-# ------------------------------------------------------------------------------
-SED_PROCESS = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
-               -e 's,@rootbindir\@,$(rootbindir),g' \
-               -e 's,@bindir\@,$(bindir),g' \
-               -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
-               -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-               -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
-               -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
-               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
-               -e 's,@systemunitdir\@,$(systemunitdir),g' \
-               -e 's,@userunitdir\@,$(userunitdir),g' \
-               -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-               -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
-               -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-               -e 's,@prefix\@,$(prefix),g' \
-               -e 's,@exec_prefix\@,$(exec_prefix),g' \
-               -e 's,@libdir\@,$(libdir),g' \
-               -e 's,@includedir\@,$(includedir),g' \
-               < $< > $@ || rm $@
-
-M4_PROCESS_SYSTEM = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
-
-M4_PROCESS_USER = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
-
-@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \
-@HAVE_XSLTPROC_TRUE@   --nonet \
-@HAVE_XSLTPROC_TRUE@   --stringparam funcsynopsis.style ansi
-
-@HAVE_XSLTPROC_TRUE@XSLTPROC_PROCESS_MAN = \
-@HAVE_XSLTPROC_TRUE@   $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-@HAVE_XSLTPROC_TRUE@XSLTPROC_PROCESS_MAN_IN = \
-@HAVE_XSLTPROC_TRUE@   $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
-@HAVE_XSLTPROC_TRUE@   mv ${@:.in=} $@
-
-@HAVE_XSLTPROC_TRUE@XSLTPROC_PROCESS_HTML = \
-@HAVE_XSLTPROC_TRUE@   $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
-
-@HAVE_XSLTPROC_TRUE@XSLTPROC_PROCESS_HTML_IN = \
-@HAVE_XSLTPROC_TRUE@   $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \
-@HAVE_XSLTPROC_TRUE@   mv ${@:.in=} $@
-
-DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
-DISTCHECK_CONFIGURE_FLAGS = \
-       --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
-       --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
-       --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
-       --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
-       --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
-       --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-       --with-rootprefix=$$dc_install_base/$(prefix)
-
-all: config.h
-       $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh: Makefile
-       @:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-             $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           echo ' $(SHELL) ./config.status'; \
-           $(SHELL) ./config.status;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-       @if test ! -f $@; then rm -f stamp-h1; else :; fi
-       @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-       @rm -f stamp-h1
-       cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-       ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-       rm -f stamp-h1
-       touch $@
-
-distclean-hdr:
-       -rm -f config.h stamp-h1
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-       @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-       }
-
-uninstall-libLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-       done
-
-clean-libLTLIBRARIES:
-       -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-       @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
-
-clean-noinstLTLIBRARIES:
-       -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-       @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
-install-pamlibLTLIBRARIES: $(pamlib_LTLIBRARIES)
-       @$(NORMAL_INSTALL)
-       test -z "$(pamlibdir)" || $(MKDIR_P) "$(DESTDIR)$(pamlibdir)"
-       @list='$(pamlib_LTLIBRARIES)'; test -n "$(pamlibdir)" || list=; \
-       list2=; for p in $$list; do \
-         if test -f $$p; then \
-           list2="$$list2 $$p"; \
-         else :; fi; \
-       done; \
-       test -z "$$list2" || { \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pamlibdir)'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pamlibdir)"; \
-       }
-
-uninstall-pamlibLTLIBRARIES:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pamlib_LTLIBRARIES)'; test -n "$(pamlibdir)" || list=; \
-       for p in $$list; do \
-         $(am__strip_dir) \
-         echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pamlibdir)/$$f'"; \
-         $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pamlibdir)/$$f"; \
-       done
-
-clean-pamlibLTLIBRARIES:
-       -test -z "$(pamlib_LTLIBRARIES)" || rm -f $(pamlib_LTLIBRARIES)
-       @list='$(pamlib_LTLIBRARIES)'; for p in $$list; do \
-         dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" != "$$p" || dir=.; \
-         echo "rm -f \"$${dir}/so_locations\""; \
-         rm -f "$${dir}/so_locations"; \
-       done
-src/$(am__dirstamp):
-       @$(MKDIR_P) src
-       @: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/$(DEPDIR)
-       @: > src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-util.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-virt.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-label.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-hashmap.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-set.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-strv.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-conf-parser.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-socket-util.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-log.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-ratelimit.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_basic_la-exit-status.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-libsystemd-basic.la: $(libsystemd_basic_la_OBJECTS) $(libsystemd_basic_la_DEPENDENCIES) $(EXTRA_libsystemd_basic_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libsystemd_basic_la_LINK)  $(libsystemd_basic_la_OBJECTS) $(libsystemd_basic_la_LIBADD) $(LIBS)
-src/libsystemd_core_la-unit.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-job.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-manager.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-path-lookup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-load-fragment.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-service.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-automount.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-mount.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-swap.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-device.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-target.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-snapshot.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-socket.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-timer.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-path.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-load-dropin.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-execute.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-utmp-wtmp.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-manager.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-unit.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-job.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-service.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-socket.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-timer.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-target.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-mount.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-automount.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-swap.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-snapshot.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-device.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-execute.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-path.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-cgroup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-mount-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-hostname-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-selinux-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-loopback-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-kmod-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-locale-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-machine-id-setup.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-specifier.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-unit-name.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-fdset.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-namespace.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-tcpwrap.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-cgroup-util.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-condition.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-dbus-common.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-sd-daemon.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-install.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-cgroup-attr.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-sd-id128.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-load-fragment-gperf.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_core_la-load-fragment-gperf-nulstr.lo:  \
-       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-libsystemd-core.la: $(libsystemd_core_la_OBJECTS) $(libsystemd_core_la_DEPENDENCIES) $(EXTRA_libsystemd_core_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libsystemd_core_la_LINK)  $(libsystemd_core_la_OBJECTS) $(libsystemd_core_la_LIBADD) $(LIBS)
-src/libsystemd_daemon_la-sd-daemon.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-libsystemd-daemon.la: $(libsystemd_daemon_la_OBJECTS) $(libsystemd_daemon_la_DEPENDENCIES) $(EXTRA_libsystemd_daemon_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libsystemd_daemon_la_LINK) -rpath $(libdir) $(libsystemd_daemon_la_OBJECTS) $(libsystemd_daemon_la_LIBADD) $(LIBS)
-src/libsystemd_id128_la-sd-id128.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-libsystemd-id128.la: $(libsystemd_id128_la_OBJECTS) $(libsystemd_id128_la_DEPENDENCIES) $(EXTRA_libsystemd_id128_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libsystemd_id128_la_LINK) -rpath $(libdir) $(libsystemd_id128_la_OBJECTS) $(libsystemd_id128_la_LIBADD) $(LIBS)
-src/journal/$(am__dirstamp):
-       @$(MKDIR_P) src/journal
-       @: > src/journal/$(am__dirstamp)
-src/journal/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/journal/$(DEPDIR)
-       @: > src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/libsystemd_journal_la-sd-journal.lo:  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/libsystemd_journal_la-journal-file.lo:  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/libsystemd_journal_la-lookup3.lo:  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/libsystemd_journal_la-journal-send.lo:  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/libsystemd_journal_la-compress.lo:  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-libsystemd-journal.la: $(libsystemd_journal_la_OBJECTS) $(libsystemd_journal_la_DEPENDENCIES) $(EXTRA_libsystemd_journal_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libsystemd_journal_la_LINK) -rpath $(libdir) $(libsystemd_journal_la_OBJECTS) $(libsystemd_journal_la_LIBADD) $(LIBS)
-src/login/$(am__dirstamp):
-       @$(MKDIR_P) src/login
-       @: > src/login/$(am__dirstamp)
-src/login/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/login/$(DEPDIR)
-       @: > src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/libsystemd_login_la-sd-login.lo: src/login/$(am__dirstamp) \
-       src/login/$(DEPDIR)/$(am__dirstamp)
-src/libsystemd_login_la-cgroup-util.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-libsystemd-login.la: $(libsystemd_login_la_OBJECTS) $(libsystemd_login_la_DEPENDENCIES) $(EXTRA_libsystemd_login_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(libsystemd_login_la_LINK) $(am_libsystemd_login_la_rpath) $(libsystemd_login_la_OBJECTS) $(libsystemd_login_la_LIBADD) $(LIBS)
-src/login/pam_systemd_la-pam-module.lo: src/login/$(am__dirstamp) \
-       src/login/$(DEPDIR)/$(am__dirstamp)
-src/pam_systemd_la-dbus-common.lo: src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-pam_systemd.la: $(pam_systemd_la_OBJECTS) $(pam_systemd_la_DEPENDENCIES) $(EXTRA_pam_systemd_la_DEPENDENCIES) 
-       $(AM_V_CCLD)$(pam_systemd_la_LINK) $(am_pam_systemd_la_rpath) $(pam_systemd_la_OBJECTS) $(pam_systemd_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-       for p in $$list; do echo "$$p $$p"; done | \
-       sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do if test -f $$p || test -f $$p1; \
-         then echo "$$p"; echo "$$p"; else :; fi; \
-       done | \
-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-       sed 'N;N;N;s,\n, ,g' | \
-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-           if ($$2 == $$4) files[d] = files[d] " " $$1; \
-           else { print "f", $$3 "/" $$4, $$1; } } \
-         END { for (d in files) print "f", d, files[d] }' | \
-       while read type dir files; do \
-           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-           test -z "$$files" || { \
-           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-           } \
-       ; done
-
-uninstall-binPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-       files=`for p in $$list; do echo "$$p"; done | \
-         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-             -e 's/$$/$(EXEEXT)/' `; \
-       test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-       @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-       echo " rm -f" $$list; \
-       rm -f $$list || exit $$?; \
-       test -n "$(EXEEXT)" || exit 0; \
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
-
-clean-noinstPROGRAMS:
-       @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-       echo " rm -f" $$list; \
-       rm -f $$list || exit $$?; \
-       test -n "$(EXEEXT)" || exit 0; \
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
-install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(rootbindir)" || $(MKDIR_P) "$(DESTDIR)$(rootbindir)"
-       @list='$(rootbin_PROGRAMS)'; test -n "$(rootbindir)" || list=; \
-       for p in $$list; do echo "$$p $$p"; done | \
-       sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do if test -f $$p || test -f $$p1; \
-         then echo "$$p"; echo "$$p"; else :; fi; \
-       done | \
-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-       sed 'N;N;N;s,\n, ,g' | \
-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-           if ($$2 == $$4) files[d] = files[d] " " $$1; \
-           else { print "f", $$3 "/" $$4, $$1; } } \
-         END { for (d in files) print "f", d, files[d] }' | \
-       while read type dir files; do \
-           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-           test -z "$$files" || { \
-           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(rootbindir)$$dir'"; \
-           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(rootbindir)$$dir" || exit $$?; \
-           } \
-       ; done
-
-uninstall-rootbinPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(rootbin_PROGRAMS)'; test -n "$(rootbindir)" || list=; \
-       files=`for p in $$list; do echo "$$p"; done | \
-         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-             -e 's/$$/$(EXEEXT)/' `; \
-       test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(rootbindir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(rootbindir)" && rm -f $$files
-
-clean-rootbinPROGRAMS:
-       @list='$(rootbin_PROGRAMS)'; test -n "$$list" || exit 0; \
-       echo " rm -f" $$list; \
-       rm -f $$list || exit $$?; \
-       test -n "$(EXEEXT)" || exit 0; \
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
-install-rootlibexecPROGRAMS: $(rootlibexec_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(rootlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(rootlibexecdir)"
-       @list='$(rootlibexec_PROGRAMS)'; test -n "$(rootlibexecdir)" || list=; \
-       for p in $$list; do echo "$$p $$p"; done | \
-       sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do if test -f $$p || test -f $$p1; \
-         then echo "$$p"; echo "$$p"; else :; fi; \
-       done | \
-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-       sed 'N;N;N;s,\n, ,g' | \
-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-           if ($$2 == $$4) files[d] = files[d] " " $$1; \
-           else { print "f", $$3 "/" $$4, $$1; } } \
-         END { for (d in files) print "f", d, files[d] }' | \
-       while read type dir files; do \
-           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-           test -z "$$files" || { \
-           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(rootlibexecdir)$$dir'"; \
-           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(rootlibexecdir)$$dir" || exit $$?; \
-           } \
-       ; done
-
-uninstall-rootlibexecPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(rootlibexec_PROGRAMS)'; test -n "$(rootlibexecdir)" || list=; \
-       files=`for p in $$list; do echo "$$p"; done | \
-         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-             -e 's/$$/$(EXEEXT)/' `; \
-       test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(rootlibexecdir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(rootlibexecdir)" && rm -f $$files
-
-clean-rootlibexecPROGRAMS:
-       @list='$(rootlibexec_PROGRAMS)'; test -n "$$list" || exit 0; \
-       echo " rm -f" $$list; \
-       rm -f $$list || exit $$?; \
-       test -n "$(EXEEXT)" || exit 0; \
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
-install-systemgeneratorPROGRAMS: $(systemgenerator_PROGRAMS)
-       @$(NORMAL_INSTALL)
-       test -z "$(systemgeneratordir)" || $(MKDIR_P) "$(DESTDIR)$(systemgeneratordir)"
-       @list='$(systemgenerator_PROGRAMS)'; test -n "$(systemgeneratordir)" || list=; \
-       for p in $$list; do echo "$$p $$p"; done | \
-       sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do if test -f $$p || test -f $$p1; \
-         then echo "$$p"; echo "$$p"; else :; fi; \
-       done | \
-       sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-           -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-       sed 'N;N;N;s,\n, ,g' | \
-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-           if ($$2 == $$4) files[d] = files[d] " " $$1; \
-           else { print "f", $$3 "/" $$4, $$1; } } \
-         END { for (d in files) print "f", d, files[d] }' | \
-       while read type dir files; do \
-           if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-           test -z "$$files" || { \
-           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(systemgeneratordir)$$dir'"; \
-           $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(systemgeneratordir)$$dir" || exit $$?; \
-           } \
-       ; done
-
-uninstall-systemgeneratorPROGRAMS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(systemgenerator_PROGRAMS)'; test -n "$(systemgeneratordir)" || list=; \
-       files=`for p in $$list; do echo "$$p"; done | \
-         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-             -e 's/$$/$(EXEEXT)/' `; \
-       test -n "$$list" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(systemgeneratordir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(systemgeneratordir)" && rm -f $$files
-
-clean-systemgeneratorPROGRAMS:
-       @list='$(systemgenerator_PROGRAMS)'; test -n "$$list" || exit 0; \
-       echo " rm -f" $$list; \
-       rm -f $$list || exit $$?; \
-       test -n "$(EXEEXT)" || exit 0; \
-       list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-       echo " rm -f" $$list; \
-       rm -f $$list
-src/systemadm-systemadm.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemadm-systemd-interfaces.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemadm-wraplabel.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemadm$(EXEEXT): $(systemadm_OBJECTS) $(systemadm_DEPENDENCIES) $(EXTRA_systemadm_DEPENDENCIES) 
-       @rm -f systemadm$(EXEEXT)
-       $(AM_V_CCLD)$(systemadm_LINK) $(systemadm_OBJECTS) $(systemadm_LDADD) $(LIBS)
-src/systemctl-systemctl.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-utmp-wtmp.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-path-lookup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-cgroup-show.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-cgroup-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-exit-status.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-unit-name.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-pager.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-install.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-spawn-agent.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemctl-logs-show.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemctl$(EXEEXT): $(systemctl_OBJECTS) $(systemctl_DEPENDENCIES) $(EXTRA_systemctl_DEPENDENCIES) 
-       @rm -f systemctl$(EXEEXT)
-       $(AM_V_CCLD)$(systemctl_LINK) $(systemctl_OBJECTS) $(systemctl_LDADD) $(LIBS)
-src/systemd-main.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd$(EXEEXT): $(systemd_OBJECTS) $(systemd_DEPENDENCIES) $(EXTRA_systemd_DEPENDENCIES) 
-       @rm -f systemd$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_LINK) $(systemd_OBJECTS) $(systemd_LDADD) $(LIBS)
-src/systemd_ac_power-ac-power.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-ac-power$(EXEEXT): $(systemd_ac_power_OBJECTS) $(systemd_ac_power_DEPENDENCIES) $(EXTRA_systemd_ac_power_DEPENDENCIES) 
-       @rm -f systemd-ac-power$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_ac_power_LINK) $(systemd_ac_power_OBJECTS) $(systemd_ac_power_LDADD) $(LIBS)
-src/ask-password.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/ask-password-api.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-ask-password$(EXEEXT): $(systemd_ask_password_OBJECTS) $(systemd_ask_password_DEPENDENCIES) $(EXTRA_systemd_ask_password_DEPENDENCIES) 
-       @rm -f systemd-ask-password$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_ask_password_OBJECTS) $(systemd_ask_password_LDADD) $(LIBS)
-src/binfmt/$(am__dirstamp):
-       @$(MKDIR_P) src/binfmt
-       @: > src/binfmt/$(am__dirstamp)
-src/binfmt/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/binfmt/$(DEPDIR)
-       @: > src/binfmt/$(DEPDIR)/$(am__dirstamp)
-src/binfmt/binfmt.$(OBJEXT): src/binfmt/$(am__dirstamp) \
-       src/binfmt/$(DEPDIR)/$(am__dirstamp)
-systemd-binfmt$(EXEEXT): $(systemd_binfmt_OBJECTS) $(systemd_binfmt_DEPENDENCIES) $(EXTRA_systemd_binfmt_DEPENDENCIES) 
-       @rm -f systemd-binfmt$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_binfmt_OBJECTS) $(systemd_binfmt_LDADD) $(LIBS)
-src/journal/cat.$(OBJEXT): src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-systemd-cat$(EXEEXT): $(systemd_cat_OBJECTS) $(systemd_cat_DEPENDENCIES) $(EXTRA_systemd_cat_DEPENDENCIES) 
-       @rm -f systemd-cat$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_cat_OBJECTS) $(systemd_cat_LDADD) $(LIBS)
-src/cgls.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/cgroup-show.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/cgroup-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/pager.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-systemd-cgls$(EXEEXT): $(systemd_cgls_OBJECTS) $(systemd_cgls_DEPENDENCIES) $(EXTRA_systemd_cgls_DEPENDENCIES) 
-       @rm -f systemd-cgls$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_cgls_OBJECTS) $(systemd_cgls_LDADD) $(LIBS)
-src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT):  \
-       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_cgroups_agent-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-cgroups-agent$(EXEEXT): $(systemd_cgroups_agent_OBJECTS) $(systemd_cgroups_agent_DEPENDENCIES) $(EXTRA_systemd_cgroups_agent_DEPENDENCIES) 
-       @rm -f systemd-cgroups-agent$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_cgroups_agent_LINK) $(systemd_cgroups_agent_OBJECTS) $(systemd_cgroups_agent_LDADD) $(LIBS)
-src/cgtop.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-systemd-cgtop$(EXEEXT): $(systemd_cgtop_OBJECTS) $(systemd_cgtop_DEPENDENCIES) $(EXTRA_systemd_cgtop_DEPENDENCIES) 
-       @rm -f systemd-cgtop$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_cgtop_OBJECTS) $(systemd_cgtop_LDADD) $(LIBS)
-src/journal/coredump.$(OBJEXT): src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-systemd-coredump$(EXEEXT): $(systemd_coredump_OBJECTS) $(systemd_coredump_DEPENDENCIES) $(EXTRA_systemd_coredump_DEPENDENCIES) 
-       @rm -f systemd-coredump$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_coredump_OBJECTS) $(systemd_coredump_LDADD) $(LIBS)
-src/cryptsetup/$(am__dirstamp):
-       @$(MKDIR_P) src/cryptsetup
-       @: > src/cryptsetup/$(am__dirstamp)
-src/cryptsetup/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/cryptsetup/$(DEPDIR)
-       @: > src/cryptsetup/$(DEPDIR)/$(am__dirstamp)
-src/cryptsetup/systemd_cryptsetup-cryptsetup.$(OBJEXT):  \
-       src/cryptsetup/$(am__dirstamp) \
-       src/cryptsetup/$(DEPDIR)/$(am__dirstamp)
-src/systemd_cryptsetup-ask-password-api.$(OBJEXT):  \
-       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-systemd-cryptsetup$(EXEEXT): $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_DEPENDENCIES) $(EXTRA_systemd_cryptsetup_DEPENDENCIES) 
-       @rm -f systemd-cryptsetup$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_cryptsetup_LINK) $(systemd_cryptsetup_OBJECTS) $(systemd_cryptsetup_LDADD) $(LIBS)
-src/cryptsetup/cryptsetup-generator.$(OBJEXT):  \
-       src/cryptsetup/$(am__dirstamp) \
-       src/cryptsetup/$(DEPDIR)/$(am__dirstamp)
-src/unit-name.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-cryptsetup-generator$(EXEEXT): $(systemd_cryptsetup_generator_OBJECTS) $(systemd_cryptsetup_generator_DEPENDENCIES) $(EXTRA_systemd_cryptsetup_generator_DEPENDENCIES) 
-       @rm -f systemd-cryptsetup-generator$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_cryptsetup_generator_OBJECTS) $(systemd_cryptsetup_generator_LDADD) $(LIBS)
-src/detect-virt.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-detect-virt$(EXEEXT): $(systemd_detect_virt_OBJECTS) $(systemd_detect_virt_DEPENDENCIES) $(EXTRA_systemd_detect_virt_DEPENDENCIES) 
-       @rm -f systemd-detect-virt$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_detect_virt_OBJECTS) $(systemd_detect_virt_LDADD) $(LIBS)
-src/systemd_fsck-fsck.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_fsck-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-fsck$(EXEEXT): $(systemd_fsck_OBJECTS) $(systemd_fsck_DEPENDENCIES) $(EXTRA_systemd_fsck_DEPENDENCIES) 
-       @rm -f systemd-fsck$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_fsck_LINK) $(systemd_fsck_OBJECTS) $(systemd_fsck_LDADD) $(LIBS)
-src/getty-generator.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-getty-generator$(EXEEXT): $(systemd_getty_generator_OBJECTS) $(systemd_getty_generator_DEPENDENCIES) $(EXTRA_systemd_getty_generator_DEPENDENCIES) 
-       @rm -f systemd-getty-generator$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_getty_generator_OBJECTS) $(systemd_getty_generator_LDADD) $(LIBS)
-src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.$(OBJEXT):  \
-       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
-systemd-gnome-ask-password-agent$(EXEEXT): $(systemd_gnome_ask_password_agent_OBJECTS) $(systemd_gnome_ask_password_agent_DEPENDENCIES) $(EXTRA_systemd_gnome_ask_password_agent_DEPENDENCIES) 
-       @rm -f systemd-gnome-ask-password-agent$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_gnome_ask_password_agent_LINK) $(systemd_gnome_ask_password_agent_OBJECTS) $(systemd_gnome_ask_password_agent_LDADD) $(LIBS)
-src/hostname/$(am__dirstamp):
-       @$(MKDIR_P) src/hostname
-       @: > src/hostname/$(am__dirstamp)
-src/hostname/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/hostname/$(DEPDIR)
-       @: > src/hostname/$(DEPDIR)/$(am__dirstamp)
-src/hostname/systemd_hostnamed-hostnamed.$(OBJEXT):  \
-       src/hostname/$(am__dirstamp) \
-       src/hostname/$(DEPDIR)/$(am__dirstamp)
-src/systemd_hostnamed-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_hostnamed-polkit.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-hostnamed$(EXEEXT): $(systemd_hostnamed_OBJECTS) $(systemd_hostnamed_DEPENDENCIES) $(EXTRA_systemd_hostnamed_DEPENDENCIES) 
-       @rm -f systemd-hostnamed$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_hostnamed_LINK) $(systemd_hostnamed_OBJECTS) $(systemd_hostnamed_LDADD) $(LIBS)
-src/systemd_initctl-initctl.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_initctl-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-initctl$(EXEEXT): $(systemd_initctl_OBJECTS) $(systemd_initctl_DEPENDENCIES) $(EXTRA_systemd_initctl_DEPENDENCIES) 
-       @rm -f systemd-initctl$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_initctl_LINK) $(systemd_initctl_OBJECTS) $(systemd_initctl_LDADD) $(LIBS)
-src/journal/systemd_journalctl-journalctl.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/systemd_journalctl-pager.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_journalctl-logs-show.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journalctl-compress.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-systemd-journalctl$(EXEEXT): $(systemd_journalctl_OBJECTS) $(systemd_journalctl_DEPENDENCIES) $(EXTRA_systemd_journalctl_DEPENDENCIES) 
-       @rm -f systemd-journalctl$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_journalctl_LINK) $(systemd_journalctl_OBJECTS) $(systemd_journalctl_LDADD) $(LIBS)
-src/journal/systemd_journald-journald.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journald-sd-journal.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journald-journal-file.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journald-lookup3.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journald-journal-rate-limit.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/systemd_journald-sd-id128.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_journald-cgroup-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_journald-acl-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journald-compress.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/systemd_journald-journald-gperf.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-systemd-journald$(EXEEXT): $(systemd_journald_OBJECTS) $(systemd_journald_DEPENDENCIES) $(EXTRA_systemd_journald_DEPENDENCIES) 
-       @rm -f systemd-journald$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_journald_LINK) $(systemd_journald_OBJECTS) $(systemd_journald_LDADD) $(LIBS)
-src/locale/$(am__dirstamp):
-       @$(MKDIR_P) src/locale
-       @: > src/locale/$(am__dirstamp)
-src/locale/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/locale/$(DEPDIR)
-       @: > src/locale/$(DEPDIR)/$(am__dirstamp)
-src/locale/systemd_localed-localed.$(OBJEXT):  \
-       src/locale/$(am__dirstamp) \
-       src/locale/$(DEPDIR)/$(am__dirstamp)
-src/systemd_localed-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_localed-polkit.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-localed$(EXEEXT): $(systemd_localed_OBJECTS) $(systemd_localed_DEPENDENCIES) $(EXTRA_systemd_localed_DEPENDENCIES) 
-       @rm -f systemd-localed$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_localed_LINK) $(systemd_localed_OBJECTS) $(systemd_localed_LDADD) $(LIBS)
-src/login/systemd_loginctl-loginctl.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_loginctl-sysfs-show.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/systemd_loginctl-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_loginctl-cgroup-show.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_loginctl-cgroup-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_loginctl-pager.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-loginctl$(EXEEXT): $(systemd_loginctl_OBJECTS) $(systemd_loginctl_DEPENDENCIES) $(EXTRA_systemd_loginctl_DEPENDENCIES) 
-       @rm -f systemd-loginctl$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_loginctl_LINK) $(systemd_loginctl_OBJECTS) $(systemd_loginctl_LDADD) $(LIBS)
-src/login/systemd_logind-logind.$(OBJEXT): src/login/$(am__dirstamp) \
-       src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-dbus.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-device.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-seat.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-seat-dbus.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-session.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-session-dbus.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-user.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-user-dbus.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/systemd_logind-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_logind-dbus-loop.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_logind-cgroup-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_logind-polkit.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-acl.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/systemd_logind-acl-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_logind-logind-gperf.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-systemd-logind$(EXEEXT): $(systemd_logind_OBJECTS) $(systemd_logind_DEPENDENCIES) $(EXTRA_systemd_logind_DEPENDENCIES) 
-       @rm -f systemd-logind$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_logind_LINK) $(systemd_logind_OBJECTS) $(systemd_logind_LDADD) $(LIBS)
-src/machine-id-setup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/machine-id-main.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/sd-id128.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-machine-id-setup$(EXEEXT): $(systemd_machine_id_setup_OBJECTS) $(systemd_machine_id_setup_DEPENDENCIES) $(EXTRA_systemd_machine_id_setup_DEPENDENCIES) 
-       @rm -f systemd-machine-id-setup$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_machine_id_setup_OBJECTS) $(systemd_machine_id_setup_LDADD) $(LIBS)
-src/systemd_modules_load-modules-load.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-modules-load$(EXEEXT): $(systemd_modules_load_OBJECTS) $(systemd_modules_load_DEPENDENCIES) $(EXTRA_systemd_modules_load_DEPENDENCIES) 
-       @rm -f systemd-modules-load$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_modules_load_LINK) $(systemd_modules_load_OBJECTS) $(systemd_modules_load_LDADD) $(LIBS)
-src/login/systemd_multi_seat_x-multi-seat-x.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-systemd-multi-seat-x$(EXEEXT): $(systemd_multi_seat_x_OBJECTS) $(systemd_multi_seat_x_DEPENDENCIES) $(EXTRA_systemd_multi_seat_x_DEPENDENCIES) 
-       @rm -f systemd-multi-seat-x$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_multi_seat_x_LINK) $(systemd_multi_seat_x_OBJECTS) $(systemd_multi_seat_x_LDADD) $(LIBS)
-src/notify.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/readahead/$(am__dirstamp):
-       @$(MKDIR_P) src/readahead
-       @: > src/readahead/$(am__dirstamp)
-src/readahead/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/readahead/$(DEPDIR)
-       @: > src/readahead/$(DEPDIR)/$(am__dirstamp)
-src/readahead/sd-readahead.$(OBJEXT): src/readahead/$(am__dirstamp) \
-       src/readahead/$(DEPDIR)/$(am__dirstamp)
-systemd-notify$(EXEEXT): $(systemd_notify_OBJECTS) $(systemd_notify_DEPENDENCIES) $(EXTRA_systemd_notify_DEPENDENCIES) 
-       @rm -f systemd-notify$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_notify_OBJECTS) $(systemd_notify_LDADD) $(LIBS)
-src/nspawn.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/loopback-setup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-nspawn$(EXEEXT): $(systemd_nspawn_OBJECTS) $(systemd_nspawn_DEPENDENCIES) $(EXTRA_systemd_nspawn_DEPENDENCIES) 
-       @rm -f systemd-nspawn$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_nspawn_OBJECTS) $(systemd_nspawn_LDADD) $(LIBS)
-src/quotacheck.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-quotacheck$(EXEEXT): $(systemd_quotacheck_OBJECTS) $(systemd_quotacheck_DEPENDENCIES) $(EXTRA_systemd_quotacheck_DEPENDENCIES) 
-       @rm -f systemd-quotacheck$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_quotacheck_OBJECTS) $(systemd_quotacheck_LDADD) $(LIBS)
-src/random-seed.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-random-seed$(EXEEXT): $(systemd_random_seed_OBJECTS) $(systemd_random_seed_DEPENDENCIES) $(EXTRA_systemd_random_seed_DEPENDENCIES) 
-       @rm -f systemd-random-seed$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_random_seed_OBJECTS) $(systemd_random_seed_LDADD) $(LIBS)
-src/rc-local-generator.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-rc-local-generator$(EXEEXT): $(systemd_rc_local_generator_OBJECTS) $(systemd_rc_local_generator_DEPENDENCIES) $(EXTRA_systemd_rc_local_generator_DEPENDENCIES) 
-       @rm -f systemd-rc-local-generator$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_rc_local_generator_OBJECTS) $(systemd_rc_local_generator_LDADD) $(LIBS)
-src/readahead/systemd_readahead_collect-readahead-collect.$(OBJEXT):  \
-       src/readahead/$(am__dirstamp) \
-       src/readahead/$(DEPDIR)/$(am__dirstamp)
-src/readahead/systemd_readahead_collect-readahead-common.$(OBJEXT):  \
-       src/readahead/$(am__dirstamp) \
-       src/readahead/$(DEPDIR)/$(am__dirstamp)
-systemd-readahead-collect$(EXEEXT): $(systemd_readahead_collect_OBJECTS) $(systemd_readahead_collect_DEPENDENCIES) $(EXTRA_systemd_readahead_collect_DEPENDENCIES) 
-       @rm -f systemd-readahead-collect$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_readahead_collect_LINK) $(systemd_readahead_collect_OBJECTS) $(systemd_readahead_collect_LDADD) $(LIBS)
-src/readahead/systemd_readahead_replay-readahead-replay.$(OBJEXT):  \
-       src/readahead/$(am__dirstamp) \
-       src/readahead/$(DEPDIR)/$(am__dirstamp)
-src/readahead/systemd_readahead_replay-readahead-common.$(OBJEXT):  \
-       src/readahead/$(am__dirstamp) \
-       src/readahead/$(DEPDIR)/$(am__dirstamp)
-systemd-readahead-replay$(EXEEXT): $(systemd_readahead_replay_OBJECTS) $(systemd_readahead_replay_DEPENDENCIES) $(EXTRA_systemd_readahead_replay_DEPENDENCIES) 
-       @rm -f systemd-readahead-replay$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_readahead_replay_LINK) $(systemd_readahead_replay_OBJECTS) $(systemd_readahead_replay_LDADD) $(LIBS)
-src/remount-api-vfs.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/mount-setup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/exit-status.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-remount-api-vfs$(EXEEXT): $(systemd_remount_api_vfs_OBJECTS) $(systemd_remount_api_vfs_DEPENDENCIES) $(EXTRA_systemd_remount_api_vfs_DEPENDENCIES) 
-       @rm -f systemd-remount-api-vfs$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_remount_api_vfs_OBJECTS) $(systemd_remount_api_vfs_LDADD) $(LIBS)
-src/reply-password.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-reply-password$(EXEEXT): $(systemd_reply_password_OBJECTS) $(systemd_reply_password_DEPENDENCIES) $(EXTRA_systemd_reply_password_DEPENDENCIES) 
-       @rm -f systemd-reply-password$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_reply_password_OBJECTS) $(systemd_reply_password_LDADD) $(LIBS)
-src/systemd_shutdown-mount-setup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_shutdown-umount.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_shutdown-shutdown.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-shutdown$(EXEEXT): $(systemd_shutdown_OBJECTS) $(systemd_shutdown_DEPENDENCIES) $(EXTRA_systemd_shutdown_DEPENDENCIES) 
-       @rm -f systemd-shutdown$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_shutdown_LINK) $(systemd_shutdown_OBJECTS) $(systemd_shutdown_LDADD) $(LIBS)
-src/systemd_shutdownd-utmp-wtmp.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_shutdownd-shutdownd.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-shutdownd$(EXEEXT): $(systemd_shutdownd_OBJECTS) $(systemd_shutdownd_DEPENDENCIES) $(EXTRA_systemd_shutdownd_DEPENDENCIES) 
-       @rm -f systemd-shutdownd$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_shutdownd_LINK) $(systemd_shutdownd_OBJECTS) $(systemd_shutdownd_LDADD) $(LIBS)
-src/bridge.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-stdio-bridge$(EXEEXT): $(systemd_stdio_bridge_OBJECTS) $(systemd_stdio_bridge_DEPENDENCIES) $(EXTRA_systemd_stdio_bridge_DEPENDENCIES) 
-       @rm -f systemd-stdio-bridge$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_stdio_bridge_OBJECTS) $(systemd_stdio_bridge_LDADD) $(LIBS)
-src/sysctl.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-sysctl$(EXEEXT): $(systemd_sysctl_OBJECTS) $(systemd_sysctl_DEPENDENCIES) $(EXTRA_systemd_sysctl_DEPENDENCIES) 
-       @rm -f systemd-sysctl$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_sysctl_OBJECTS) $(systemd_sysctl_LDADD) $(LIBS)
-src/timedate/$(am__dirstamp):
-       @$(MKDIR_P) src/timedate
-       @: > src/timedate/$(am__dirstamp)
-src/timedate/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/timedate/$(DEPDIR)
-       @: > src/timedate/$(DEPDIR)/$(am__dirstamp)
-src/timedate/systemd_timedated-timedated.$(OBJEXT):  \
-       src/timedate/$(am__dirstamp) \
-       src/timedate/$(DEPDIR)/$(am__dirstamp)
-src/systemd_timedated-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_timedated-polkit.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-timedated$(EXEEXT): $(systemd_timedated_OBJECTS) $(systemd_timedated_DEPENDENCIES) $(EXTRA_systemd_timedated_DEPENDENCIES) 
-       @rm -f systemd-timedated$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_timedated_LINK) $(systemd_timedated_OBJECTS) $(systemd_timedated_LDADD) $(LIBS)
-src/timestamp.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-timestamp$(EXEEXT): $(systemd_timestamp_OBJECTS) $(systemd_timestamp_DEPENDENCIES) $(EXTRA_systemd_timestamp_DEPENDENCIES) 
-       @rm -f systemd-timestamp$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_timestamp_OBJECTS) $(systemd_timestamp_LDADD) $(LIBS)
-src/tmpfiles.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-tmpfiles$(EXEEXT): $(systemd_tmpfiles_OBJECTS) $(systemd_tmpfiles_DEPENDENCIES) $(EXTRA_systemd_tmpfiles_DEPENDENCIES) 
-       @rm -f systemd-tmpfiles$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_tmpfiles_OBJECTS) $(systemd_tmpfiles_LDADD) $(LIBS)
-src/tty-ask-password-agent.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/utmp-wtmp.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-tty-ask-password-agent$(EXEEXT): $(systemd_tty_ask_password_agent_OBJECTS) $(systemd_tty_ask_password_agent_DEPENDENCIES) $(EXTRA_systemd_tty_ask_password_agent_DEPENDENCIES) 
-       @rm -f systemd-tty-ask-password-agent$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_tty_ask_password_agent_OBJECTS) $(systemd_tty_ask_password_agent_LDADD) $(LIBS)
-src/login/systemd_uaccess-uaccess.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/login/systemd_uaccess-logind-acl.$(OBJEXT):  \
-       src/login/$(am__dirstamp) src/login/$(DEPDIR)/$(am__dirstamp)
-src/systemd_uaccess-acl-util.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-uaccess$(EXEEXT): $(systemd_uaccess_OBJECTS) $(systemd_uaccess_DEPENDENCIES) $(EXTRA_systemd_uaccess_DEPENDENCIES) 
-       @rm -f systemd-uaccess$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_uaccess_LINK) $(systemd_uaccess_OBJECTS) $(systemd_uaccess_LDADD) $(LIBS)
-src/systemd_update_utmp-update-utmp.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_update_utmp-dbus-common.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/systemd_update_utmp-utmp-wtmp.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-systemd-update-utmp$(EXEEXT): $(systemd_update_utmp_OBJECTS) $(systemd_update_utmp_DEPENDENCIES) $(EXTRA_systemd_update_utmp_DEPENDENCIES) 
-       @rm -f systemd-update-utmp$(EXEEXT)
-       $(AM_V_CCLD)$(systemd_update_utmp_LINK) $(systemd_update_utmp_OBJECTS) $(systemd_update_utmp_LDADD) $(LIBS)
-src/login/user-sessions.$(OBJEXT): src/login/$(am__dirstamp) \
-       src/login/$(DEPDIR)/$(am__dirstamp)
-systemd-user-sessions$(EXEEXT): $(systemd_user_sessions_OBJECTS) $(systemd_user_sessions_DEPENDENCIES) $(EXTRA_systemd_user_sessions_DEPENDENCIES) 
-       @rm -f systemd-user-sessions$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_user_sessions_OBJECTS) $(systemd_user_sessions_LDADD) $(LIBS)
-src/vconsole/$(am__dirstamp):
-       @$(MKDIR_P) src/vconsole
-       @: > src/vconsole/$(am__dirstamp)
-src/vconsole/$(DEPDIR)/$(am__dirstamp):
-       @$(MKDIR_P) src/vconsole/$(DEPDIR)
-       @: > src/vconsole/$(DEPDIR)/$(am__dirstamp)
-src/vconsole/vconsole-setup.$(OBJEXT): src/vconsole/$(am__dirstamp) \
-       src/vconsole/$(DEPDIR)/$(am__dirstamp)
-systemd-vconsole-setup$(EXEEXT): $(systemd_vconsole_setup_OBJECTS) $(systemd_vconsole_setup_DEPENDENCIES) $(EXTRA_systemd_vconsole_setup_DEPENDENCIES) 
-       @rm -f systemd-vconsole-setup$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(systemd_vconsole_setup_OBJECTS) $(systemd_vconsole_setup_LDADD) $(LIBS)
-src/test-cgroup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-cgroup$(EXEEXT): $(test_cgroup_OBJECTS) $(test_cgroup_DEPENDENCIES) $(EXTRA_test_cgroup_DEPENDENCIES) 
-       @rm -f test-cgroup$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_cgroup_OBJECTS) $(test_cgroup_LDADD) $(LIBS)
-src/test-daemon.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-daemon$(EXEEXT): $(test_daemon_OBJECTS) $(test_daemon_DEPENDENCIES) $(EXTRA_test_daemon_DEPENDENCIES) 
-       @rm -f test-daemon$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_daemon_OBJECTS) $(test_daemon_LDADD) $(LIBS)
-src/test_engine-test-engine.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-engine$(EXEEXT): $(test_engine_OBJECTS) $(test_engine_DEPENDENCIES) $(EXTRA_test_engine_DEPENDENCIES) 
-       @rm -f test-engine$(EXEEXT)
-       $(AM_V_CCLD)$(test_engine_LINK) $(test_engine_OBJECTS) $(test_engine_LDADD) $(LIBS)
-src/test-env-replace.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-env-replace$(EXEEXT): $(test_env_replace_OBJECTS) $(test_env_replace_DEPENDENCIES) $(EXTRA_test_env_replace_DEPENDENCIES) 
-       @rm -f test-env-replace$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_env_replace_OBJECTS) $(test_env_replace_LDADD) $(LIBS)
-src/test-hostname.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/hostname-setup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-hostname$(EXEEXT): $(test_hostname_OBJECTS) $(test_hostname_DEPENDENCIES) $(EXTRA_test_hostname_DEPENDENCIES) 
-       @rm -f test-hostname$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_hostname_OBJECTS) $(test_hostname_LDADD) $(LIBS)
-src/test-id128.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-id128$(EXEEXT): $(test_id128_OBJECTS) $(test_id128_DEPENDENCIES) $(EXTRA_test_id128_DEPENDENCIES) 
-       @rm -f test-id128$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_id128_OBJECTS) $(test_id128_LDADD) $(LIBS)
-src/test_install-test-install.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/test_install-install.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/test_install-path-lookup.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/test_install-unit-name.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-install$(EXEEXT): $(test_install_OBJECTS) $(test_install_DEPENDENCIES) $(EXTRA_test_install_DEPENDENCIES) 
-       @rm -f test-install$(EXEEXT)
-       $(AM_V_CCLD)$(test_install_LINK) $(test_install_OBJECTS) $(test_install_LDADD) $(LIBS)
-src/test_job_type-test-job-type.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-job-type$(EXEEXT): $(test_job_type_OBJECTS) $(test_job_type_DEPENDENCIES) $(EXTRA_test_job_type_DEPENDENCIES) 
-       @rm -f test-job-type$(EXEEXT)
-       $(AM_V_CCLD)$(test_job_type_LINK) $(test_job_type_OBJECTS) $(test_job_type_LDADD) $(LIBS)
-src/journal/test_journal-test-journal.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/test_journal-sd-journal.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/test_journal-journal-file.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/test_journal-lookup3.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/journal/test_journal-journal-send.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-src/test_journal-sd-id128.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/journal/test_journal-compress.$(OBJEXT):  \
-       src/journal/$(am__dirstamp) \
-       src/journal/$(DEPDIR)/$(am__dirstamp)
-test-journal$(EXEEXT): $(test_journal_OBJECTS) $(test_journal_DEPENDENCIES) $(EXTRA_test_journal_DEPENDENCIES) 
-       @rm -f test-journal$(EXEEXT)
-       $(AM_V_CCLD)$(test_journal_LINK) $(test_journal_OBJECTS) $(test_journal_LDADD) $(LIBS)
-src/login/test-login.$(OBJEXT): src/login/$(am__dirstamp) \
-       src/login/$(DEPDIR)/$(am__dirstamp)
-test-login$(EXEEXT): $(test_login_OBJECTS) $(test_login_DEPENDENCIES) $(EXTRA_test_login_DEPENDENCIES) 
-       @rm -f test-login$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_login_OBJECTS) $(test_login_LDADD) $(LIBS)
-src/test-loopback.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-loopback$(EXEEXT): $(test_loopback_OBJECTS) $(test_loopback_DEPENDENCIES) $(EXTRA_test_loopback_DEPENDENCIES) 
-       @rm -f test-loopback$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_loopback_OBJECTS) $(test_loopback_LDADD) $(LIBS)
-src/test_ns-test-ns.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-ns$(EXEEXT): $(test_ns_OBJECTS) $(test_ns_DEPENDENCIES) $(EXTRA_test_ns_DEPENDENCIES) 
-       @rm -f test-ns$(EXEEXT)
-       $(AM_V_CCLD)$(test_ns_LINK) $(test_ns_OBJECTS) $(test_ns_LDADD) $(LIBS)
-src/test-strv.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-src/specifier.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
-test-strv$(EXEEXT): $(test_strv_OBJECTS) $(test_strv_DEPENDENCIES) $(EXTRA_test_strv_DEPENDENCIES) 
-       @rm -f test-strv$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(test_strv_OBJECTS) $(test_strv_LDADD) $(LIBS)
-install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
-       @$(NORMAL_INSTALL)
-       test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-       @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-       done | \
-       sed -e 'p;s,.*/,,;n' \
-           -e 'h;s|.*|.|' \
-           -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-       $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-         { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-           if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-             if (++n[d] == $(am__install_max)) { \
-               print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-           else { print "f", d "/" $$4, $$1 } } \
-         END { for (d in files) print "f", d, files[d] }' | \
-       while read type dir files; do \
-            if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-            test -z "$$files" || { \
-              echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-              $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-            } \
-       ; done
-
-uninstall-dist_binSCRIPTS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-       files=`for p in $$list; do echo "$$p"; done | \
-              sed -e 's,.*/,,;$(transform)'`; \
-       dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-       -rm -f src/ask-password-api.$(OBJEXT)
-       -rm -f src/ask-password.$(OBJEXT)
-       -rm -f src/binfmt/binfmt.$(OBJEXT)
-       -rm -f src/bridge.$(OBJEXT)
-       -rm -f src/cgls.$(OBJEXT)
-       -rm -f src/cgroup-show.$(OBJEXT)
-       -rm -f src/cgroup-util.$(OBJEXT)
-       -rm -f src/cgtop.$(OBJEXT)
-       -rm -f src/cryptsetup/cryptsetup-generator.$(OBJEXT)
-       -rm -f src/cryptsetup/systemd_cryptsetup-cryptsetup.$(OBJEXT)
-       -rm -f src/detect-virt.$(OBJEXT)
-       -rm -f src/exit-status.$(OBJEXT)
-       -rm -f src/getty-generator.$(OBJEXT)
-       -rm -f src/hostname-setup.$(OBJEXT)
-       -rm -f src/hostname/systemd_hostnamed-hostnamed.$(OBJEXT)
-       -rm -f src/journal/cat.$(OBJEXT)
-       -rm -f src/journal/coredump.$(OBJEXT)
-       -rm -f src/journal/libsystemd_journal_la-compress.$(OBJEXT)
-       -rm -f src/journal/libsystemd_journal_la-compress.lo
-       -rm -f src/journal/libsystemd_journal_la-journal-file.$(OBJEXT)
-       -rm -f src/journal/libsystemd_journal_la-journal-file.lo
-       -rm -f src/journal/libsystemd_journal_la-journal-send.$(OBJEXT)
-       -rm -f src/journal/libsystemd_journal_la-journal-send.lo
-       -rm -f src/journal/libsystemd_journal_la-lookup3.$(OBJEXT)
-       -rm -f src/journal/libsystemd_journal_la-lookup3.lo
-       -rm -f src/journal/libsystemd_journal_la-sd-journal.$(OBJEXT)
-       -rm -f src/journal/libsystemd_journal_la-sd-journal.lo
-       -rm -f src/journal/systemd_journalctl-compress.$(OBJEXT)
-       -rm -f src/journal/systemd_journalctl-journalctl.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-compress.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-journal-file.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-journal-rate-limit.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-journald-gperf.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-journald.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-lookup3.$(OBJEXT)
-       -rm -f src/journal/systemd_journald-sd-journal.$(OBJEXT)
-       -rm -f src/journal/test_journal-compress.$(OBJEXT)
-       -rm -f src/journal/test_journal-journal-file.$(OBJEXT)
-       -rm -f src/journal/test_journal-journal-send.$(OBJEXT)
-       -rm -f src/journal/test_journal-lookup3.$(OBJEXT)
-       -rm -f src/journal/test_journal-sd-journal.$(OBJEXT)
-       -rm -f src/journal/test_journal-test-journal.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-conf-parser.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-conf-parser.lo
-       -rm -f src/libsystemd_basic_la-exit-status.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-exit-status.lo
-       -rm -f src/libsystemd_basic_la-hashmap.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-hashmap.lo
-       -rm -f src/libsystemd_basic_la-label.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-label.lo
-       -rm -f src/libsystemd_basic_la-log.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-log.lo
-       -rm -f src/libsystemd_basic_la-ratelimit.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-ratelimit.lo
-       -rm -f src/libsystemd_basic_la-set.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-set.lo
-       -rm -f src/libsystemd_basic_la-socket-util.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-socket-util.lo
-       -rm -f src/libsystemd_basic_la-strv.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-strv.lo
-       -rm -f src/libsystemd_basic_la-util.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-util.lo
-       -rm -f src/libsystemd_basic_la-virt.$(OBJEXT)
-       -rm -f src/libsystemd_basic_la-virt.lo
-       -rm -f src/libsystemd_core_la-automount.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-automount.lo
-       -rm -f src/libsystemd_core_la-cgroup-attr.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-cgroup-attr.lo
-       -rm -f src/libsystemd_core_la-cgroup-util.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-cgroup-util.lo
-       -rm -f src/libsystemd_core_la-cgroup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-cgroup.lo
-       -rm -f src/libsystemd_core_la-condition.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-condition.lo
-       -rm -f src/libsystemd_core_la-dbus-automount.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-automount.lo
-       -rm -f src/libsystemd_core_la-dbus-common.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-common.lo
-       -rm -f src/libsystemd_core_la-dbus-device.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-device.lo
-       -rm -f src/libsystemd_core_la-dbus-execute.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-execute.lo
-       -rm -f src/libsystemd_core_la-dbus-job.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-job.lo
-       -rm -f src/libsystemd_core_la-dbus-manager.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-manager.lo
-       -rm -f src/libsystemd_core_la-dbus-mount.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-mount.lo
-       -rm -f src/libsystemd_core_la-dbus-path.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-path.lo
-       -rm -f src/libsystemd_core_la-dbus-service.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-service.lo
-       -rm -f src/libsystemd_core_la-dbus-snapshot.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-snapshot.lo
-       -rm -f src/libsystemd_core_la-dbus-socket.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-socket.lo
-       -rm -f src/libsystemd_core_la-dbus-swap.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-swap.lo
-       -rm -f src/libsystemd_core_la-dbus-target.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-target.lo
-       -rm -f src/libsystemd_core_la-dbus-timer.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-timer.lo
-       -rm -f src/libsystemd_core_la-dbus-unit.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus-unit.lo
-       -rm -f src/libsystemd_core_la-dbus.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-dbus.lo
-       -rm -f src/libsystemd_core_la-device.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-device.lo
-       -rm -f src/libsystemd_core_la-execute.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-execute.lo
-       -rm -f src/libsystemd_core_la-fdset.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-fdset.lo
-       -rm -f src/libsystemd_core_la-hostname-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-hostname-setup.lo
-       -rm -f src/libsystemd_core_la-install.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-install.lo
-       -rm -f src/libsystemd_core_la-job.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-job.lo
-       -rm -f src/libsystemd_core_la-kmod-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-kmod-setup.lo
-       -rm -f src/libsystemd_core_la-load-dropin.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-load-dropin.lo
-       -rm -f src/libsystemd_core_la-load-fragment-gperf-nulstr.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-load-fragment-gperf-nulstr.lo
-       -rm -f src/libsystemd_core_la-load-fragment-gperf.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-load-fragment-gperf.lo
-       -rm -f src/libsystemd_core_la-load-fragment.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-load-fragment.lo
-       -rm -f src/libsystemd_core_la-locale-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-locale-setup.lo
-       -rm -f src/libsystemd_core_la-loopback-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-loopback-setup.lo
-       -rm -f src/libsystemd_core_la-machine-id-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-machine-id-setup.lo
-       -rm -f src/libsystemd_core_la-manager.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-manager.lo
-       -rm -f src/libsystemd_core_la-mount-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-mount-setup.lo
-       -rm -f src/libsystemd_core_la-mount.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-mount.lo
-       -rm -f src/libsystemd_core_la-namespace.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-namespace.lo
-       -rm -f src/libsystemd_core_la-path-lookup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-path-lookup.lo
-       -rm -f src/libsystemd_core_la-path.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-path.lo
-       -rm -f src/libsystemd_core_la-sd-daemon.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-sd-daemon.lo
-       -rm -f src/libsystemd_core_la-sd-id128.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-sd-id128.lo
-       -rm -f src/libsystemd_core_la-selinux-setup.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-selinux-setup.lo
-       -rm -f src/libsystemd_core_la-service.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-service.lo
-       -rm -f src/libsystemd_core_la-snapshot.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-snapshot.lo
-       -rm -f src/libsystemd_core_la-socket.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-socket.lo
-       -rm -f src/libsystemd_core_la-specifier.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-specifier.lo
-       -rm -f src/libsystemd_core_la-swap.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-swap.lo
-       -rm -f src/libsystemd_core_la-target.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-target.lo
-       -rm -f src/libsystemd_core_la-tcpwrap.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-tcpwrap.lo
-       -rm -f src/libsystemd_core_la-timer.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-timer.lo
-       -rm -f src/libsystemd_core_la-unit-name.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-unit-name.lo
-       -rm -f src/libsystemd_core_la-unit.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-unit.lo
-       -rm -f src/libsystemd_core_la-utmp-wtmp.$(OBJEXT)
-       -rm -f src/libsystemd_core_la-utmp-wtmp.lo
-       -rm -f src/libsystemd_daemon_la-sd-daemon.$(OBJEXT)
-       -rm -f src/libsystemd_daemon_la-sd-daemon.lo
-       -rm -f src/libsystemd_id128_la-sd-id128.$(OBJEXT)
-       -rm -f src/libsystemd_id128_la-sd-id128.lo
-       -rm -f src/libsystemd_login_la-cgroup-util.$(OBJEXT)
-       -rm -f src/libsystemd_login_la-cgroup-util.lo
-       -rm -f src/locale/systemd_localed-localed.$(OBJEXT)
-       -rm -f src/login/libsystemd_login_la-sd-login.$(OBJEXT)
-       -rm -f src/login/libsystemd_login_la-sd-login.lo
-       -rm -f src/login/pam_systemd_la-pam-module.$(OBJEXT)
-       -rm -f src/login/pam_systemd_la-pam-module.lo
-       -rm -f src/login/systemd_loginctl-loginctl.$(OBJEXT)
-       -rm -f src/login/systemd_loginctl-sysfs-show.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-acl.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-dbus.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-device.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-gperf.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-seat-dbus.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-seat.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-session-dbus.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-session.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-user-dbus.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind-user.$(OBJEXT)
-       -rm -f src/login/systemd_logind-logind.$(OBJEXT)
-       -rm -f src/login/systemd_multi_seat_x-multi-seat-x.$(OBJEXT)
-       -rm -f src/login/systemd_uaccess-logind-acl.$(OBJEXT)
-       -rm -f src/login/systemd_uaccess-uaccess.$(OBJEXT)
-       -rm -f src/login/test-login.$(OBJEXT)
-       -rm -f src/login/user-sessions.$(OBJEXT)
-       -rm -f src/loopback-setup.$(OBJEXT)
-       -rm -f src/machine-id-main.$(OBJEXT)
-       -rm -f src/machine-id-setup.$(OBJEXT)
-       -rm -f src/mount-setup.$(OBJEXT)
-       -rm -f src/notify.$(OBJEXT)
-       -rm -f src/nspawn.$(OBJEXT)
-       -rm -f src/pager.$(OBJEXT)
-       -rm -f src/pam_systemd_la-dbus-common.$(OBJEXT)
-       -rm -f src/pam_systemd_la-dbus-common.lo
-       -rm -f src/quotacheck.$(OBJEXT)
-       -rm -f src/random-seed.$(OBJEXT)
-       -rm -f src/rc-local-generator.$(OBJEXT)
-       -rm -f src/readahead/sd-readahead.$(OBJEXT)
-       -rm -f src/readahead/systemd_readahead_collect-readahead-collect.$(OBJEXT)
-       -rm -f src/readahead/systemd_readahead_collect-readahead-common.$(OBJEXT)
-       -rm -f src/readahead/systemd_readahead_replay-readahead-common.$(OBJEXT)
-       -rm -f src/readahead/systemd_readahead_replay-readahead-replay.$(OBJEXT)
-       -rm -f src/remount-api-vfs.$(OBJEXT)
-       -rm -f src/reply-password.$(OBJEXT)
-       -rm -f src/sd-id128.$(OBJEXT)
-       -rm -f src/specifier.$(OBJEXT)
-       -rm -f src/sysctl.$(OBJEXT)
-       -rm -f src/systemadm-systemadm.$(OBJEXT)
-       -rm -f src/systemadm-systemd-interfaces.$(OBJEXT)
-       -rm -f src/systemadm-wraplabel.$(OBJEXT)
-       -rm -f src/systemctl-cgroup-show.$(OBJEXT)
-       -rm -f src/systemctl-cgroup-util.$(OBJEXT)
-       -rm -f src/systemctl-dbus-common.$(OBJEXT)
-       -rm -f src/systemctl-exit-status.$(OBJEXT)
-       -rm -f src/systemctl-install.$(OBJEXT)
-       -rm -f src/systemctl-logs-show.$(OBJEXT)
-       -rm -f src/systemctl-pager.$(OBJEXT)
-       -rm -f src/systemctl-path-lookup.$(OBJEXT)
-       -rm -f src/systemctl-spawn-agent.$(OBJEXT)
-       -rm -f src/systemctl-systemctl.$(OBJEXT)
-       -rm -f src/systemctl-unit-name.$(OBJEXT)
-       -rm -f src/systemctl-utmp-wtmp.$(OBJEXT)
-       -rm -f src/systemd-main.$(OBJEXT)
-       -rm -f src/systemd_ac_power-ac-power.$(OBJEXT)
-       -rm -f src/systemd_cgroups_agent-cgroups-agent.$(OBJEXT)
-       -rm -f src/systemd_cgroups_agent-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_cryptsetup-ask-password-api.$(OBJEXT)
-       -rm -f src/systemd_fsck-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_fsck-fsck.$(OBJEXT)
-       -rm -f src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.$(OBJEXT)
-       -rm -f src/systemd_hostnamed-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_hostnamed-polkit.$(OBJEXT)
-       -rm -f src/systemd_initctl-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_initctl-initctl.$(OBJEXT)
-       -rm -f src/systemd_journalctl-logs-show.$(OBJEXT)
-       -rm -f src/systemd_journalctl-pager.$(OBJEXT)
-       -rm -f src/systemd_journald-acl-util.$(OBJEXT)
-       -rm -f src/systemd_journald-cgroup-util.$(OBJEXT)
-       -rm -f src/systemd_journald-sd-id128.$(OBJEXT)
-       -rm -f src/systemd_localed-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_localed-polkit.$(OBJEXT)
-       -rm -f src/systemd_loginctl-cgroup-show.$(OBJEXT)
-       -rm -f src/systemd_loginctl-cgroup-util.$(OBJEXT)
-       -rm -f src/systemd_loginctl-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_loginctl-pager.$(OBJEXT)
-       -rm -f src/systemd_logind-acl-util.$(OBJEXT)
-       -rm -f src/systemd_logind-cgroup-util.$(OBJEXT)
-       -rm -f src/systemd_logind-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_logind-dbus-loop.$(OBJEXT)
-       -rm -f src/systemd_logind-polkit.$(OBJEXT)
-       -rm -f src/systemd_modules_load-modules-load.$(OBJEXT)
-       -rm -f src/systemd_shutdown-mount-setup.$(OBJEXT)
-       -rm -f src/systemd_shutdown-shutdown.$(OBJEXT)
-       -rm -f src/systemd_shutdown-umount.$(OBJEXT)
-       -rm -f src/systemd_shutdownd-shutdownd.$(OBJEXT)
-       -rm -f src/systemd_shutdownd-utmp-wtmp.$(OBJEXT)
-       -rm -f src/systemd_timedated-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_timedated-polkit.$(OBJEXT)
-       -rm -f src/systemd_uaccess-acl-util.$(OBJEXT)
-       -rm -f src/systemd_update_utmp-dbus-common.$(OBJEXT)
-       -rm -f src/systemd_update_utmp-update-utmp.$(OBJEXT)
-       -rm -f src/systemd_update_utmp-utmp-wtmp.$(OBJEXT)
-       -rm -f src/test-cgroup.$(OBJEXT)
-       -rm -f src/test-daemon.$(OBJEXT)
-       -rm -f src/test-env-replace.$(OBJEXT)
-       -rm -f src/test-hostname.$(OBJEXT)
-       -rm -f src/test-id128.$(OBJEXT)
-       -rm -f src/test-loopback.$(OBJEXT)
-       -rm -f src/test-strv.$(OBJEXT)
-       -rm -f src/test_engine-test-engine.$(OBJEXT)
-       -rm -f src/test_install-install.$(OBJEXT)
-       -rm -f src/test_install-path-lookup.$(OBJEXT)
-       -rm -f src/test_install-test-install.$(OBJEXT)
-       -rm -f src/test_install-unit-name.$(OBJEXT)
-       -rm -f src/test_job_type-test-job-type.$(OBJEXT)
-       -rm -f src/test_journal-sd-id128.$(OBJEXT)
-       -rm -f src/test_ns-test-ns.$(OBJEXT)
-       -rm -f src/timedate/systemd_timedated-timedated.$(OBJEXT)
-       -rm -f src/timestamp.$(OBJEXT)
-       -rm -f src/tmpfiles.$(OBJEXT)
-       -rm -f src/tty-ask-password-agent.$(OBJEXT)
-       -rm -f src/unit-name.$(OBJEXT)
-       -rm -f src/utmp-wtmp.$(OBJEXT)
-       -rm -f src/vconsole/vconsole-setup.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ask-password-api.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ask-password.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/bridge.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cgls.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cgroup-show.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cgroup-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/cgtop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/detect-virt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/exit-status.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/getty-generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/hostname-setup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-conf-parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-exit-status.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-hashmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-label.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-ratelimit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-set.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-socket-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-strv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_basic_la-virt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-automount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-cgroup-attr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-cgroup-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-cgroup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-condition.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-automount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-execute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-job.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-mount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-service.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-snapshot.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-socket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-swap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-target.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus-unit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-dbus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-device.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-execute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-fdset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-hostname-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-install.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-job.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-kmod-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-load-dropin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf-nulstr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-load-fragment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-locale-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-loopback-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-machine-id-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-mount-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-mount.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-namespace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-path-lookup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-sd-daemon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-sd-id128.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-selinux-setup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-service.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-snapshot.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-socket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-specifier.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-swap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-target.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-tcpwrap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-unit-name.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-unit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_core_la-utmp-wtmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_daemon_la-sd-daemon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_id128_la-sd-id128.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/libsystemd_login_la-cgroup-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/loopback-setup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/machine-id-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/machine-id-setup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/mount-setup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/notify.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/nspawn.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/pam_systemd_la-dbus-common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/quotacheck.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/random-seed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/rc-local-generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/remount-api-vfs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/reply-password.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sd-id128.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/specifier.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/sysctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemadm-systemadm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemadm-systemd-interfaces.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemadm-wraplabel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-cgroup-show.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-cgroup-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-exit-status.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-install.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-logs-show.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-pager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-path-lookup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-spawn-agent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-systemctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-unit-name.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemctl-utmp-wtmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_ac_power-ac-power.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_fsck-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_fsck-fsck.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_hostnamed-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_hostnamed-polkit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_initctl-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_initctl-initctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_journalctl-logs-show.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_journalctl-pager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_journald-acl-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_journald-cgroup-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_journald-sd-id128.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_localed-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_localed-polkit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_loginctl-cgroup-show.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_loginctl-cgroup-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_loginctl-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_loginctl-pager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_logind-acl-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_logind-cgroup-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_logind-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_logind-dbus-loop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_logind-polkit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_modules_load-modules-load.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_shutdown-mount-setup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_shutdown-shutdown.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_shutdown-umount.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_shutdownd-shutdownd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_timedated-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_timedated-polkit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_uaccess-acl-util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_update_utmp-dbus-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_update_utmp-update-utmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-cgroup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-daemon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-env-replace.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-hostname.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-id128.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-loopback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test-strv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_engine-test-engine.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_install-install.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_install-path-lookup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_install-test-install.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_install-unit-name.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_job_type-test-job-type.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_journal-sd-id128.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test_ns-test-ns.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/timestamp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tmpfiles.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/tty-ask-password-agent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/unit-name.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/utmp-wtmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/binfmt/$(DEPDIR)/binfmt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/cryptsetup/$(DEPDIR)/cryptsetup-generator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/cat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/coredump.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/libsystemd_journal_la-compress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/libsystemd_journal_la-journal-file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/libsystemd_journal_la-journal-send.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/libsystemd_journal_la-lookup3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/libsystemd_journal_la-sd-journal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journalctl-compress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-compress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-journal-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-journald.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-lookup3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/systemd_journald-sd-journal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/test_journal-compress.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/test_journal-journal-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/test_journal-journal-send.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/test_journal-lookup3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/test_journal-sd-journal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/journal/$(DEPDIR)/test_journal-test-journal.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/locale/$(DEPDIR)/systemd_localed-localed.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/libsystemd_login_la-sd-login.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/pam_systemd_la-pam-module.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_loginctl-loginctl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-acl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-dbus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-gperf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-seat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-session.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind-user.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_logind-logind.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/systemd_uaccess-uaccess.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/test-login.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/login/$(DEPDIR)/user-sessions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/readahead/$(DEPDIR)/sd-readahead.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/timedate/$(DEPDIR)/systemd_timedated-timedated.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/vconsole/$(DEPDIR)/vconsole-setup.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@   $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-src/libsystemd_basic_la-util.lo: src/util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-util.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-util.Tpo -c -o src/libsystemd_basic_la-util.lo `test -f 'src/util.c' || echo '$(srcdir)/'`src/util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-util.Tpo src/$(DEPDIR)/libsystemd_basic_la-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/util.c' object='src/libsystemd_basic_la-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-util.lo `test -f 'src/util.c' || echo '$(srcdir)/'`src/util.c
-
-src/libsystemd_basic_la-virt.lo: src/virt.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-virt.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-virt.Tpo -c -o src/libsystemd_basic_la-virt.lo `test -f 'src/virt.c' || echo '$(srcdir)/'`src/virt.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-virt.Tpo src/$(DEPDIR)/libsystemd_basic_la-virt.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/virt.c' object='src/libsystemd_basic_la-virt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-virt.lo `test -f 'src/virt.c' || echo '$(srcdir)/'`src/virt.c
-
-src/libsystemd_basic_la-label.lo: src/label.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-label.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-label.Tpo -c -o src/libsystemd_basic_la-label.lo `test -f 'src/label.c' || echo '$(srcdir)/'`src/label.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-label.Tpo src/$(DEPDIR)/libsystemd_basic_la-label.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/label.c' object='src/libsystemd_basic_la-label.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-label.lo `test -f 'src/label.c' || echo '$(srcdir)/'`src/label.c
-
-src/libsystemd_basic_la-hashmap.lo: src/hashmap.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-hashmap.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-hashmap.Tpo -c -o src/libsystemd_basic_la-hashmap.lo `test -f 'src/hashmap.c' || echo '$(srcdir)/'`src/hashmap.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-hashmap.Tpo src/$(DEPDIR)/libsystemd_basic_la-hashmap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/hashmap.c' object='src/libsystemd_basic_la-hashmap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-hashmap.lo `test -f 'src/hashmap.c' || echo '$(srcdir)/'`src/hashmap.c
-
-src/libsystemd_basic_la-set.lo: src/set.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-set.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-set.Tpo -c -o src/libsystemd_basic_la-set.lo `test -f 'src/set.c' || echo '$(srcdir)/'`src/set.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-set.Tpo src/$(DEPDIR)/libsystemd_basic_la-set.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/set.c' object='src/libsystemd_basic_la-set.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-set.lo `test -f 'src/set.c' || echo '$(srcdir)/'`src/set.c
-
-src/libsystemd_basic_la-strv.lo: src/strv.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-strv.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-strv.Tpo -c -o src/libsystemd_basic_la-strv.lo `test -f 'src/strv.c' || echo '$(srcdir)/'`src/strv.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-strv.Tpo src/$(DEPDIR)/libsystemd_basic_la-strv.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/strv.c' object='src/libsystemd_basic_la-strv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-strv.lo `test -f 'src/strv.c' || echo '$(srcdir)/'`src/strv.c
-
-src/libsystemd_basic_la-conf-parser.lo: src/conf-parser.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-conf-parser.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-conf-parser.Tpo -c -o src/libsystemd_basic_la-conf-parser.lo `test -f 'src/conf-parser.c' || echo '$(srcdir)/'`src/conf-parser.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-conf-parser.Tpo src/$(DEPDIR)/libsystemd_basic_la-conf-parser.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/conf-parser.c' object='src/libsystemd_basic_la-conf-parser.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-conf-parser.lo `test -f 'src/conf-parser.c' || echo '$(srcdir)/'`src/conf-parser.c
-
-src/libsystemd_basic_la-socket-util.lo: src/socket-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-socket-util.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-socket-util.Tpo -c -o src/libsystemd_basic_la-socket-util.lo `test -f 'src/socket-util.c' || echo '$(srcdir)/'`src/socket-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-socket-util.Tpo src/$(DEPDIR)/libsystemd_basic_la-socket-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/socket-util.c' object='src/libsystemd_basic_la-socket-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-socket-util.lo `test -f 'src/socket-util.c' || echo '$(srcdir)/'`src/socket-util.c
-
-src/libsystemd_basic_la-log.lo: src/log.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-log.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-log.Tpo -c -o src/libsystemd_basic_la-log.lo `test -f 'src/log.c' || echo '$(srcdir)/'`src/log.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-log.Tpo src/$(DEPDIR)/libsystemd_basic_la-log.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/log.c' object='src/libsystemd_basic_la-log.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-log.lo `test -f 'src/log.c' || echo '$(srcdir)/'`src/log.c
-
-src/libsystemd_basic_la-ratelimit.lo: src/ratelimit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-ratelimit.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-ratelimit.Tpo -c -o src/libsystemd_basic_la-ratelimit.lo `test -f 'src/ratelimit.c' || echo '$(srcdir)/'`src/ratelimit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-ratelimit.Tpo src/$(DEPDIR)/libsystemd_basic_la-ratelimit.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/ratelimit.c' object='src/libsystemd_basic_la-ratelimit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-ratelimit.lo `test -f 'src/ratelimit.c' || echo '$(srcdir)/'`src/ratelimit.c
-
-src/libsystemd_basic_la-exit-status.lo: src/exit-status.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_basic_la-exit-status.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_basic_la-exit-status.Tpo -c -o src/libsystemd_basic_la-exit-status.lo `test -f 'src/exit-status.c' || echo '$(srcdir)/'`src/exit-status.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_basic_la-exit-status.Tpo src/$(DEPDIR)/libsystemd_basic_la-exit-status.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/exit-status.c' object='src/libsystemd_basic_la-exit-status.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_basic_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_basic_la-exit-status.lo `test -f 'src/exit-status.c' || echo '$(srcdir)/'`src/exit-status.c
-
-src/libsystemd_core_la-unit.lo: src/unit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-unit.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-unit.Tpo -c -o src/libsystemd_core_la-unit.lo `test -f 'src/unit.c' || echo '$(srcdir)/'`src/unit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-unit.Tpo src/$(DEPDIR)/libsystemd_core_la-unit.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/unit.c' object='src/libsystemd_core_la-unit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-unit.lo `test -f 'src/unit.c' || echo '$(srcdir)/'`src/unit.c
-
-src/libsystemd_core_la-job.lo: src/job.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-job.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-job.Tpo -c -o src/libsystemd_core_la-job.lo `test -f 'src/job.c' || echo '$(srcdir)/'`src/job.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-job.Tpo src/$(DEPDIR)/libsystemd_core_la-job.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/job.c' object='src/libsystemd_core_la-job.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-job.lo `test -f 'src/job.c' || echo '$(srcdir)/'`src/job.c
-
-src/libsystemd_core_la-manager.lo: src/manager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-manager.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-manager.Tpo -c -o src/libsystemd_core_la-manager.lo `test -f 'src/manager.c' || echo '$(srcdir)/'`src/manager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-manager.Tpo src/$(DEPDIR)/libsystemd_core_la-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/manager.c' object='src/libsystemd_core_la-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-manager.lo `test -f 'src/manager.c' || echo '$(srcdir)/'`src/manager.c
-
-src/libsystemd_core_la-path-lookup.lo: src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-path-lookup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-path-lookup.Tpo -c -o src/libsystemd_core_la-path-lookup.lo `test -f 'src/path-lookup.c' || echo '$(srcdir)/'`src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-path-lookup.Tpo src/$(DEPDIR)/libsystemd_core_la-path-lookup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/path-lookup.c' object='src/libsystemd_core_la-path-lookup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-path-lookup.lo `test -f 'src/path-lookup.c' || echo '$(srcdir)/'`src/path-lookup.c
-
-src/libsystemd_core_la-load-fragment.lo: src/load-fragment.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-load-fragment.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-load-fragment.Tpo -c -o src/libsystemd_core_la-load-fragment.lo `test -f 'src/load-fragment.c' || echo '$(srcdir)/'`src/load-fragment.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-load-fragment.Tpo src/$(DEPDIR)/libsystemd_core_la-load-fragment.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/load-fragment.c' object='src/libsystemd_core_la-load-fragment.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-load-fragment.lo `test -f 'src/load-fragment.c' || echo '$(srcdir)/'`src/load-fragment.c
-
-src/libsystemd_core_la-service.lo: src/service.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-service.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-service.Tpo -c -o src/libsystemd_core_la-service.lo `test -f 'src/service.c' || echo '$(srcdir)/'`src/service.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-service.Tpo src/$(DEPDIR)/libsystemd_core_la-service.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/service.c' object='src/libsystemd_core_la-service.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-service.lo `test -f 'src/service.c' || echo '$(srcdir)/'`src/service.c
-
-src/libsystemd_core_la-automount.lo: src/automount.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-automount.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-automount.Tpo -c -o src/libsystemd_core_la-automount.lo `test -f 'src/automount.c' || echo '$(srcdir)/'`src/automount.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-automount.Tpo src/$(DEPDIR)/libsystemd_core_la-automount.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/automount.c' object='src/libsystemd_core_la-automount.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-automount.lo `test -f 'src/automount.c' || echo '$(srcdir)/'`src/automount.c
-
-src/libsystemd_core_la-mount.lo: src/mount.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-mount.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-mount.Tpo -c -o src/libsystemd_core_la-mount.lo `test -f 'src/mount.c' || echo '$(srcdir)/'`src/mount.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-mount.Tpo src/$(DEPDIR)/libsystemd_core_la-mount.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/mount.c' object='src/libsystemd_core_la-mount.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-mount.lo `test -f 'src/mount.c' || echo '$(srcdir)/'`src/mount.c
-
-src/libsystemd_core_la-swap.lo: src/swap.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-swap.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-swap.Tpo -c -o src/libsystemd_core_la-swap.lo `test -f 'src/swap.c' || echo '$(srcdir)/'`src/swap.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-swap.Tpo src/$(DEPDIR)/libsystemd_core_la-swap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/swap.c' object='src/libsystemd_core_la-swap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-swap.lo `test -f 'src/swap.c' || echo '$(srcdir)/'`src/swap.c
-
-src/libsystemd_core_la-device.lo: src/device.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-device.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-device.Tpo -c -o src/libsystemd_core_la-device.lo `test -f 'src/device.c' || echo '$(srcdir)/'`src/device.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-device.Tpo src/$(DEPDIR)/libsystemd_core_la-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/device.c' object='src/libsystemd_core_la-device.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-device.lo `test -f 'src/device.c' || echo '$(srcdir)/'`src/device.c
-
-src/libsystemd_core_la-target.lo: src/target.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-target.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-target.Tpo -c -o src/libsystemd_core_la-target.lo `test -f 'src/target.c' || echo '$(srcdir)/'`src/target.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-target.Tpo src/$(DEPDIR)/libsystemd_core_la-target.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/target.c' object='src/libsystemd_core_la-target.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-target.lo `test -f 'src/target.c' || echo '$(srcdir)/'`src/target.c
-
-src/libsystemd_core_la-snapshot.lo: src/snapshot.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-snapshot.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-snapshot.Tpo -c -o src/libsystemd_core_la-snapshot.lo `test -f 'src/snapshot.c' || echo '$(srcdir)/'`src/snapshot.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-snapshot.Tpo src/$(DEPDIR)/libsystemd_core_la-snapshot.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/snapshot.c' object='src/libsystemd_core_la-snapshot.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-snapshot.lo `test -f 'src/snapshot.c' || echo '$(srcdir)/'`src/snapshot.c
-
-src/libsystemd_core_la-socket.lo: src/socket.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-socket.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-socket.Tpo -c -o src/libsystemd_core_la-socket.lo `test -f 'src/socket.c' || echo '$(srcdir)/'`src/socket.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-socket.Tpo src/$(DEPDIR)/libsystemd_core_la-socket.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/socket.c' object='src/libsystemd_core_la-socket.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-socket.lo `test -f 'src/socket.c' || echo '$(srcdir)/'`src/socket.c
-
-src/libsystemd_core_la-timer.lo: src/timer.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-timer.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-timer.Tpo -c -o src/libsystemd_core_la-timer.lo `test -f 'src/timer.c' || echo '$(srcdir)/'`src/timer.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-timer.Tpo src/$(DEPDIR)/libsystemd_core_la-timer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/timer.c' object='src/libsystemd_core_la-timer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-timer.lo `test -f 'src/timer.c' || echo '$(srcdir)/'`src/timer.c
-
-src/libsystemd_core_la-path.lo: src/path.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-path.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-path.Tpo -c -o src/libsystemd_core_la-path.lo `test -f 'src/path.c' || echo '$(srcdir)/'`src/path.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-path.Tpo src/$(DEPDIR)/libsystemd_core_la-path.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/path.c' object='src/libsystemd_core_la-path.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-path.lo `test -f 'src/path.c' || echo '$(srcdir)/'`src/path.c
-
-src/libsystemd_core_la-load-dropin.lo: src/load-dropin.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-load-dropin.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-load-dropin.Tpo -c -o src/libsystemd_core_la-load-dropin.lo `test -f 'src/load-dropin.c' || echo '$(srcdir)/'`src/load-dropin.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-load-dropin.Tpo src/$(DEPDIR)/libsystemd_core_la-load-dropin.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/load-dropin.c' object='src/libsystemd_core_la-load-dropin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-load-dropin.lo `test -f 'src/load-dropin.c' || echo '$(srcdir)/'`src/load-dropin.c
-
-src/libsystemd_core_la-execute.lo: src/execute.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-execute.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-execute.Tpo -c -o src/libsystemd_core_la-execute.lo `test -f 'src/execute.c' || echo '$(srcdir)/'`src/execute.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-execute.Tpo src/$(DEPDIR)/libsystemd_core_la-execute.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/execute.c' object='src/libsystemd_core_la-execute.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-execute.lo `test -f 'src/execute.c' || echo '$(srcdir)/'`src/execute.c
-
-src/libsystemd_core_la-utmp-wtmp.lo: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-utmp-wtmp.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-utmp-wtmp.Tpo -c -o src/libsystemd_core_la-utmp-wtmp.lo `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-utmp-wtmp.Tpo src/$(DEPDIR)/libsystemd_core_la-utmp-wtmp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/libsystemd_core_la-utmp-wtmp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-utmp-wtmp.lo `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-
-src/libsystemd_core_la-dbus.lo: src/dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus.Tpo -c -o src/libsystemd_core_la-dbus.lo `test -f 'src/dbus.c' || echo '$(srcdir)/'`src/dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus.c' object='src/libsystemd_core_la-dbus.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus.lo `test -f 'src/dbus.c' || echo '$(srcdir)/'`src/dbus.c
-
-src/libsystemd_core_la-dbus-manager.lo: src/dbus-manager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-manager.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-manager.Tpo -c -o src/libsystemd_core_la-dbus-manager.lo `test -f 'src/dbus-manager.c' || echo '$(srcdir)/'`src/dbus-manager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-manager.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-manager.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-manager.c' object='src/libsystemd_core_la-dbus-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-manager.lo `test -f 'src/dbus-manager.c' || echo '$(srcdir)/'`src/dbus-manager.c
-
-src/libsystemd_core_la-dbus-unit.lo: src/dbus-unit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-unit.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-unit.Tpo -c -o src/libsystemd_core_la-dbus-unit.lo `test -f 'src/dbus-unit.c' || echo '$(srcdir)/'`src/dbus-unit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-unit.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-unit.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-unit.c' object='src/libsystemd_core_la-dbus-unit.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-unit.lo `test -f 'src/dbus-unit.c' || echo '$(srcdir)/'`src/dbus-unit.c
-
-src/libsystemd_core_la-dbus-job.lo: src/dbus-job.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-job.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-job.Tpo -c -o src/libsystemd_core_la-dbus-job.lo `test -f 'src/dbus-job.c' || echo '$(srcdir)/'`src/dbus-job.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-job.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-job.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-job.c' object='src/libsystemd_core_la-dbus-job.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-job.lo `test -f 'src/dbus-job.c' || echo '$(srcdir)/'`src/dbus-job.c
-
-src/libsystemd_core_la-dbus-service.lo: src/dbus-service.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-service.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-service.Tpo -c -o src/libsystemd_core_la-dbus-service.lo `test -f 'src/dbus-service.c' || echo '$(srcdir)/'`src/dbus-service.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-service.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-service.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-service.c' object='src/libsystemd_core_la-dbus-service.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-service.lo `test -f 'src/dbus-service.c' || echo '$(srcdir)/'`src/dbus-service.c
-
-src/libsystemd_core_la-dbus-socket.lo: src/dbus-socket.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-socket.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-socket.Tpo -c -o src/libsystemd_core_la-dbus-socket.lo `test -f 'src/dbus-socket.c' || echo '$(srcdir)/'`src/dbus-socket.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-socket.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-socket.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-socket.c' object='src/libsystemd_core_la-dbus-socket.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-socket.lo `test -f 'src/dbus-socket.c' || echo '$(srcdir)/'`src/dbus-socket.c
-
-src/libsystemd_core_la-dbus-timer.lo: src/dbus-timer.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-timer.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-timer.Tpo -c -o src/libsystemd_core_la-dbus-timer.lo `test -f 'src/dbus-timer.c' || echo '$(srcdir)/'`src/dbus-timer.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-timer.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-timer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-timer.c' object='src/libsystemd_core_la-dbus-timer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-timer.lo `test -f 'src/dbus-timer.c' || echo '$(srcdir)/'`src/dbus-timer.c
-
-src/libsystemd_core_la-dbus-target.lo: src/dbus-target.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-target.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-target.Tpo -c -o src/libsystemd_core_la-dbus-target.lo `test -f 'src/dbus-target.c' || echo '$(srcdir)/'`src/dbus-target.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-target.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-target.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-target.c' object='src/libsystemd_core_la-dbus-target.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-target.lo `test -f 'src/dbus-target.c' || echo '$(srcdir)/'`src/dbus-target.c
-
-src/libsystemd_core_la-dbus-mount.lo: src/dbus-mount.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-mount.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-mount.Tpo -c -o src/libsystemd_core_la-dbus-mount.lo `test -f 'src/dbus-mount.c' || echo '$(srcdir)/'`src/dbus-mount.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-mount.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-mount.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-mount.c' object='src/libsystemd_core_la-dbus-mount.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-mount.lo `test -f 'src/dbus-mount.c' || echo '$(srcdir)/'`src/dbus-mount.c
-
-src/libsystemd_core_la-dbus-automount.lo: src/dbus-automount.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-automount.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-automount.Tpo -c -o src/libsystemd_core_la-dbus-automount.lo `test -f 'src/dbus-automount.c' || echo '$(srcdir)/'`src/dbus-automount.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-automount.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-automount.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-automount.c' object='src/libsystemd_core_la-dbus-automount.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-automount.lo `test -f 'src/dbus-automount.c' || echo '$(srcdir)/'`src/dbus-automount.c
-
-src/libsystemd_core_la-dbus-swap.lo: src/dbus-swap.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-swap.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-swap.Tpo -c -o src/libsystemd_core_la-dbus-swap.lo `test -f 'src/dbus-swap.c' || echo '$(srcdir)/'`src/dbus-swap.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-swap.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-swap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-swap.c' object='src/libsystemd_core_la-dbus-swap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-swap.lo `test -f 'src/dbus-swap.c' || echo '$(srcdir)/'`src/dbus-swap.c
-
-src/libsystemd_core_la-dbus-snapshot.lo: src/dbus-snapshot.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-snapshot.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-snapshot.Tpo -c -o src/libsystemd_core_la-dbus-snapshot.lo `test -f 'src/dbus-snapshot.c' || echo '$(srcdir)/'`src/dbus-snapshot.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-snapshot.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-snapshot.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-snapshot.c' object='src/libsystemd_core_la-dbus-snapshot.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-snapshot.lo `test -f 'src/dbus-snapshot.c' || echo '$(srcdir)/'`src/dbus-snapshot.c
-
-src/libsystemd_core_la-dbus-device.lo: src/dbus-device.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-device.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-device.Tpo -c -o src/libsystemd_core_la-dbus-device.lo `test -f 'src/dbus-device.c' || echo '$(srcdir)/'`src/dbus-device.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-device.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-device.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-device.c' object='src/libsystemd_core_la-dbus-device.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-device.lo `test -f 'src/dbus-device.c' || echo '$(srcdir)/'`src/dbus-device.c
-
-src/libsystemd_core_la-dbus-execute.lo: src/dbus-execute.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-execute.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-execute.Tpo -c -o src/libsystemd_core_la-dbus-execute.lo `test -f 'src/dbus-execute.c' || echo '$(srcdir)/'`src/dbus-execute.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-execute.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-execute.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-execute.c' object='src/libsystemd_core_la-dbus-execute.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-execute.lo `test -f 'src/dbus-execute.c' || echo '$(srcdir)/'`src/dbus-execute.c
-
-src/libsystemd_core_la-dbus-path.lo: src/dbus-path.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-path.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-path.Tpo -c -o src/libsystemd_core_la-dbus-path.lo `test -f 'src/dbus-path.c' || echo '$(srcdir)/'`src/dbus-path.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-path.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-path.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-path.c' object='src/libsystemd_core_la-dbus-path.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-path.lo `test -f 'src/dbus-path.c' || echo '$(srcdir)/'`src/dbus-path.c
-
-src/libsystemd_core_la-cgroup.lo: src/cgroup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-cgroup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-cgroup.Tpo -c -o src/libsystemd_core_la-cgroup.lo `test -f 'src/cgroup.c' || echo '$(srcdir)/'`src/cgroup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-cgroup.Tpo src/$(DEPDIR)/libsystemd_core_la-cgroup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup.c' object='src/libsystemd_core_la-cgroup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-cgroup.lo `test -f 'src/cgroup.c' || echo '$(srcdir)/'`src/cgroup.c
-
-src/libsystemd_core_la-mount-setup.lo: src/mount-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-mount-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-mount-setup.Tpo -c -o src/libsystemd_core_la-mount-setup.lo `test -f 'src/mount-setup.c' || echo '$(srcdir)/'`src/mount-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-mount-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-mount-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/mount-setup.c' object='src/libsystemd_core_la-mount-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-mount-setup.lo `test -f 'src/mount-setup.c' || echo '$(srcdir)/'`src/mount-setup.c
-
-src/libsystemd_core_la-hostname-setup.lo: src/hostname-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-hostname-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-hostname-setup.Tpo -c -o src/libsystemd_core_la-hostname-setup.lo `test -f 'src/hostname-setup.c' || echo '$(srcdir)/'`src/hostname-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-hostname-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-hostname-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/hostname-setup.c' object='src/libsystemd_core_la-hostname-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-hostname-setup.lo `test -f 'src/hostname-setup.c' || echo '$(srcdir)/'`src/hostname-setup.c
-
-src/libsystemd_core_la-selinux-setup.lo: src/selinux-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-selinux-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-selinux-setup.Tpo -c -o src/libsystemd_core_la-selinux-setup.lo `test -f 'src/selinux-setup.c' || echo '$(srcdir)/'`src/selinux-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-selinux-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-selinux-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/selinux-setup.c' object='src/libsystemd_core_la-selinux-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-selinux-setup.lo `test -f 'src/selinux-setup.c' || echo '$(srcdir)/'`src/selinux-setup.c
-
-src/libsystemd_core_la-loopback-setup.lo: src/loopback-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-loopback-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-loopback-setup.Tpo -c -o src/libsystemd_core_la-loopback-setup.lo `test -f 'src/loopback-setup.c' || echo '$(srcdir)/'`src/loopback-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-loopback-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-loopback-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/loopback-setup.c' object='src/libsystemd_core_la-loopback-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-loopback-setup.lo `test -f 'src/loopback-setup.c' || echo '$(srcdir)/'`src/loopback-setup.c
-
-src/libsystemd_core_la-kmod-setup.lo: src/kmod-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-kmod-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-kmod-setup.Tpo -c -o src/libsystemd_core_la-kmod-setup.lo `test -f 'src/kmod-setup.c' || echo '$(srcdir)/'`src/kmod-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-kmod-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-kmod-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/kmod-setup.c' object='src/libsystemd_core_la-kmod-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-kmod-setup.lo `test -f 'src/kmod-setup.c' || echo '$(srcdir)/'`src/kmod-setup.c
-
-src/libsystemd_core_la-locale-setup.lo: src/locale-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-locale-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-locale-setup.Tpo -c -o src/libsystemd_core_la-locale-setup.lo `test -f 'src/locale-setup.c' || echo '$(srcdir)/'`src/locale-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-locale-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-locale-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/locale-setup.c' object='src/libsystemd_core_la-locale-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-locale-setup.lo `test -f 'src/locale-setup.c' || echo '$(srcdir)/'`src/locale-setup.c
-
-src/libsystemd_core_la-machine-id-setup.lo: src/machine-id-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-machine-id-setup.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-machine-id-setup.Tpo -c -o src/libsystemd_core_la-machine-id-setup.lo `test -f 'src/machine-id-setup.c' || echo '$(srcdir)/'`src/machine-id-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-machine-id-setup.Tpo src/$(DEPDIR)/libsystemd_core_la-machine-id-setup.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/machine-id-setup.c' object='src/libsystemd_core_la-machine-id-setup.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-machine-id-setup.lo `test -f 'src/machine-id-setup.c' || echo '$(srcdir)/'`src/machine-id-setup.c
-
-src/libsystemd_core_la-specifier.lo: src/specifier.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-specifier.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-specifier.Tpo -c -o src/libsystemd_core_la-specifier.lo `test -f 'src/specifier.c' || echo '$(srcdir)/'`src/specifier.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-specifier.Tpo src/$(DEPDIR)/libsystemd_core_la-specifier.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/specifier.c' object='src/libsystemd_core_la-specifier.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-specifier.lo `test -f 'src/specifier.c' || echo '$(srcdir)/'`src/specifier.c
-
-src/libsystemd_core_la-unit-name.lo: src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-unit-name.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-unit-name.Tpo -c -o src/libsystemd_core_la-unit-name.lo `test -f 'src/unit-name.c' || echo '$(srcdir)/'`src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-unit-name.Tpo src/$(DEPDIR)/libsystemd_core_la-unit-name.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/unit-name.c' object='src/libsystemd_core_la-unit-name.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-unit-name.lo `test -f 'src/unit-name.c' || echo '$(srcdir)/'`src/unit-name.c
-
-src/libsystemd_core_la-fdset.lo: src/fdset.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-fdset.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-fdset.Tpo -c -o src/libsystemd_core_la-fdset.lo `test -f 'src/fdset.c' || echo '$(srcdir)/'`src/fdset.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-fdset.Tpo src/$(DEPDIR)/libsystemd_core_la-fdset.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/fdset.c' object='src/libsystemd_core_la-fdset.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-fdset.lo `test -f 'src/fdset.c' || echo '$(srcdir)/'`src/fdset.c
-
-src/libsystemd_core_la-namespace.lo: src/namespace.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-namespace.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-namespace.Tpo -c -o src/libsystemd_core_la-namespace.lo `test -f 'src/namespace.c' || echo '$(srcdir)/'`src/namespace.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-namespace.Tpo src/$(DEPDIR)/libsystemd_core_la-namespace.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/namespace.c' object='src/libsystemd_core_la-namespace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-namespace.lo `test -f 'src/namespace.c' || echo '$(srcdir)/'`src/namespace.c
-
-src/libsystemd_core_la-tcpwrap.lo: src/tcpwrap.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-tcpwrap.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-tcpwrap.Tpo -c -o src/libsystemd_core_la-tcpwrap.lo `test -f 'src/tcpwrap.c' || echo '$(srcdir)/'`src/tcpwrap.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-tcpwrap.Tpo src/$(DEPDIR)/libsystemd_core_la-tcpwrap.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/tcpwrap.c' object='src/libsystemd_core_la-tcpwrap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-tcpwrap.lo `test -f 'src/tcpwrap.c' || echo '$(srcdir)/'`src/tcpwrap.c
-
-src/libsystemd_core_la-cgroup-util.lo: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-cgroup-util.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-cgroup-util.Tpo -c -o src/libsystemd_core_la-cgroup-util.lo `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-cgroup-util.Tpo src/$(DEPDIR)/libsystemd_core_la-cgroup-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/libsystemd_core_la-cgroup-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-cgroup-util.lo `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-
-src/libsystemd_core_la-condition.lo: src/condition.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-condition.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-condition.Tpo -c -o src/libsystemd_core_la-condition.lo `test -f 'src/condition.c' || echo '$(srcdir)/'`src/condition.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-condition.Tpo src/$(DEPDIR)/libsystemd_core_la-condition.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/condition.c' object='src/libsystemd_core_la-condition.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-condition.lo `test -f 'src/condition.c' || echo '$(srcdir)/'`src/condition.c
-
-src/libsystemd_core_la-dbus-common.lo: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-dbus-common.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-dbus-common.Tpo -c -o src/libsystemd_core_la-dbus-common.lo `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-dbus-common.Tpo src/$(DEPDIR)/libsystemd_core_la-dbus-common.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/libsystemd_core_la-dbus-common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-dbus-common.lo `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/libsystemd_core_la-sd-daemon.lo: src/sd-daemon.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-sd-daemon.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-sd-daemon.Tpo -c -o src/libsystemd_core_la-sd-daemon.lo `test -f 'src/sd-daemon.c' || echo '$(srcdir)/'`src/sd-daemon.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-sd-daemon.Tpo src/$(DEPDIR)/libsystemd_core_la-sd-daemon.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-daemon.c' object='src/libsystemd_core_la-sd-daemon.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-sd-daemon.lo `test -f 'src/sd-daemon.c' || echo '$(srcdir)/'`src/sd-daemon.c
-
-src/libsystemd_core_la-install.lo: src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-install.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-install.Tpo -c -o src/libsystemd_core_la-install.lo `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-install.Tpo src/$(DEPDIR)/libsystemd_core_la-install.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/install.c' object='src/libsystemd_core_la-install.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-install.lo `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
-
-src/libsystemd_core_la-cgroup-attr.lo: src/cgroup-attr.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-cgroup-attr.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-cgroup-attr.Tpo -c -o src/libsystemd_core_la-cgroup-attr.lo `test -f 'src/cgroup-attr.c' || echo '$(srcdir)/'`src/cgroup-attr.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-cgroup-attr.Tpo src/$(DEPDIR)/libsystemd_core_la-cgroup-attr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-attr.c' object='src/libsystemd_core_la-cgroup-attr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-cgroup-attr.lo `test -f 'src/cgroup-attr.c' || echo '$(srcdir)/'`src/cgroup-attr.c
-
-src/libsystemd_core_la-sd-id128.lo: src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-sd-id128.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-sd-id128.Tpo -c -o src/libsystemd_core_la-sd-id128.lo `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-sd-id128.Tpo src/$(DEPDIR)/libsystemd_core_la-sd-id128.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-id128.c' object='src/libsystemd_core_la-sd-id128.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-sd-id128.lo `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-
-src/libsystemd_core_la-load-fragment-gperf.lo: src/load-fragment-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-load-fragment-gperf.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf.Tpo -c -o src/libsystemd_core_la-load-fragment-gperf.lo `test -f 'src/load-fragment-gperf.c' || echo '$(srcdir)/'`src/load-fragment-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf.Tpo src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/load-fragment-gperf.c' object='src/libsystemd_core_la-load-fragment-gperf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-load-fragment-gperf.lo `test -f 'src/load-fragment-gperf.c' || echo '$(srcdir)/'`src/load-fragment-gperf.c
-
-src/libsystemd_core_la-load-fragment-gperf-nulstr.lo: src/load-fragment-gperf-nulstr.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_core_la-load-fragment-gperf-nulstr.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf-nulstr.Tpo -c -o src/libsystemd_core_la-load-fragment-gperf-nulstr.lo `test -f 'src/load-fragment-gperf-nulstr.c' || echo '$(srcdir)/'`src/load-fragment-gperf-nulstr.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf-nulstr.Tpo src/$(DEPDIR)/libsystemd_core_la-load-fragment-gperf-nulstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/load-fragment-gperf-nulstr.c' object='src/libsystemd_core_la-load-fragment-gperf-nulstr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_core_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_core_la-load-fragment-gperf-nulstr.lo `test -f 'src/load-fragment-gperf-nulstr.c' || echo '$(srcdir)/'`src/load-fragment-gperf-nulstr.c
-
-src/libsystemd_daemon_la-sd-daemon.lo: src/sd-daemon.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_daemon_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_daemon_la-sd-daemon.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_daemon_la-sd-daemon.Tpo -c -o src/libsystemd_daemon_la-sd-daemon.lo `test -f 'src/sd-daemon.c' || echo '$(srcdir)/'`src/sd-daemon.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_daemon_la-sd-daemon.Tpo src/$(DEPDIR)/libsystemd_daemon_la-sd-daemon.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-daemon.c' object='src/libsystemd_daemon_la-sd-daemon.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_daemon_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_daemon_la-sd-daemon.lo `test -f 'src/sd-daemon.c' || echo '$(srcdir)/'`src/sd-daemon.c
-
-src/libsystemd_id128_la-sd-id128.lo: src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_id128_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_id128_la-sd-id128.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_id128_la-sd-id128.Tpo -c -o src/libsystemd_id128_la-sd-id128.lo `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_id128_la-sd-id128.Tpo src/$(DEPDIR)/libsystemd_id128_la-sd-id128.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-id128.c' object='src/libsystemd_id128_la-sd-id128.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_id128_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_id128_la-sd-id128.lo `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-
-src/journal/libsystemd_journal_la-sd-journal.lo: src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -MT src/journal/libsystemd_journal_la-sd-journal.lo -MD -MP -MF src/journal/$(DEPDIR)/libsystemd_journal_la-sd-journal.Tpo -c -o src/journal/libsystemd_journal_la-sd-journal.lo `test -f 'src/journal/sd-journal.c' || echo '$(srcdir)/'`src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/libsystemd_journal_la-sd-journal.Tpo src/journal/$(DEPDIR)/libsystemd_journal_la-sd-journal.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/sd-journal.c' object='src/journal/libsystemd_journal_la-sd-journal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -c -o src/journal/libsystemd_journal_la-sd-journal.lo `test -f 'src/journal/sd-journal.c' || echo '$(srcdir)/'`src/journal/sd-journal.c
-
-src/journal/libsystemd_journal_la-journal-file.lo: src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -MT src/journal/libsystemd_journal_la-journal-file.lo -MD -MP -MF src/journal/$(DEPDIR)/libsystemd_journal_la-journal-file.Tpo -c -o src/journal/libsystemd_journal_la-journal-file.lo `test -f 'src/journal/journal-file.c' || echo '$(srcdir)/'`src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/libsystemd_journal_la-journal-file.Tpo src/journal/$(DEPDIR)/libsystemd_journal_la-journal-file.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-file.c' object='src/journal/libsystemd_journal_la-journal-file.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -c -o src/journal/libsystemd_journal_la-journal-file.lo `test -f 'src/journal/journal-file.c' || echo '$(srcdir)/'`src/journal/journal-file.c
-
-src/journal/libsystemd_journal_la-lookup3.lo: src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -MT src/journal/libsystemd_journal_la-lookup3.lo -MD -MP -MF src/journal/$(DEPDIR)/libsystemd_journal_la-lookup3.Tpo -c -o src/journal/libsystemd_journal_la-lookup3.lo `test -f 'src/journal/lookup3.c' || echo '$(srcdir)/'`src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/libsystemd_journal_la-lookup3.Tpo src/journal/$(DEPDIR)/libsystemd_journal_la-lookup3.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/lookup3.c' object='src/journal/libsystemd_journal_la-lookup3.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -c -o src/journal/libsystemd_journal_la-lookup3.lo `test -f 'src/journal/lookup3.c' || echo '$(srcdir)/'`src/journal/lookup3.c
-
-src/journal/libsystemd_journal_la-journal-send.lo: src/journal/journal-send.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -MT src/journal/libsystemd_journal_la-journal-send.lo -MD -MP -MF src/journal/$(DEPDIR)/libsystemd_journal_la-journal-send.Tpo -c -o src/journal/libsystemd_journal_la-journal-send.lo `test -f 'src/journal/journal-send.c' || echo '$(srcdir)/'`src/journal/journal-send.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/libsystemd_journal_la-journal-send.Tpo src/journal/$(DEPDIR)/libsystemd_journal_la-journal-send.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-send.c' object='src/journal/libsystemd_journal_la-journal-send.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -c -o src/journal/libsystemd_journal_la-journal-send.lo `test -f 'src/journal/journal-send.c' || echo '$(srcdir)/'`src/journal/journal-send.c
-
-src/journal/libsystemd_journal_la-compress.lo: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -MT src/journal/libsystemd_journal_la-compress.lo -MD -MP -MF src/journal/$(DEPDIR)/libsystemd_journal_la-compress.Tpo -c -o src/journal/libsystemd_journal_la-compress.lo `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/libsystemd_journal_la-compress.Tpo src/journal/$(DEPDIR)/libsystemd_journal_la-compress.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/libsystemd_journal_la-compress.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_journal_la_CFLAGS) $(CFLAGS) -c -o src/journal/libsystemd_journal_la-compress.lo `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-
-src/login/libsystemd_login_la-sd-login.lo: src/login/sd-login.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_login_la_CFLAGS) $(CFLAGS) -MT src/login/libsystemd_login_la-sd-login.lo -MD -MP -MF src/login/$(DEPDIR)/libsystemd_login_la-sd-login.Tpo -c -o src/login/libsystemd_login_la-sd-login.lo `test -f 'src/login/sd-login.c' || echo '$(srcdir)/'`src/login/sd-login.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/libsystemd_login_la-sd-login.Tpo src/login/$(DEPDIR)/libsystemd_login_la-sd-login.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/sd-login.c' object='src/login/libsystemd_login_la-sd-login.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_login_la_CFLAGS) $(CFLAGS) -c -o src/login/libsystemd_login_la-sd-login.lo `test -f 'src/login/sd-login.c' || echo '$(srcdir)/'`src/login/sd-login.c
-
-src/libsystemd_login_la-cgroup-util.lo: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_login_la_CFLAGS) $(CFLAGS) -MT src/libsystemd_login_la-cgroup-util.lo -MD -MP -MF src/$(DEPDIR)/libsystemd_login_la-cgroup-util.Tpo -c -o src/libsystemd_login_la-cgroup-util.lo `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/libsystemd_login_la-cgroup-util.Tpo src/$(DEPDIR)/libsystemd_login_la-cgroup-util.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/libsystemd_login_la-cgroup-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsystemd_login_la_CFLAGS) $(CFLAGS) -c -o src/libsystemd_login_la-cgroup-util.lo `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-
-src/login/pam_systemd_la-pam-module.lo: src/login/pam-module.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_systemd_la_CFLAGS) $(CFLAGS) -MT src/login/pam_systemd_la-pam-module.lo -MD -MP -MF src/login/$(DEPDIR)/pam_systemd_la-pam-module.Tpo -c -o src/login/pam_systemd_la-pam-module.lo `test -f 'src/login/pam-module.c' || echo '$(srcdir)/'`src/login/pam-module.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/pam_systemd_la-pam-module.Tpo src/login/$(DEPDIR)/pam_systemd_la-pam-module.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/pam-module.c' object='src/login/pam_systemd_la-pam-module.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_systemd_la_CFLAGS) $(CFLAGS) -c -o src/login/pam_systemd_la-pam-module.lo `test -f 'src/login/pam-module.c' || echo '$(srcdir)/'`src/login/pam-module.c
-
-src/pam_systemd_la-dbus-common.lo: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_systemd_la_CFLAGS) $(CFLAGS) -MT src/pam_systemd_la-dbus-common.lo -MD -MP -MF src/$(DEPDIR)/pam_systemd_la-dbus-common.Tpo -c -o src/pam_systemd_la-dbus-common.lo `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/pam_systemd_la-dbus-common.Tpo src/$(DEPDIR)/pam_systemd_la-dbus-common.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/pam_systemd_la-dbus-common.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pam_systemd_la_CFLAGS) $(CFLAGS) -c -o src/pam_systemd_la-dbus-common.lo `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemadm-systemadm.o: src/systemadm.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -MT src/systemadm-systemadm.o -MD -MP -MF src/$(DEPDIR)/systemadm-systemadm.Tpo -c -o src/systemadm-systemadm.o `test -f 'src/systemadm.c' || echo '$(srcdir)/'`src/systemadm.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemadm-systemadm.Tpo src/$(DEPDIR)/systemadm-systemadm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/systemadm.c' object='src/systemadm-systemadm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -c -o src/systemadm-systemadm.o `test -f 'src/systemadm.c' || echo '$(srcdir)/'`src/systemadm.c
-
-src/systemadm-systemadm.obj: src/systemadm.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -MT src/systemadm-systemadm.obj -MD -MP -MF src/$(DEPDIR)/systemadm-systemadm.Tpo -c -o src/systemadm-systemadm.obj `if test -f 'src/systemadm.c'; then $(CYGPATH_W) 'src/systemadm.c'; else $(CYGPATH_W) '$(srcdir)/src/systemadm.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemadm-systemadm.Tpo src/$(DEPDIR)/systemadm-systemadm.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/systemadm.c' object='src/systemadm-systemadm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -c -o src/systemadm-systemadm.obj `if test -f 'src/systemadm.c'; then $(CYGPATH_W) 'src/systemadm.c'; else $(CYGPATH_W) '$(srcdir)/src/systemadm.c'; fi`
-
-src/systemadm-systemd-interfaces.o: src/systemd-interfaces.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -MT src/systemadm-systemd-interfaces.o -MD -MP -MF src/$(DEPDIR)/systemadm-systemd-interfaces.Tpo -c -o src/systemadm-systemd-interfaces.o `test -f 'src/systemd-interfaces.c' || echo '$(srcdir)/'`src/systemd-interfaces.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemadm-systemd-interfaces.Tpo src/$(DEPDIR)/systemadm-systemd-interfaces.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/systemd-interfaces.c' object='src/systemadm-systemd-interfaces.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -c -o src/systemadm-systemd-interfaces.o `test -f 'src/systemd-interfaces.c' || echo '$(srcdir)/'`src/systemd-interfaces.c
-
-src/systemadm-systemd-interfaces.obj: src/systemd-interfaces.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -MT src/systemadm-systemd-interfaces.obj -MD -MP -MF src/$(DEPDIR)/systemadm-systemd-interfaces.Tpo -c -o src/systemadm-systemd-interfaces.obj `if test -f 'src/systemd-interfaces.c'; then $(CYGPATH_W) 'src/systemd-interfaces.c'; else $(CYGPATH_W) '$(srcdir)/src/systemd-interfaces.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemadm-systemd-interfaces.Tpo src/$(DEPDIR)/systemadm-systemd-interfaces.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/systemd-interfaces.c' object='src/systemadm-systemd-interfaces.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -c -o src/systemadm-systemd-interfaces.obj `if test -f 'src/systemd-interfaces.c'; then $(CYGPATH_W) 'src/systemd-interfaces.c'; else $(CYGPATH_W) '$(srcdir)/src/systemd-interfaces.c'; fi`
-
-src/systemadm-wraplabel.o: src/wraplabel.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -MT src/systemadm-wraplabel.o -MD -MP -MF src/$(DEPDIR)/systemadm-wraplabel.Tpo -c -o src/systemadm-wraplabel.o `test -f 'src/wraplabel.c' || echo '$(srcdir)/'`src/wraplabel.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemadm-wraplabel.Tpo src/$(DEPDIR)/systemadm-wraplabel.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/wraplabel.c' object='src/systemadm-wraplabel.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -c -o src/systemadm-wraplabel.o `test -f 'src/wraplabel.c' || echo '$(srcdir)/'`src/wraplabel.c
-
-src/systemadm-wraplabel.obj: src/wraplabel.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -MT src/systemadm-wraplabel.obj -MD -MP -MF src/$(DEPDIR)/systemadm-wraplabel.Tpo -c -o src/systemadm-wraplabel.obj `if test -f 'src/wraplabel.c'; then $(CYGPATH_W) 'src/wraplabel.c'; else $(CYGPATH_W) '$(srcdir)/src/wraplabel.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemadm-wraplabel.Tpo src/$(DEPDIR)/systemadm-wraplabel.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/wraplabel.c' object='src/systemadm-wraplabel.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemadm_CFLAGS) $(CFLAGS) -c -o src/systemadm-wraplabel.obj `if test -f 'src/wraplabel.c'; then $(CYGPATH_W) 'src/wraplabel.c'; else $(CYGPATH_W) '$(srcdir)/src/wraplabel.c'; fi`
-
-src/systemctl-systemctl.o: src/systemctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-systemctl.o -MD -MP -MF src/$(DEPDIR)/systemctl-systemctl.Tpo -c -o src/systemctl-systemctl.o `test -f 'src/systemctl.c' || echo '$(srcdir)/'`src/systemctl.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-systemctl.Tpo src/$(DEPDIR)/systemctl-systemctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/systemctl.c' object='src/systemctl-systemctl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-systemctl.o `test -f 'src/systemctl.c' || echo '$(srcdir)/'`src/systemctl.c
-
-src/systemctl-systemctl.obj: src/systemctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-systemctl.obj -MD -MP -MF src/$(DEPDIR)/systemctl-systemctl.Tpo -c -o src/systemctl-systemctl.obj `if test -f 'src/systemctl.c'; then $(CYGPATH_W) 'src/systemctl.c'; else $(CYGPATH_W) '$(srcdir)/src/systemctl.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-systemctl.Tpo src/$(DEPDIR)/systemctl-systemctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/systemctl.c' object='src/systemctl-systemctl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-systemctl.obj `if test -f 'src/systemctl.c'; then $(CYGPATH_W) 'src/systemctl.c'; else $(CYGPATH_W) '$(srcdir)/src/systemctl.c'; fi`
-
-src/systemctl-utmp-wtmp.o: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-utmp-wtmp.o -MD -MP -MF src/$(DEPDIR)/systemctl-utmp-wtmp.Tpo -c -o src/systemctl-utmp-wtmp.o `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-utmp-wtmp.Tpo src/$(DEPDIR)/systemctl-utmp-wtmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/systemctl-utmp-wtmp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-utmp-wtmp.o `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-
-src/systemctl-utmp-wtmp.obj: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-utmp-wtmp.obj -MD -MP -MF src/$(DEPDIR)/systemctl-utmp-wtmp.Tpo -c -o src/systemctl-utmp-wtmp.obj `if test -f 'src/utmp-wtmp.c'; then $(CYGPATH_W) 'src/utmp-wtmp.c'; else $(CYGPATH_W) '$(srcdir)/src/utmp-wtmp.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-utmp-wtmp.Tpo src/$(DEPDIR)/systemctl-utmp-wtmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/systemctl-utmp-wtmp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-utmp-wtmp.obj `if test -f 'src/utmp-wtmp.c'; then $(CYGPATH_W) 'src/utmp-wtmp.c'; else $(CYGPATH_W) '$(srcdir)/src/utmp-wtmp.c'; fi`
-
-src/systemctl-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemctl-dbus-common.Tpo -c -o src/systemctl-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-dbus-common.Tpo src/$(DEPDIR)/systemctl-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemctl-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemctl-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemctl-dbus-common.Tpo -c -o src/systemctl-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-dbus-common.Tpo src/$(DEPDIR)/systemctl-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemctl-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemctl-path-lookup.o: src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-path-lookup.o -MD -MP -MF src/$(DEPDIR)/systemctl-path-lookup.Tpo -c -o src/systemctl-path-lookup.o `test -f 'src/path-lookup.c' || echo '$(srcdir)/'`src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-path-lookup.Tpo src/$(DEPDIR)/systemctl-path-lookup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/path-lookup.c' object='src/systemctl-path-lookup.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-path-lookup.o `test -f 'src/path-lookup.c' || echo '$(srcdir)/'`src/path-lookup.c
-
-src/systemctl-path-lookup.obj: src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-path-lookup.obj -MD -MP -MF src/$(DEPDIR)/systemctl-path-lookup.Tpo -c -o src/systemctl-path-lookup.obj `if test -f 'src/path-lookup.c'; then $(CYGPATH_W) 'src/path-lookup.c'; else $(CYGPATH_W) '$(srcdir)/src/path-lookup.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-path-lookup.Tpo src/$(DEPDIR)/systemctl-path-lookup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/path-lookup.c' object='src/systemctl-path-lookup.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-path-lookup.obj `if test -f 'src/path-lookup.c'; then $(CYGPATH_W) 'src/path-lookup.c'; else $(CYGPATH_W) '$(srcdir)/src/path-lookup.c'; fi`
-
-src/systemctl-cgroup-show.o: src/cgroup-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-cgroup-show.o -MD -MP -MF src/$(DEPDIR)/systemctl-cgroup-show.Tpo -c -o src/systemctl-cgroup-show.o `test -f 'src/cgroup-show.c' || echo '$(srcdir)/'`src/cgroup-show.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-cgroup-show.Tpo src/$(DEPDIR)/systemctl-cgroup-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-show.c' object='src/systemctl-cgroup-show.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-cgroup-show.o `test -f 'src/cgroup-show.c' || echo '$(srcdir)/'`src/cgroup-show.c
-
-src/systemctl-cgroup-show.obj: src/cgroup-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-cgroup-show.obj -MD -MP -MF src/$(DEPDIR)/systemctl-cgroup-show.Tpo -c -o src/systemctl-cgroup-show.obj `if test -f 'src/cgroup-show.c'; then $(CYGPATH_W) 'src/cgroup-show.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-show.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-cgroup-show.Tpo src/$(DEPDIR)/systemctl-cgroup-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-show.c' object='src/systemctl-cgroup-show.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-cgroup-show.obj `if test -f 'src/cgroup-show.c'; then $(CYGPATH_W) 'src/cgroup-show.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-show.c'; fi`
-
-src/systemctl-cgroup-util.o: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-cgroup-util.o -MD -MP -MF src/$(DEPDIR)/systemctl-cgroup-util.Tpo -c -o src/systemctl-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-cgroup-util.Tpo src/$(DEPDIR)/systemctl-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemctl-cgroup-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-
-src/systemctl-cgroup-util.obj: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-cgroup-util.obj -MD -MP -MF src/$(DEPDIR)/systemctl-cgroup-util.Tpo -c -o src/systemctl-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-cgroup-util.Tpo src/$(DEPDIR)/systemctl-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemctl-cgroup-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-
-src/systemctl-exit-status.o: src/exit-status.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-exit-status.o -MD -MP -MF src/$(DEPDIR)/systemctl-exit-status.Tpo -c -o src/systemctl-exit-status.o `test -f 'src/exit-status.c' || echo '$(srcdir)/'`src/exit-status.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-exit-status.Tpo src/$(DEPDIR)/systemctl-exit-status.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/exit-status.c' object='src/systemctl-exit-status.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-exit-status.o `test -f 'src/exit-status.c' || echo '$(srcdir)/'`src/exit-status.c
-
-src/systemctl-exit-status.obj: src/exit-status.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-exit-status.obj -MD -MP -MF src/$(DEPDIR)/systemctl-exit-status.Tpo -c -o src/systemctl-exit-status.obj `if test -f 'src/exit-status.c'; then $(CYGPATH_W) 'src/exit-status.c'; else $(CYGPATH_W) '$(srcdir)/src/exit-status.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-exit-status.Tpo src/$(DEPDIR)/systemctl-exit-status.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/exit-status.c' object='src/systemctl-exit-status.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-exit-status.obj `if test -f 'src/exit-status.c'; then $(CYGPATH_W) 'src/exit-status.c'; else $(CYGPATH_W) '$(srcdir)/src/exit-status.c'; fi`
-
-src/systemctl-unit-name.o: src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-unit-name.o -MD -MP -MF src/$(DEPDIR)/systemctl-unit-name.Tpo -c -o src/systemctl-unit-name.o `test -f 'src/unit-name.c' || echo '$(srcdir)/'`src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-unit-name.Tpo src/$(DEPDIR)/systemctl-unit-name.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/unit-name.c' object='src/systemctl-unit-name.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-unit-name.o `test -f 'src/unit-name.c' || echo '$(srcdir)/'`src/unit-name.c
-
-src/systemctl-unit-name.obj: src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-unit-name.obj -MD -MP -MF src/$(DEPDIR)/systemctl-unit-name.Tpo -c -o src/systemctl-unit-name.obj `if test -f 'src/unit-name.c'; then $(CYGPATH_W) 'src/unit-name.c'; else $(CYGPATH_W) '$(srcdir)/src/unit-name.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-unit-name.Tpo src/$(DEPDIR)/systemctl-unit-name.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/unit-name.c' object='src/systemctl-unit-name.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-unit-name.obj `if test -f 'src/unit-name.c'; then $(CYGPATH_W) 'src/unit-name.c'; else $(CYGPATH_W) '$(srcdir)/src/unit-name.c'; fi`
-
-src/systemctl-pager.o: src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-pager.o -MD -MP -MF src/$(DEPDIR)/systemctl-pager.Tpo -c -o src/systemctl-pager.o `test -f 'src/pager.c' || echo '$(srcdir)/'`src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-pager.Tpo src/$(DEPDIR)/systemctl-pager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/pager.c' object='src/systemctl-pager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-pager.o `test -f 'src/pager.c' || echo '$(srcdir)/'`src/pager.c
-
-src/systemctl-pager.obj: src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-pager.obj -MD -MP -MF src/$(DEPDIR)/systemctl-pager.Tpo -c -o src/systemctl-pager.obj `if test -f 'src/pager.c'; then $(CYGPATH_W) 'src/pager.c'; else $(CYGPATH_W) '$(srcdir)/src/pager.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-pager.Tpo src/$(DEPDIR)/systemctl-pager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/pager.c' object='src/systemctl-pager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-pager.obj `if test -f 'src/pager.c'; then $(CYGPATH_W) 'src/pager.c'; else $(CYGPATH_W) '$(srcdir)/src/pager.c'; fi`
-
-src/systemctl-install.o: src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-install.o -MD -MP -MF src/$(DEPDIR)/systemctl-install.Tpo -c -o src/systemctl-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-install.Tpo src/$(DEPDIR)/systemctl-install.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/install.c' object='src/systemctl-install.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
-
-src/systemctl-install.obj: src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-install.obj -MD -MP -MF src/$(DEPDIR)/systemctl-install.Tpo -c -o src/systemctl-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-install.Tpo src/$(DEPDIR)/systemctl-install.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/install.c' object='src/systemctl-install.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi`
-
-src/systemctl-spawn-agent.o: src/spawn-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-spawn-agent.o -MD -MP -MF src/$(DEPDIR)/systemctl-spawn-agent.Tpo -c -o src/systemctl-spawn-agent.o `test -f 'src/spawn-agent.c' || echo '$(srcdir)/'`src/spawn-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-spawn-agent.Tpo src/$(DEPDIR)/systemctl-spawn-agent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/spawn-agent.c' object='src/systemctl-spawn-agent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-spawn-agent.o `test -f 'src/spawn-agent.c' || echo '$(srcdir)/'`src/spawn-agent.c
-
-src/systemctl-spawn-agent.obj: src/spawn-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-spawn-agent.obj -MD -MP -MF src/$(DEPDIR)/systemctl-spawn-agent.Tpo -c -o src/systemctl-spawn-agent.obj `if test -f 'src/spawn-agent.c'; then $(CYGPATH_W) 'src/spawn-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/spawn-agent.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-spawn-agent.Tpo src/$(DEPDIR)/systemctl-spawn-agent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/spawn-agent.c' object='src/systemctl-spawn-agent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-spawn-agent.obj `if test -f 'src/spawn-agent.c'; then $(CYGPATH_W) 'src/spawn-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/spawn-agent.c'; fi`
-
-src/systemctl-logs-show.o: src/logs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-logs-show.o -MD -MP -MF src/$(DEPDIR)/systemctl-logs-show.Tpo -c -o src/systemctl-logs-show.o `test -f 'src/logs-show.c' || echo '$(srcdir)/'`src/logs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-logs-show.Tpo src/$(DEPDIR)/systemctl-logs-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/logs-show.c' object='src/systemctl-logs-show.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-logs-show.o `test -f 'src/logs-show.c' || echo '$(srcdir)/'`src/logs-show.c
-
-src/systemctl-logs-show.obj: src/logs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -MT src/systemctl-logs-show.obj -MD -MP -MF src/$(DEPDIR)/systemctl-logs-show.Tpo -c -o src/systemctl-logs-show.obj `if test -f 'src/logs-show.c'; then $(CYGPATH_W) 'src/logs-show.c'; else $(CYGPATH_W) '$(srcdir)/src/logs-show.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemctl-logs-show.Tpo src/$(DEPDIR)/systemctl-logs-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/logs-show.c' object='src/systemctl-logs-show.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemctl_CFLAGS) $(CFLAGS) -c -o src/systemctl-logs-show.obj `if test -f 'src/logs-show.c'; then $(CYGPATH_W) 'src/logs-show.c'; else $(CYGPATH_W) '$(srcdir)/src/logs-show.c'; fi`
-
-src/systemd-main.o: src/main.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_CFLAGS) $(CFLAGS) -MT src/systemd-main.o -MD -MP -MF src/$(DEPDIR)/systemd-main.Tpo -c -o src/systemd-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd-main.Tpo src/$(DEPDIR)/systemd-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/main.c' object='src/systemd-main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_CFLAGS) $(CFLAGS) -c -o src/systemd-main.o `test -f 'src/main.c' || echo '$(srcdir)/'`src/main.c
-
-src/systemd-main.obj: src/main.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_CFLAGS) $(CFLAGS) -MT src/systemd-main.obj -MD -MP -MF src/$(DEPDIR)/systemd-main.Tpo -c -o src/systemd-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd-main.Tpo src/$(DEPDIR)/systemd-main.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/main.c' object='src/systemd-main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_CFLAGS) $(CFLAGS) -c -o src/systemd-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi`
-
-src/systemd_ac_power-ac-power.o: src/ac-power.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_ac_power_CFLAGS) $(CFLAGS) -MT src/systemd_ac_power-ac-power.o -MD -MP -MF src/$(DEPDIR)/systemd_ac_power-ac-power.Tpo -c -o src/systemd_ac_power-ac-power.o `test -f 'src/ac-power.c' || echo '$(srcdir)/'`src/ac-power.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_ac_power-ac-power.Tpo src/$(DEPDIR)/systemd_ac_power-ac-power.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/ac-power.c' object='src/systemd_ac_power-ac-power.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_ac_power_CFLAGS) $(CFLAGS) -c -o src/systemd_ac_power-ac-power.o `test -f 'src/ac-power.c' || echo '$(srcdir)/'`src/ac-power.c
-
-src/systemd_ac_power-ac-power.obj: src/ac-power.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_ac_power_CFLAGS) $(CFLAGS) -MT src/systemd_ac_power-ac-power.obj -MD -MP -MF src/$(DEPDIR)/systemd_ac_power-ac-power.Tpo -c -o src/systemd_ac_power-ac-power.obj `if test -f 'src/ac-power.c'; then $(CYGPATH_W) 'src/ac-power.c'; else $(CYGPATH_W) '$(srcdir)/src/ac-power.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_ac_power-ac-power.Tpo src/$(DEPDIR)/systemd_ac_power-ac-power.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/ac-power.c' object='src/systemd_ac_power-ac-power.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_ac_power_CFLAGS) $(CFLAGS) -c -o src/systemd_ac_power-ac-power.obj `if test -f 'src/ac-power.c'; then $(CYGPATH_W) 'src/ac-power.c'; else $(CYGPATH_W) '$(srcdir)/src/ac-power.c'; fi`
-
-src/systemd_cgroups_agent-cgroups-agent.o: src/cgroups-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -MT src/systemd_cgroups_agent-cgroups-agent.o -MD -MP -MF src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Tpo -c -o src/systemd_cgroups_agent-cgroups-agent.o `test -f 'src/cgroups-agent.c' || echo '$(srcdir)/'`src/cgroups-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Tpo src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroups-agent.c' object='src/systemd_cgroups_agent-cgroups-agent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-cgroups-agent.o `test -f 'src/cgroups-agent.c' || echo '$(srcdir)/'`src/cgroups-agent.c
-
-src/systemd_cgroups_agent-cgroups-agent.obj: src/cgroups-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -MT src/systemd_cgroups_agent-cgroups-agent.obj -MD -MP -MF src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Tpo -c -o src/systemd_cgroups_agent-cgroups-agent.obj `if test -f 'src/cgroups-agent.c'; then $(CYGPATH_W) 'src/cgroups-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroups-agent.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Tpo src/$(DEPDIR)/systemd_cgroups_agent-cgroups-agent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroups-agent.c' object='src/systemd_cgroups_agent-cgroups-agent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-cgroups-agent.obj `if test -f 'src/cgroups-agent.c'; then $(CYGPATH_W) 'src/cgroups-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroups-agent.c'; fi`
-
-src/systemd_cgroups_agent-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -MT src/systemd_cgroups_agent-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo -c -o src/systemd_cgroups_agent-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_cgroups_agent-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_cgroups_agent-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -MT src/systemd_cgroups_agent-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo -c -o src/systemd_cgroups_agent-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Tpo src/$(DEPDIR)/systemd_cgroups_agent-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_cgroups_agent-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cgroups_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_cgroups_agent-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/cryptsetup/systemd_cryptsetup-cryptsetup.o: src/cryptsetup/cryptsetup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -MT src/cryptsetup/systemd_cryptsetup-cryptsetup.o -MD -MP -MF src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Tpo -c -o src/cryptsetup/systemd_cryptsetup-cryptsetup.o `test -f 'src/cryptsetup/cryptsetup.c' || echo '$(srcdir)/'`src/cryptsetup/cryptsetup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Tpo src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cryptsetup/cryptsetup.c' object='src/cryptsetup/systemd_cryptsetup-cryptsetup.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -c -o src/cryptsetup/systemd_cryptsetup-cryptsetup.o `test -f 'src/cryptsetup/cryptsetup.c' || echo '$(srcdir)/'`src/cryptsetup/cryptsetup.c
-
-src/cryptsetup/systemd_cryptsetup-cryptsetup.obj: src/cryptsetup/cryptsetup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -MT src/cryptsetup/systemd_cryptsetup-cryptsetup.obj -MD -MP -MF src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Tpo -c -o src/cryptsetup/systemd_cryptsetup-cryptsetup.obj `if test -f 'src/cryptsetup/cryptsetup.c'; then $(CYGPATH_W) 'src/cryptsetup/cryptsetup.c'; else $(CYGPATH_W) '$(srcdir)/src/cryptsetup/cryptsetup.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Tpo src/cryptsetup/$(DEPDIR)/systemd_cryptsetup-cryptsetup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cryptsetup/cryptsetup.c' object='src/cryptsetup/systemd_cryptsetup-cryptsetup.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -c -o src/cryptsetup/systemd_cryptsetup-cryptsetup.obj `if test -f 'src/cryptsetup/cryptsetup.c'; then $(CYGPATH_W) 'src/cryptsetup/cryptsetup.c'; else $(CYGPATH_W) '$(srcdir)/src/cryptsetup/cryptsetup.c'; fi`
-
-src/systemd_cryptsetup-ask-password-api.o: src/ask-password-api.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -MT src/systemd_cryptsetup-ask-password-api.o -MD -MP -MF src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Tpo -c -o src/systemd_cryptsetup-ask-password-api.o `test -f 'src/ask-password-api.c' || echo '$(srcdir)/'`src/ask-password-api.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Tpo src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/ask-password-api.c' object='src/systemd_cryptsetup-ask-password-api.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -c -o src/systemd_cryptsetup-ask-password-api.o `test -f 'src/ask-password-api.c' || echo '$(srcdir)/'`src/ask-password-api.c
-
-src/systemd_cryptsetup-ask-password-api.obj: src/ask-password-api.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -MT src/systemd_cryptsetup-ask-password-api.obj -MD -MP -MF src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Tpo -c -o src/systemd_cryptsetup-ask-password-api.obj `if test -f 'src/ask-password-api.c'; then $(CYGPATH_W) 'src/ask-password-api.c'; else $(CYGPATH_W) '$(srcdir)/src/ask-password-api.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Tpo src/$(DEPDIR)/systemd_cryptsetup-ask-password-api.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/ask-password-api.c' object='src/systemd_cryptsetup-ask-password-api.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_cryptsetup_CFLAGS) $(CFLAGS) -c -o src/systemd_cryptsetup-ask-password-api.obj `if test -f 'src/ask-password-api.c'; then $(CYGPATH_W) 'src/ask-password-api.c'; else $(CYGPATH_W) '$(srcdir)/src/ask-password-api.c'; fi`
-
-src/systemd_fsck-fsck.o: src/fsck.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -MT src/systemd_fsck-fsck.o -MD -MP -MF src/$(DEPDIR)/systemd_fsck-fsck.Tpo -c -o src/systemd_fsck-fsck.o `test -f 'src/fsck.c' || echo '$(srcdir)/'`src/fsck.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_fsck-fsck.Tpo src/$(DEPDIR)/systemd_fsck-fsck.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/fsck.c' object='src/systemd_fsck-fsck.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -c -o src/systemd_fsck-fsck.o `test -f 'src/fsck.c' || echo '$(srcdir)/'`src/fsck.c
-
-src/systemd_fsck-fsck.obj: src/fsck.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -MT src/systemd_fsck-fsck.obj -MD -MP -MF src/$(DEPDIR)/systemd_fsck-fsck.Tpo -c -o src/systemd_fsck-fsck.obj `if test -f 'src/fsck.c'; then $(CYGPATH_W) 'src/fsck.c'; else $(CYGPATH_W) '$(srcdir)/src/fsck.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_fsck-fsck.Tpo src/$(DEPDIR)/systemd_fsck-fsck.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/fsck.c' object='src/systemd_fsck-fsck.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -c -o src/systemd_fsck-fsck.obj `if test -f 'src/fsck.c'; then $(CYGPATH_W) 'src/fsck.c'; else $(CYGPATH_W) '$(srcdir)/src/fsck.c'; fi`
-
-src/systemd_fsck-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -MT src/systemd_fsck-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_fsck-dbus-common.Tpo -c -o src/systemd_fsck-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_fsck-dbus-common.Tpo src/$(DEPDIR)/systemd_fsck-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_fsck-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -c -o src/systemd_fsck-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_fsck-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -MT src/systemd_fsck-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_fsck-dbus-common.Tpo -c -o src/systemd_fsck-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_fsck-dbus-common.Tpo src/$(DEPDIR)/systemd_fsck-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_fsck-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_fsck_CFLAGS) $(CFLAGS) -c -o src/systemd_fsck-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.o: src/gnome-ask-password-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_gnome_ask_password_agent_CFLAGS) $(CFLAGS) -MT src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.o -MD -MP -MF src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Tpo -c -o src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.o `test -f 'src/gnome-ask-password-agent.c' || echo '$(srcdir)/'`src/gnome-ask-password-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Tpo src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/gnome-ask-password-agent.c' object='src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_gnome_ask_password_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.o `test -f 'src/gnome-ask-password-agent.c' || echo '$(srcdir)/'`src/gnome-ask-password-agent.c
-
-src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.obj: src/gnome-ask-password-agent.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_gnome_ask_password_agent_CFLAGS) $(CFLAGS) -MT src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.obj -MD -MP -MF src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Tpo -c -o src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.obj `if test -f 'src/gnome-ask-password-agent.c'; then $(CYGPATH_W) 'src/gnome-ask-password-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/gnome-ask-password-agent.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Tpo src/$(DEPDIR)/systemd_gnome_ask_password_agent-gnome-ask-password-agent.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/gnome-ask-password-agent.c' object='src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_gnome_ask_password_agent_CFLAGS) $(CFLAGS) -c -o src/systemd_gnome_ask_password_agent-gnome-ask-password-agent.obj `if test -f 'src/gnome-ask-password-agent.c'; then $(CYGPATH_W) 'src/gnome-ask-password-agent.c'; else $(CYGPATH_W) '$(srcdir)/src/gnome-ask-password-agent.c'; fi`
-
-src/hostname/systemd_hostnamed-hostnamed.o: src/hostname/hostnamed.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -MT src/hostname/systemd_hostnamed-hostnamed.o -MD -MP -MF src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Tpo -c -o src/hostname/systemd_hostnamed-hostnamed.o `test -f 'src/hostname/hostnamed.c' || echo '$(srcdir)/'`src/hostname/hostnamed.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Tpo src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/hostname/hostnamed.c' object='src/hostname/systemd_hostnamed-hostnamed.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -c -o src/hostname/systemd_hostnamed-hostnamed.o `test -f 'src/hostname/hostnamed.c' || echo '$(srcdir)/'`src/hostname/hostnamed.c
-
-src/hostname/systemd_hostnamed-hostnamed.obj: src/hostname/hostnamed.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -MT src/hostname/systemd_hostnamed-hostnamed.obj -MD -MP -MF src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Tpo -c -o src/hostname/systemd_hostnamed-hostnamed.obj `if test -f 'src/hostname/hostnamed.c'; then $(CYGPATH_W) 'src/hostname/hostnamed.c'; else $(CYGPATH_W) '$(srcdir)/src/hostname/hostnamed.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Tpo src/hostname/$(DEPDIR)/systemd_hostnamed-hostnamed.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/hostname/hostnamed.c' object='src/hostname/systemd_hostnamed-hostnamed.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -c -o src/hostname/systemd_hostnamed-hostnamed.obj `if test -f 'src/hostname/hostnamed.c'; then $(CYGPATH_W) 'src/hostname/hostnamed.c'; else $(CYGPATH_W) '$(srcdir)/src/hostname/hostnamed.c'; fi`
-
-src/systemd_hostnamed-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -MT src/systemd_hostnamed-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_hostnamed-dbus-common.Tpo -c -o src/systemd_hostnamed-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_hostnamed-dbus-common.Tpo src/$(DEPDIR)/systemd_hostnamed-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_hostnamed-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -c -o src/systemd_hostnamed-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_hostnamed-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -MT src/systemd_hostnamed-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_hostnamed-dbus-common.Tpo -c -o src/systemd_hostnamed-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_hostnamed-dbus-common.Tpo src/$(DEPDIR)/systemd_hostnamed-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_hostnamed-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -c -o src/systemd_hostnamed-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_hostnamed-polkit.o: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -MT src/systemd_hostnamed-polkit.o -MD -MP -MF src/$(DEPDIR)/systemd_hostnamed-polkit.Tpo -c -o src/systemd_hostnamed-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_hostnamed-polkit.Tpo src/$(DEPDIR)/systemd_hostnamed-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_hostnamed-polkit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -c -o src/systemd_hostnamed-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-
-src/systemd_hostnamed-polkit.obj: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -MT src/systemd_hostnamed-polkit.obj -MD -MP -MF src/$(DEPDIR)/systemd_hostnamed-polkit.Tpo -c -o src/systemd_hostnamed-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_hostnamed-polkit.Tpo src/$(DEPDIR)/systemd_hostnamed-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_hostnamed-polkit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_hostnamed_CFLAGS) $(CFLAGS) -c -o src/systemd_hostnamed-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-
-src/systemd_initctl-initctl.o: src/initctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -MT src/systemd_initctl-initctl.o -MD -MP -MF src/$(DEPDIR)/systemd_initctl-initctl.Tpo -c -o src/systemd_initctl-initctl.o `test -f 'src/initctl.c' || echo '$(srcdir)/'`src/initctl.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_initctl-initctl.Tpo src/$(DEPDIR)/systemd_initctl-initctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/initctl.c' object='src/systemd_initctl-initctl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -c -o src/systemd_initctl-initctl.o `test -f 'src/initctl.c' || echo '$(srcdir)/'`src/initctl.c
-
-src/systemd_initctl-initctl.obj: src/initctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -MT src/systemd_initctl-initctl.obj -MD -MP -MF src/$(DEPDIR)/systemd_initctl-initctl.Tpo -c -o src/systemd_initctl-initctl.obj `if test -f 'src/initctl.c'; then $(CYGPATH_W) 'src/initctl.c'; else $(CYGPATH_W) '$(srcdir)/src/initctl.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_initctl-initctl.Tpo src/$(DEPDIR)/systemd_initctl-initctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/initctl.c' object='src/systemd_initctl-initctl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -c -o src/systemd_initctl-initctl.obj `if test -f 'src/initctl.c'; then $(CYGPATH_W) 'src/initctl.c'; else $(CYGPATH_W) '$(srcdir)/src/initctl.c'; fi`
-
-src/systemd_initctl-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -MT src/systemd_initctl-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_initctl-dbus-common.Tpo -c -o src/systemd_initctl-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_initctl-dbus-common.Tpo src/$(DEPDIR)/systemd_initctl-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_initctl-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -c -o src/systemd_initctl-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_initctl-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -MT src/systemd_initctl-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_initctl-dbus-common.Tpo -c -o src/systemd_initctl-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_initctl-dbus-common.Tpo src/$(DEPDIR)/systemd_initctl-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_initctl-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_initctl_CFLAGS) $(CFLAGS) -c -o src/systemd_initctl-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/journal/systemd_journalctl-journalctl.o: src/journal/journalctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journalctl-journalctl.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Tpo -c -o src/journal/systemd_journalctl-journalctl.o `test -f 'src/journal/journalctl.c' || echo '$(srcdir)/'`src/journal/journalctl.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Tpo src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journalctl.c' object='src/journal/systemd_journalctl-journalctl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journalctl-journalctl.o `test -f 'src/journal/journalctl.c' || echo '$(srcdir)/'`src/journal/journalctl.c
-
-src/journal/systemd_journalctl-journalctl.obj: src/journal/journalctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journalctl-journalctl.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Tpo -c -o src/journal/systemd_journalctl-journalctl.obj `if test -f 'src/journal/journalctl.c'; then $(CYGPATH_W) 'src/journal/journalctl.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journalctl.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Tpo src/journal/$(DEPDIR)/systemd_journalctl-journalctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journalctl.c' object='src/journal/systemd_journalctl-journalctl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journalctl-journalctl.obj `if test -f 'src/journal/journalctl.c'; then $(CYGPATH_W) 'src/journal/journalctl.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journalctl.c'; fi`
-
-src/systemd_journalctl-pager.o: src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/systemd_journalctl-pager.o -MD -MP -MF src/$(DEPDIR)/systemd_journalctl-pager.Tpo -c -o src/systemd_journalctl-pager.o `test -f 'src/pager.c' || echo '$(srcdir)/'`src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journalctl-pager.Tpo src/$(DEPDIR)/systemd_journalctl-pager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/pager.c' object='src/systemd_journalctl-pager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/systemd_journalctl-pager.o `test -f 'src/pager.c' || echo '$(srcdir)/'`src/pager.c
-
-src/systemd_journalctl-pager.obj: src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/systemd_journalctl-pager.obj -MD -MP -MF src/$(DEPDIR)/systemd_journalctl-pager.Tpo -c -o src/systemd_journalctl-pager.obj `if test -f 'src/pager.c'; then $(CYGPATH_W) 'src/pager.c'; else $(CYGPATH_W) '$(srcdir)/src/pager.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journalctl-pager.Tpo src/$(DEPDIR)/systemd_journalctl-pager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/pager.c' object='src/systemd_journalctl-pager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/systemd_journalctl-pager.obj `if test -f 'src/pager.c'; then $(CYGPATH_W) 'src/pager.c'; else $(CYGPATH_W) '$(srcdir)/src/pager.c'; fi`
-
-src/systemd_journalctl-logs-show.o: src/logs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/systemd_journalctl-logs-show.o -MD -MP -MF src/$(DEPDIR)/systemd_journalctl-logs-show.Tpo -c -o src/systemd_journalctl-logs-show.o `test -f 'src/logs-show.c' || echo '$(srcdir)/'`src/logs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journalctl-logs-show.Tpo src/$(DEPDIR)/systemd_journalctl-logs-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/logs-show.c' object='src/systemd_journalctl-logs-show.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/systemd_journalctl-logs-show.o `test -f 'src/logs-show.c' || echo '$(srcdir)/'`src/logs-show.c
-
-src/systemd_journalctl-logs-show.obj: src/logs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/systemd_journalctl-logs-show.obj -MD -MP -MF src/$(DEPDIR)/systemd_journalctl-logs-show.Tpo -c -o src/systemd_journalctl-logs-show.obj `if test -f 'src/logs-show.c'; then $(CYGPATH_W) 'src/logs-show.c'; else $(CYGPATH_W) '$(srcdir)/src/logs-show.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journalctl-logs-show.Tpo src/$(DEPDIR)/systemd_journalctl-logs-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/logs-show.c' object='src/systemd_journalctl-logs-show.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/systemd_journalctl-logs-show.obj `if test -f 'src/logs-show.c'; then $(CYGPATH_W) 'src/logs-show.c'; else $(CYGPATH_W) '$(srcdir)/src/logs-show.c'; fi`
-
-src/journal/systemd_journalctl-compress.o: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journalctl-compress.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journalctl-compress.Tpo -c -o src/journal/systemd_journalctl-compress.o `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journalctl-compress.Tpo src/journal/$(DEPDIR)/systemd_journalctl-compress.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/systemd_journalctl-compress.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journalctl-compress.o `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-
-src/journal/systemd_journalctl-compress.obj: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journalctl-compress.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journalctl-compress.Tpo -c -o src/journal/systemd_journalctl-compress.obj `if test -f 'src/journal/compress.c'; then $(CYGPATH_W) 'src/journal/compress.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/compress.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journalctl-compress.Tpo src/journal/$(DEPDIR)/systemd_journalctl-compress.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/systemd_journalctl-compress.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journalctl_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journalctl-compress.obj `if test -f 'src/journal/compress.c'; then $(CYGPATH_W) 'src/journal/compress.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/compress.c'; fi`
-
-src/journal/systemd_journald-journald.o: src/journal/journald.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journald.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journald.Tpo -c -o src/journal/systemd_journald-journald.o `test -f 'src/journal/journald.c' || echo '$(srcdir)/'`src/journal/journald.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journald.Tpo src/journal/$(DEPDIR)/systemd_journald-journald.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journald.c' object='src/journal/systemd_journald-journald.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journald.o `test -f 'src/journal/journald.c' || echo '$(srcdir)/'`src/journal/journald.c
-
-src/journal/systemd_journald-journald.obj: src/journal/journald.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journald.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journald.Tpo -c -o src/journal/systemd_journald-journald.obj `if test -f 'src/journal/journald.c'; then $(CYGPATH_W) 'src/journal/journald.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journald.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journald.Tpo src/journal/$(DEPDIR)/systemd_journald-journald.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journald.c' object='src/journal/systemd_journald-journald.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journald.obj `if test -f 'src/journal/journald.c'; then $(CYGPATH_W) 'src/journal/journald.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journald.c'; fi`
-
-src/journal/systemd_journald-sd-journal.o: src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-sd-journal.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-sd-journal.Tpo -c -o src/journal/systemd_journald-sd-journal.o `test -f 'src/journal/sd-journal.c' || echo '$(srcdir)/'`src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-sd-journal.Tpo src/journal/$(DEPDIR)/systemd_journald-sd-journal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/sd-journal.c' object='src/journal/systemd_journald-sd-journal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-sd-journal.o `test -f 'src/journal/sd-journal.c' || echo '$(srcdir)/'`src/journal/sd-journal.c
-
-src/journal/systemd_journald-sd-journal.obj: src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-sd-journal.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-sd-journal.Tpo -c -o src/journal/systemd_journald-sd-journal.obj `if test -f 'src/journal/sd-journal.c'; then $(CYGPATH_W) 'src/journal/sd-journal.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/sd-journal.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-sd-journal.Tpo src/journal/$(DEPDIR)/systemd_journald-sd-journal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/sd-journal.c' object='src/journal/systemd_journald-sd-journal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-sd-journal.obj `if test -f 'src/journal/sd-journal.c'; then $(CYGPATH_W) 'src/journal/sd-journal.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/sd-journal.c'; fi`
-
-src/journal/systemd_journald-journal-file.o: src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journal-file.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journal-file.Tpo -c -o src/journal/systemd_journald-journal-file.o `test -f 'src/journal/journal-file.c' || echo '$(srcdir)/'`src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journal-file.Tpo src/journal/$(DEPDIR)/systemd_journald-journal-file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-file.c' object='src/journal/systemd_journald-journal-file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journal-file.o `test -f 'src/journal/journal-file.c' || echo '$(srcdir)/'`src/journal/journal-file.c
-
-src/journal/systemd_journald-journal-file.obj: src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journal-file.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journal-file.Tpo -c -o src/journal/systemd_journald-journal-file.obj `if test -f 'src/journal/journal-file.c'; then $(CYGPATH_W) 'src/journal/journal-file.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-file.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journal-file.Tpo src/journal/$(DEPDIR)/systemd_journald-journal-file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-file.c' object='src/journal/systemd_journald-journal-file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journal-file.obj `if test -f 'src/journal/journal-file.c'; then $(CYGPATH_W) 'src/journal/journal-file.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-file.c'; fi`
-
-src/journal/systemd_journald-lookup3.o: src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-lookup3.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-lookup3.Tpo -c -o src/journal/systemd_journald-lookup3.o `test -f 'src/journal/lookup3.c' || echo '$(srcdir)/'`src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-lookup3.Tpo src/journal/$(DEPDIR)/systemd_journald-lookup3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/lookup3.c' object='src/journal/systemd_journald-lookup3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-lookup3.o `test -f 'src/journal/lookup3.c' || echo '$(srcdir)/'`src/journal/lookup3.c
-
-src/journal/systemd_journald-lookup3.obj: src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-lookup3.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-lookup3.Tpo -c -o src/journal/systemd_journald-lookup3.obj `if test -f 'src/journal/lookup3.c'; then $(CYGPATH_W) 'src/journal/lookup3.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/lookup3.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-lookup3.Tpo src/journal/$(DEPDIR)/systemd_journald-lookup3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/lookup3.c' object='src/journal/systemd_journald-lookup3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-lookup3.obj `if test -f 'src/journal/lookup3.c'; then $(CYGPATH_W) 'src/journal/lookup3.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/lookup3.c'; fi`
-
-src/journal/systemd_journald-journal-rate-limit.o: src/journal/journal-rate-limit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journal-rate-limit.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Tpo -c -o src/journal/systemd_journald-journal-rate-limit.o `test -f 'src/journal/journal-rate-limit.c' || echo '$(srcdir)/'`src/journal/journal-rate-limit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Tpo src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-rate-limit.c' object='src/journal/systemd_journald-journal-rate-limit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journal-rate-limit.o `test -f 'src/journal/journal-rate-limit.c' || echo '$(srcdir)/'`src/journal/journal-rate-limit.c
-
-src/journal/systemd_journald-journal-rate-limit.obj: src/journal/journal-rate-limit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journal-rate-limit.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Tpo -c -o src/journal/systemd_journald-journal-rate-limit.obj `if test -f 'src/journal/journal-rate-limit.c'; then $(CYGPATH_W) 'src/journal/journal-rate-limit.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-rate-limit.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Tpo src/journal/$(DEPDIR)/systemd_journald-journal-rate-limit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-rate-limit.c' object='src/journal/systemd_journald-journal-rate-limit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journal-rate-limit.obj `if test -f 'src/journal/journal-rate-limit.c'; then $(CYGPATH_W) 'src/journal/journal-rate-limit.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-rate-limit.c'; fi`
-
-src/systemd_journald-sd-id128.o: src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/systemd_journald-sd-id128.o -MD -MP -MF src/$(DEPDIR)/systemd_journald-sd-id128.Tpo -c -o src/systemd_journald-sd-id128.o `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journald-sd-id128.Tpo src/$(DEPDIR)/systemd_journald-sd-id128.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-id128.c' object='src/systemd_journald-sd-id128.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/systemd_journald-sd-id128.o `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-
-src/systemd_journald-sd-id128.obj: src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/systemd_journald-sd-id128.obj -MD -MP -MF src/$(DEPDIR)/systemd_journald-sd-id128.Tpo -c -o src/systemd_journald-sd-id128.obj `if test -f 'src/sd-id128.c'; then $(CYGPATH_W) 'src/sd-id128.c'; else $(CYGPATH_W) '$(srcdir)/src/sd-id128.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journald-sd-id128.Tpo src/$(DEPDIR)/systemd_journald-sd-id128.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-id128.c' object='src/systemd_journald-sd-id128.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/systemd_journald-sd-id128.obj `if test -f 'src/sd-id128.c'; then $(CYGPATH_W) 'src/sd-id128.c'; else $(CYGPATH_W) '$(srcdir)/src/sd-id128.c'; fi`
-
-src/systemd_journald-cgroup-util.o: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/systemd_journald-cgroup-util.o -MD -MP -MF src/$(DEPDIR)/systemd_journald-cgroup-util.Tpo -c -o src/systemd_journald-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journald-cgroup-util.Tpo src/$(DEPDIR)/systemd_journald-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemd_journald-cgroup-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/systemd_journald-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-
-src/systemd_journald-cgroup-util.obj: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/systemd_journald-cgroup-util.obj -MD -MP -MF src/$(DEPDIR)/systemd_journald-cgroup-util.Tpo -c -o src/systemd_journald-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journald-cgroup-util.Tpo src/$(DEPDIR)/systemd_journald-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemd_journald-cgroup-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/systemd_journald-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-
-src/systemd_journald-acl-util.o: src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/systemd_journald-acl-util.o -MD -MP -MF src/$(DEPDIR)/systemd_journald-acl-util.Tpo -c -o src/systemd_journald-acl-util.o `test -f 'src/acl-util.c' || echo '$(srcdir)/'`src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journald-acl-util.Tpo src/$(DEPDIR)/systemd_journald-acl-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/acl-util.c' object='src/systemd_journald-acl-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/systemd_journald-acl-util.o `test -f 'src/acl-util.c' || echo '$(srcdir)/'`src/acl-util.c
-
-src/systemd_journald-acl-util.obj: src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/systemd_journald-acl-util.obj -MD -MP -MF src/$(DEPDIR)/systemd_journald-acl-util.Tpo -c -o src/systemd_journald-acl-util.obj `if test -f 'src/acl-util.c'; then $(CYGPATH_W) 'src/acl-util.c'; else $(CYGPATH_W) '$(srcdir)/src/acl-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_journald-acl-util.Tpo src/$(DEPDIR)/systemd_journald-acl-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/acl-util.c' object='src/systemd_journald-acl-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/systemd_journald-acl-util.obj `if test -f 'src/acl-util.c'; then $(CYGPATH_W) 'src/acl-util.c'; else $(CYGPATH_W) '$(srcdir)/src/acl-util.c'; fi`
-
-src/journal/systemd_journald-compress.o: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-compress.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-compress.Tpo -c -o src/journal/systemd_journald-compress.o `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-compress.Tpo src/journal/$(DEPDIR)/systemd_journald-compress.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/systemd_journald-compress.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-compress.o `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-
-src/journal/systemd_journald-compress.obj: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-compress.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-compress.Tpo -c -o src/journal/systemd_journald-compress.obj `if test -f 'src/journal/compress.c'; then $(CYGPATH_W) 'src/journal/compress.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/compress.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-compress.Tpo src/journal/$(DEPDIR)/systemd_journald-compress.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/systemd_journald-compress.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-compress.obj `if test -f 'src/journal/compress.c'; then $(CYGPATH_W) 'src/journal/compress.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/compress.c'; fi`
-
-src/journal/systemd_journald-journald-gperf.o: src/journal/journald-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journald-gperf.o -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Tpo -c -o src/journal/systemd_journald-journald-gperf.o `test -f 'src/journal/journald-gperf.c' || echo '$(srcdir)/'`src/journal/journald-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Tpo src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journald-gperf.c' object='src/journal/systemd_journald-journald-gperf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journald-gperf.o `test -f 'src/journal/journald-gperf.c' || echo '$(srcdir)/'`src/journal/journald-gperf.c
-
-src/journal/systemd_journald-journald-gperf.obj: src/journal/journald-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -MT src/journal/systemd_journald-journald-gperf.obj -MD -MP -MF src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Tpo -c -o src/journal/systemd_journald-journald-gperf.obj `if test -f 'src/journal/journald-gperf.c'; then $(CYGPATH_W) 'src/journal/journald-gperf.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journald-gperf.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Tpo src/journal/$(DEPDIR)/systemd_journald-journald-gperf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journald-gperf.c' object='src/journal/systemd_journald-journald-gperf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_journald_CFLAGS) $(CFLAGS) -c -o src/journal/systemd_journald-journald-gperf.obj `if test -f 'src/journal/journald-gperf.c'; then $(CYGPATH_W) 'src/journal/journald-gperf.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journald-gperf.c'; fi`
-
-src/locale/systemd_localed-localed.o: src/locale/localed.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -MT src/locale/systemd_localed-localed.o -MD -MP -MF src/locale/$(DEPDIR)/systemd_localed-localed.Tpo -c -o src/locale/systemd_localed-localed.o `test -f 'src/locale/localed.c' || echo '$(srcdir)/'`src/locale/localed.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/locale/$(DEPDIR)/systemd_localed-localed.Tpo src/locale/$(DEPDIR)/systemd_localed-localed.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/locale/localed.c' object='src/locale/systemd_localed-localed.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -c -o src/locale/systemd_localed-localed.o `test -f 'src/locale/localed.c' || echo '$(srcdir)/'`src/locale/localed.c
-
-src/locale/systemd_localed-localed.obj: src/locale/localed.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -MT src/locale/systemd_localed-localed.obj -MD -MP -MF src/locale/$(DEPDIR)/systemd_localed-localed.Tpo -c -o src/locale/systemd_localed-localed.obj `if test -f 'src/locale/localed.c'; then $(CYGPATH_W) 'src/locale/localed.c'; else $(CYGPATH_W) '$(srcdir)/src/locale/localed.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/locale/$(DEPDIR)/systemd_localed-localed.Tpo src/locale/$(DEPDIR)/systemd_localed-localed.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/locale/localed.c' object='src/locale/systemd_localed-localed.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -c -o src/locale/systemd_localed-localed.obj `if test -f 'src/locale/localed.c'; then $(CYGPATH_W) 'src/locale/localed.c'; else $(CYGPATH_W) '$(srcdir)/src/locale/localed.c'; fi`
-
-src/systemd_localed-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -MT src/systemd_localed-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_localed-dbus-common.Tpo -c -o src/systemd_localed-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_localed-dbus-common.Tpo src/$(DEPDIR)/systemd_localed-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_localed-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -c -o src/systemd_localed-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_localed-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -MT src/systemd_localed-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_localed-dbus-common.Tpo -c -o src/systemd_localed-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_localed-dbus-common.Tpo src/$(DEPDIR)/systemd_localed-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_localed-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -c -o src/systemd_localed-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_localed-polkit.o: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -MT src/systemd_localed-polkit.o -MD -MP -MF src/$(DEPDIR)/systemd_localed-polkit.Tpo -c -o src/systemd_localed-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_localed-polkit.Tpo src/$(DEPDIR)/systemd_localed-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_localed-polkit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -c -o src/systemd_localed-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-
-src/systemd_localed-polkit.obj: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -MT src/systemd_localed-polkit.obj -MD -MP -MF src/$(DEPDIR)/systemd_localed-polkit.Tpo -c -o src/systemd_localed-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_localed-polkit.Tpo src/$(DEPDIR)/systemd_localed-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_localed-polkit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_localed_CFLAGS) $(CFLAGS) -c -o src/systemd_localed-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-
-src/login/systemd_loginctl-loginctl.o: src/login/loginctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/login/systemd_loginctl-loginctl.o -MD -MP -MF src/login/$(DEPDIR)/systemd_loginctl-loginctl.Tpo -c -o src/login/systemd_loginctl-loginctl.o `test -f 'src/login/loginctl.c' || echo '$(srcdir)/'`src/login/loginctl.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_loginctl-loginctl.Tpo src/login/$(DEPDIR)/systemd_loginctl-loginctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/loginctl.c' object='src/login/systemd_loginctl-loginctl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/login/systemd_loginctl-loginctl.o `test -f 'src/login/loginctl.c' || echo '$(srcdir)/'`src/login/loginctl.c
-
-src/login/systemd_loginctl-loginctl.obj: src/login/loginctl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/login/systemd_loginctl-loginctl.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_loginctl-loginctl.Tpo -c -o src/login/systemd_loginctl-loginctl.obj `if test -f 'src/login/loginctl.c'; then $(CYGPATH_W) 'src/login/loginctl.c'; else $(CYGPATH_W) '$(srcdir)/src/login/loginctl.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_loginctl-loginctl.Tpo src/login/$(DEPDIR)/systemd_loginctl-loginctl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/loginctl.c' object='src/login/systemd_loginctl-loginctl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/login/systemd_loginctl-loginctl.obj `if test -f 'src/login/loginctl.c'; then $(CYGPATH_W) 'src/login/loginctl.c'; else $(CYGPATH_W) '$(srcdir)/src/login/loginctl.c'; fi`
-
-src/login/systemd_loginctl-sysfs-show.o: src/login/sysfs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/login/systemd_loginctl-sysfs-show.o -MD -MP -MF src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Tpo -c -o src/login/systemd_loginctl-sysfs-show.o `test -f 'src/login/sysfs-show.c' || echo '$(srcdir)/'`src/login/sysfs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Tpo src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/sysfs-show.c' object='src/login/systemd_loginctl-sysfs-show.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/login/systemd_loginctl-sysfs-show.o `test -f 'src/login/sysfs-show.c' || echo '$(srcdir)/'`src/login/sysfs-show.c
-
-src/login/systemd_loginctl-sysfs-show.obj: src/login/sysfs-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/login/systemd_loginctl-sysfs-show.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Tpo -c -o src/login/systemd_loginctl-sysfs-show.obj `if test -f 'src/login/sysfs-show.c'; then $(CYGPATH_W) 'src/login/sysfs-show.c'; else $(CYGPATH_W) '$(srcdir)/src/login/sysfs-show.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Tpo src/login/$(DEPDIR)/systemd_loginctl-sysfs-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/sysfs-show.c' object='src/login/systemd_loginctl-sysfs-show.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/login/systemd_loginctl-sysfs-show.obj `if test -f 'src/login/sysfs-show.c'; then $(CYGPATH_W) 'src/login/sysfs-show.c'; else $(CYGPATH_W) '$(srcdir)/src/login/sysfs-show.c'; fi`
-
-src/systemd_loginctl-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-dbus-common.Tpo -c -o src/systemd_loginctl-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-dbus-common.Tpo src/$(DEPDIR)/systemd_loginctl-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_loginctl-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_loginctl-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-dbus-common.Tpo -c -o src/systemd_loginctl-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-dbus-common.Tpo src/$(DEPDIR)/systemd_loginctl-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_loginctl-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_loginctl-cgroup-show.o: src/cgroup-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-cgroup-show.o -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-cgroup-show.Tpo -c -o src/systemd_loginctl-cgroup-show.o `test -f 'src/cgroup-show.c' || echo '$(srcdir)/'`src/cgroup-show.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-cgroup-show.Tpo src/$(DEPDIR)/systemd_loginctl-cgroup-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-show.c' object='src/systemd_loginctl-cgroup-show.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-cgroup-show.o `test -f 'src/cgroup-show.c' || echo '$(srcdir)/'`src/cgroup-show.c
-
-src/systemd_loginctl-cgroup-show.obj: src/cgroup-show.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-cgroup-show.obj -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-cgroup-show.Tpo -c -o src/systemd_loginctl-cgroup-show.obj `if test -f 'src/cgroup-show.c'; then $(CYGPATH_W) 'src/cgroup-show.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-show.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-cgroup-show.Tpo src/$(DEPDIR)/systemd_loginctl-cgroup-show.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-show.c' object='src/systemd_loginctl-cgroup-show.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-cgroup-show.obj `if test -f 'src/cgroup-show.c'; then $(CYGPATH_W) 'src/cgroup-show.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-show.c'; fi`
-
-src/systemd_loginctl-cgroup-util.o: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-cgroup-util.o -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-cgroup-util.Tpo -c -o src/systemd_loginctl-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-cgroup-util.Tpo src/$(DEPDIR)/systemd_loginctl-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemd_loginctl-cgroup-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-
-src/systemd_loginctl-cgroup-util.obj: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-cgroup-util.obj -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-cgroup-util.Tpo -c -o src/systemd_loginctl-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-cgroup-util.Tpo src/$(DEPDIR)/systemd_loginctl-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemd_loginctl-cgroup-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-
-src/systemd_loginctl-pager.o: src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-pager.o -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-pager.Tpo -c -o src/systemd_loginctl-pager.o `test -f 'src/pager.c' || echo '$(srcdir)/'`src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-pager.Tpo src/$(DEPDIR)/systemd_loginctl-pager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/pager.c' object='src/systemd_loginctl-pager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-pager.o `test -f 'src/pager.c' || echo '$(srcdir)/'`src/pager.c
-
-src/systemd_loginctl-pager.obj: src/pager.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -MT src/systemd_loginctl-pager.obj -MD -MP -MF src/$(DEPDIR)/systemd_loginctl-pager.Tpo -c -o src/systemd_loginctl-pager.obj `if test -f 'src/pager.c'; then $(CYGPATH_W) 'src/pager.c'; else $(CYGPATH_W) '$(srcdir)/src/pager.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_loginctl-pager.Tpo src/$(DEPDIR)/systemd_loginctl-pager.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/pager.c' object='src/systemd_loginctl-pager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_loginctl_CFLAGS) $(CFLAGS) -c -o src/systemd_loginctl-pager.obj `if test -f 'src/pager.c'; then $(CYGPATH_W) 'src/pager.c'; else $(CYGPATH_W) '$(srcdir)/src/pager.c'; fi`
-
-src/login/systemd_logind-logind.o: src/login/logind.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind.Tpo -c -o src/login/systemd_logind-logind.o `test -f 'src/login/logind.c' || echo '$(srcdir)/'`src/login/logind.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind.Tpo src/login/$(DEPDIR)/systemd_logind-logind.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind.c' object='src/login/systemd_logind-logind.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind.o `test -f 'src/login/logind.c' || echo '$(srcdir)/'`src/login/logind.c
-
-src/login/systemd_logind-logind.obj: src/login/logind.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind.Tpo -c -o src/login/systemd_logind-logind.obj `if test -f 'src/login/logind.c'; then $(CYGPATH_W) 'src/login/logind.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind.Tpo src/login/$(DEPDIR)/systemd_logind-logind.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind.c' object='src/login/systemd_logind-logind.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind.obj `if test -f 'src/login/logind.c'; then $(CYGPATH_W) 'src/login/logind.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind.c'; fi`
-
-src/login/systemd_logind-logind-dbus.o: src/login/logind-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-dbus.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-dbus.Tpo -c -o src/login/systemd_logind-logind-dbus.o `test -f 'src/login/logind-dbus.c' || echo '$(srcdir)/'`src/login/logind-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-dbus.c' object='src/login/systemd_logind-logind-dbus.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-dbus.o `test -f 'src/login/logind-dbus.c' || echo '$(srcdir)/'`src/login/logind-dbus.c
-
-src/login/systemd_logind-logind-dbus.obj: src/login/logind-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-dbus.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-dbus.Tpo -c -o src/login/systemd_logind-logind-dbus.obj `if test -f 'src/login/logind-dbus.c'; then $(CYGPATH_W) 'src/login/logind-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-dbus.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-dbus.c' object='src/login/systemd_logind-logind-dbus.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-dbus.obj `if test -f 'src/login/logind-dbus.c'; then $(CYGPATH_W) 'src/login/logind-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-dbus.c'; fi`
-
-src/login/systemd_logind-logind-device.o: src/login/logind-device.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-device.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-device.Tpo -c -o src/login/systemd_logind-logind-device.o `test -f 'src/login/logind-device.c' || echo '$(srcdir)/'`src/login/logind-device.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-device.Tpo src/login/$(DEPDIR)/systemd_logind-logind-device.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-device.c' object='src/login/systemd_logind-logind-device.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-device.o `test -f 'src/login/logind-device.c' || echo '$(srcdir)/'`src/login/logind-device.c
-
-src/login/systemd_logind-logind-device.obj: src/login/logind-device.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-device.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-device.Tpo -c -o src/login/systemd_logind-logind-device.obj `if test -f 'src/login/logind-device.c'; then $(CYGPATH_W) 'src/login/logind-device.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-device.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-device.Tpo src/login/$(DEPDIR)/systemd_logind-logind-device.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-device.c' object='src/login/systemd_logind-logind-device.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-device.obj `if test -f 'src/login/logind-device.c'; then $(CYGPATH_W) 'src/login/logind-device.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-device.c'; fi`
-
-src/login/systemd_logind-logind-seat.o: src/login/logind-seat.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-seat.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-seat.Tpo -c -o src/login/systemd_logind-logind-seat.o `test -f 'src/login/logind-seat.c' || echo '$(srcdir)/'`src/login/logind-seat.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-seat.Tpo src/login/$(DEPDIR)/systemd_logind-logind-seat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-seat.c' object='src/login/systemd_logind-logind-seat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-seat.o `test -f 'src/login/logind-seat.c' || echo '$(srcdir)/'`src/login/logind-seat.c
-
-src/login/systemd_logind-logind-seat.obj: src/login/logind-seat.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-seat.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-seat.Tpo -c -o src/login/systemd_logind-logind-seat.obj `if test -f 'src/login/logind-seat.c'; then $(CYGPATH_W) 'src/login/logind-seat.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-seat.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-seat.Tpo src/login/$(DEPDIR)/systemd_logind-logind-seat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-seat.c' object='src/login/systemd_logind-logind-seat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-seat.obj `if test -f 'src/login/logind-seat.c'; then $(CYGPATH_W) 'src/login/logind-seat.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-seat.c'; fi`
-
-src/login/systemd_logind-logind-seat-dbus.o: src/login/logind-seat-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-seat-dbus.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Tpo -c -o src/login/systemd_logind-logind-seat-dbus.o `test -f 'src/login/logind-seat-dbus.c' || echo '$(srcdir)/'`src/login/logind-seat-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-seat-dbus.c' object='src/login/systemd_logind-logind-seat-dbus.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-seat-dbus.o `test -f 'src/login/logind-seat-dbus.c' || echo '$(srcdir)/'`src/login/logind-seat-dbus.c
-
-src/login/systemd_logind-logind-seat-dbus.obj: src/login/logind-seat-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-seat-dbus.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Tpo -c -o src/login/systemd_logind-logind-seat-dbus.obj `if test -f 'src/login/logind-seat-dbus.c'; then $(CYGPATH_W) 'src/login/logind-seat-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-seat-dbus.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-seat-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-seat-dbus.c' object='src/login/systemd_logind-logind-seat-dbus.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-seat-dbus.obj `if test -f 'src/login/logind-seat-dbus.c'; then $(CYGPATH_W) 'src/login/logind-seat-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-seat-dbus.c'; fi`
-
-src/login/systemd_logind-logind-session.o: src/login/logind-session.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-session.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-session.Tpo -c -o src/login/systemd_logind-logind-session.o `test -f 'src/login/logind-session.c' || echo '$(srcdir)/'`src/login/logind-session.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-session.Tpo src/login/$(DEPDIR)/systemd_logind-logind-session.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-session.c' object='src/login/systemd_logind-logind-session.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-session.o `test -f 'src/login/logind-session.c' || echo '$(srcdir)/'`src/login/logind-session.c
-
-src/login/systemd_logind-logind-session.obj: src/login/logind-session.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-session.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-session.Tpo -c -o src/login/systemd_logind-logind-session.obj `if test -f 'src/login/logind-session.c'; then $(CYGPATH_W) 'src/login/logind-session.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-session.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-session.Tpo src/login/$(DEPDIR)/systemd_logind-logind-session.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-session.c' object='src/login/systemd_logind-logind-session.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-session.obj `if test -f 'src/login/logind-session.c'; then $(CYGPATH_W) 'src/login/logind-session.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-session.c'; fi`
-
-src/login/systemd_logind-logind-session-dbus.o: src/login/logind-session-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-session-dbus.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Tpo -c -o src/login/systemd_logind-logind-session-dbus.o `test -f 'src/login/logind-session-dbus.c' || echo '$(srcdir)/'`src/login/logind-session-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-session-dbus.c' object='src/login/systemd_logind-logind-session-dbus.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-session-dbus.o `test -f 'src/login/logind-session-dbus.c' || echo '$(srcdir)/'`src/login/logind-session-dbus.c
-
-src/login/systemd_logind-logind-session-dbus.obj: src/login/logind-session-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-session-dbus.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Tpo -c -o src/login/systemd_logind-logind-session-dbus.obj `if test -f 'src/login/logind-session-dbus.c'; then $(CYGPATH_W) 'src/login/logind-session-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-session-dbus.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-session-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-session-dbus.c' object='src/login/systemd_logind-logind-session-dbus.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-session-dbus.obj `if test -f 'src/login/logind-session-dbus.c'; then $(CYGPATH_W) 'src/login/logind-session-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-session-dbus.c'; fi`
-
-src/login/systemd_logind-logind-user.o: src/login/logind-user.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-user.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-user.Tpo -c -o src/login/systemd_logind-logind-user.o `test -f 'src/login/logind-user.c' || echo '$(srcdir)/'`src/login/logind-user.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-user.Tpo src/login/$(DEPDIR)/systemd_logind-logind-user.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-user.c' object='src/login/systemd_logind-logind-user.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-user.o `test -f 'src/login/logind-user.c' || echo '$(srcdir)/'`src/login/logind-user.c
-
-src/login/systemd_logind-logind-user.obj: src/login/logind-user.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-user.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-user.Tpo -c -o src/login/systemd_logind-logind-user.obj `if test -f 'src/login/logind-user.c'; then $(CYGPATH_W) 'src/login/logind-user.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-user.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-user.Tpo src/login/$(DEPDIR)/systemd_logind-logind-user.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-user.c' object='src/login/systemd_logind-logind-user.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-user.obj `if test -f 'src/login/logind-user.c'; then $(CYGPATH_W) 'src/login/logind-user.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-user.c'; fi`
-
-src/login/systemd_logind-logind-user-dbus.o: src/login/logind-user-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-user-dbus.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Tpo -c -o src/login/systemd_logind-logind-user-dbus.o `test -f 'src/login/logind-user-dbus.c' || echo '$(srcdir)/'`src/login/logind-user-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-user-dbus.c' object='src/login/systemd_logind-logind-user-dbus.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-user-dbus.o `test -f 'src/login/logind-user-dbus.c' || echo '$(srcdir)/'`src/login/logind-user-dbus.c
-
-src/login/systemd_logind-logind-user-dbus.obj: src/login/logind-user-dbus.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-user-dbus.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Tpo -c -o src/login/systemd_logind-logind-user-dbus.obj `if test -f 'src/login/logind-user-dbus.c'; then $(CYGPATH_W) 'src/login/logind-user-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-user-dbus.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Tpo src/login/$(DEPDIR)/systemd_logind-logind-user-dbus.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-user-dbus.c' object='src/login/systemd_logind-logind-user-dbus.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-user-dbus.obj `if test -f 'src/login/logind-user-dbus.c'; then $(CYGPATH_W) 'src/login/logind-user-dbus.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-user-dbus.c'; fi`
-
-src/systemd_logind-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_logind-dbus-common.Tpo -c -o src/systemd_logind-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-dbus-common.Tpo src/$(DEPDIR)/systemd_logind-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_logind-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_logind-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_logind-dbus-common.Tpo -c -o src/systemd_logind-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-dbus-common.Tpo src/$(DEPDIR)/systemd_logind-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_logind-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_logind-dbus-loop.o: src/dbus-loop.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-dbus-loop.o -MD -MP -MF src/$(DEPDIR)/systemd_logind-dbus-loop.Tpo -c -o src/systemd_logind-dbus-loop.o `test -f 'src/dbus-loop.c' || echo '$(srcdir)/'`src/dbus-loop.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-dbus-loop.Tpo src/$(DEPDIR)/systemd_logind-dbus-loop.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-loop.c' object='src/systemd_logind-dbus-loop.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-dbus-loop.o `test -f 'src/dbus-loop.c' || echo '$(srcdir)/'`src/dbus-loop.c
-
-src/systemd_logind-dbus-loop.obj: src/dbus-loop.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-dbus-loop.obj -MD -MP -MF src/$(DEPDIR)/systemd_logind-dbus-loop.Tpo -c -o src/systemd_logind-dbus-loop.obj `if test -f 'src/dbus-loop.c'; then $(CYGPATH_W) 'src/dbus-loop.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-loop.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-dbus-loop.Tpo src/$(DEPDIR)/systemd_logind-dbus-loop.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-loop.c' object='src/systemd_logind-dbus-loop.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-dbus-loop.obj `if test -f 'src/dbus-loop.c'; then $(CYGPATH_W) 'src/dbus-loop.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-loop.c'; fi`
-
-src/systemd_logind-cgroup-util.o: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-cgroup-util.o -MD -MP -MF src/$(DEPDIR)/systemd_logind-cgroup-util.Tpo -c -o src/systemd_logind-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-cgroup-util.Tpo src/$(DEPDIR)/systemd_logind-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemd_logind-cgroup-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-cgroup-util.o `test -f 'src/cgroup-util.c' || echo '$(srcdir)/'`src/cgroup-util.c
-
-src/systemd_logind-cgroup-util.obj: src/cgroup-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-cgroup-util.obj -MD -MP -MF src/$(DEPDIR)/systemd_logind-cgroup-util.Tpo -c -o src/systemd_logind-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-cgroup-util.Tpo src/$(DEPDIR)/systemd_logind-cgroup-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/cgroup-util.c' object='src/systemd_logind-cgroup-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-cgroup-util.obj `if test -f 'src/cgroup-util.c'; then $(CYGPATH_W) 'src/cgroup-util.c'; else $(CYGPATH_W) '$(srcdir)/src/cgroup-util.c'; fi`
-
-src/systemd_logind-polkit.o: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-polkit.o -MD -MP -MF src/$(DEPDIR)/systemd_logind-polkit.Tpo -c -o src/systemd_logind-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-polkit.Tpo src/$(DEPDIR)/systemd_logind-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_logind-polkit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-
-src/systemd_logind-polkit.obj: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-polkit.obj -MD -MP -MF src/$(DEPDIR)/systemd_logind-polkit.Tpo -c -o src/systemd_logind-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-polkit.Tpo src/$(DEPDIR)/systemd_logind-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_logind-polkit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-
-src/login/systemd_logind-logind-acl.o: src/login/logind-acl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-acl.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-acl.Tpo -c -o src/login/systemd_logind-logind-acl.o `test -f 'src/login/logind-acl.c' || echo '$(srcdir)/'`src/login/logind-acl.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-acl.Tpo src/login/$(DEPDIR)/systemd_logind-logind-acl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-acl.c' object='src/login/systemd_logind-logind-acl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-acl.o `test -f 'src/login/logind-acl.c' || echo '$(srcdir)/'`src/login/logind-acl.c
-
-src/login/systemd_logind-logind-acl.obj: src/login/logind-acl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-acl.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-acl.Tpo -c -o src/login/systemd_logind-logind-acl.obj `if test -f 'src/login/logind-acl.c'; then $(CYGPATH_W) 'src/login/logind-acl.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-acl.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-acl.Tpo src/login/$(DEPDIR)/systemd_logind-logind-acl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-acl.c' object='src/login/systemd_logind-logind-acl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-acl.obj `if test -f 'src/login/logind-acl.c'; then $(CYGPATH_W) 'src/login/logind-acl.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-acl.c'; fi`
-
-src/systemd_logind-acl-util.o: src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-acl-util.o -MD -MP -MF src/$(DEPDIR)/systemd_logind-acl-util.Tpo -c -o src/systemd_logind-acl-util.o `test -f 'src/acl-util.c' || echo '$(srcdir)/'`src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-acl-util.Tpo src/$(DEPDIR)/systemd_logind-acl-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/acl-util.c' object='src/systemd_logind-acl-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-acl-util.o `test -f 'src/acl-util.c' || echo '$(srcdir)/'`src/acl-util.c
-
-src/systemd_logind-acl-util.obj: src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/systemd_logind-acl-util.obj -MD -MP -MF src/$(DEPDIR)/systemd_logind-acl-util.Tpo -c -o src/systemd_logind-acl-util.obj `if test -f 'src/acl-util.c'; then $(CYGPATH_W) 'src/acl-util.c'; else $(CYGPATH_W) '$(srcdir)/src/acl-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_logind-acl-util.Tpo src/$(DEPDIR)/systemd_logind-acl-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/acl-util.c' object='src/systemd_logind-acl-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/systemd_logind-acl-util.obj `if test -f 'src/acl-util.c'; then $(CYGPATH_W) 'src/acl-util.c'; else $(CYGPATH_W) '$(srcdir)/src/acl-util.c'; fi`
-
-src/login/systemd_logind-logind-gperf.o: src/login/logind-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-gperf.o -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-gperf.Tpo -c -o src/login/systemd_logind-logind-gperf.o `test -f 'src/login/logind-gperf.c' || echo '$(srcdir)/'`src/login/logind-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-gperf.Tpo src/login/$(DEPDIR)/systemd_logind-logind-gperf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-gperf.c' object='src/login/systemd_logind-logind-gperf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-gperf.o `test -f 'src/login/logind-gperf.c' || echo '$(srcdir)/'`src/login/logind-gperf.c
-
-src/login/systemd_logind-logind-gperf.obj: src/login/logind-gperf.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -MT src/login/systemd_logind-logind-gperf.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_logind-logind-gperf.Tpo -c -o src/login/systemd_logind-logind-gperf.obj `if test -f 'src/login/logind-gperf.c'; then $(CYGPATH_W) 'src/login/logind-gperf.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-gperf.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_logind-logind-gperf.Tpo src/login/$(DEPDIR)/systemd_logind-logind-gperf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-gperf.c' object='src/login/systemd_logind-logind-gperf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_logind_CFLAGS) $(CFLAGS) -c -o src/login/systemd_logind-logind-gperf.obj `if test -f 'src/login/logind-gperf.c'; then $(CYGPATH_W) 'src/login/logind-gperf.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-gperf.c'; fi`
-
-src/systemd_modules_load-modules-load.o: src/modules-load.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_modules_load_CFLAGS) $(CFLAGS) -MT src/systemd_modules_load-modules-load.o -MD -MP -MF src/$(DEPDIR)/systemd_modules_load-modules-load.Tpo -c -o src/systemd_modules_load-modules-load.o `test -f 'src/modules-load.c' || echo '$(srcdir)/'`src/modules-load.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_modules_load-modules-load.Tpo src/$(DEPDIR)/systemd_modules_load-modules-load.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/modules-load.c' object='src/systemd_modules_load-modules-load.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_modules_load_CFLAGS) $(CFLAGS) -c -o src/systemd_modules_load-modules-load.o `test -f 'src/modules-load.c' || echo '$(srcdir)/'`src/modules-load.c
-
-src/systemd_modules_load-modules-load.obj: src/modules-load.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_modules_load_CFLAGS) $(CFLAGS) -MT src/systemd_modules_load-modules-load.obj -MD -MP -MF src/$(DEPDIR)/systemd_modules_load-modules-load.Tpo -c -o src/systemd_modules_load-modules-load.obj `if test -f 'src/modules-load.c'; then $(CYGPATH_W) 'src/modules-load.c'; else $(CYGPATH_W) '$(srcdir)/src/modules-load.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_modules_load-modules-load.Tpo src/$(DEPDIR)/systemd_modules_load-modules-load.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/modules-load.c' object='src/systemd_modules_load-modules-load.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_modules_load_CFLAGS) $(CFLAGS) -c -o src/systemd_modules_load-modules-load.obj `if test -f 'src/modules-load.c'; then $(CYGPATH_W) 'src/modules-load.c'; else $(CYGPATH_W) '$(srcdir)/src/modules-load.c'; fi`
-
-src/login/systemd_multi_seat_x-multi-seat-x.o: src/login/multi-seat-x.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_multi_seat_x_CFLAGS) $(CFLAGS) -MT src/login/systemd_multi_seat_x-multi-seat-x.o -MD -MP -MF src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Tpo -c -o src/login/systemd_multi_seat_x-multi-seat-x.o `test -f 'src/login/multi-seat-x.c' || echo '$(srcdir)/'`src/login/multi-seat-x.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Tpo src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/multi-seat-x.c' object='src/login/systemd_multi_seat_x-multi-seat-x.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_multi_seat_x_CFLAGS) $(CFLAGS) -c -o src/login/systemd_multi_seat_x-multi-seat-x.o `test -f 'src/login/multi-seat-x.c' || echo '$(srcdir)/'`src/login/multi-seat-x.c
-
-src/login/systemd_multi_seat_x-multi-seat-x.obj: src/login/multi-seat-x.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_multi_seat_x_CFLAGS) $(CFLAGS) -MT src/login/systemd_multi_seat_x-multi-seat-x.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Tpo -c -o src/login/systemd_multi_seat_x-multi-seat-x.obj `if test -f 'src/login/multi-seat-x.c'; then $(CYGPATH_W) 'src/login/multi-seat-x.c'; else $(CYGPATH_W) '$(srcdir)/src/login/multi-seat-x.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Tpo src/login/$(DEPDIR)/systemd_multi_seat_x-multi-seat-x.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/multi-seat-x.c' object='src/login/systemd_multi_seat_x-multi-seat-x.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_multi_seat_x_CFLAGS) $(CFLAGS) -c -o src/login/systemd_multi_seat_x-multi-seat-x.obj `if test -f 'src/login/multi-seat-x.c'; then $(CYGPATH_W) 'src/login/multi-seat-x.c'; else $(CYGPATH_W) '$(srcdir)/src/login/multi-seat-x.c'; fi`
-
-src/readahead/systemd_readahead_collect-readahead-collect.o: src/readahead/readahead-collect.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_collect-readahead-collect.o -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Tpo -c -o src/readahead/systemd_readahead_collect-readahead-collect.o `test -f 'src/readahead/readahead-collect.c' || echo '$(srcdir)/'`src/readahead/readahead-collect.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Tpo src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-collect.c' object='src/readahead/systemd_readahead_collect-readahead-collect.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_collect-readahead-collect.o `test -f 'src/readahead/readahead-collect.c' || echo '$(srcdir)/'`src/readahead/readahead-collect.c
-
-src/readahead/systemd_readahead_collect-readahead-collect.obj: src/readahead/readahead-collect.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_collect-readahead-collect.obj -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Tpo -c -o src/readahead/systemd_readahead_collect-readahead-collect.obj `if test -f 'src/readahead/readahead-collect.c'; then $(CYGPATH_W) 'src/readahead/readahead-collect.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-collect.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Tpo src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-collect.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-collect.c' object='src/readahead/systemd_readahead_collect-readahead-collect.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_collect-readahead-collect.obj `if test -f 'src/readahead/readahead-collect.c'; then $(CYGPATH_W) 'src/readahead/readahead-collect.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-collect.c'; fi`
-
-src/readahead/systemd_readahead_collect-readahead-common.o: src/readahead/readahead-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_collect-readahead-common.o -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Tpo -c -o src/readahead/systemd_readahead_collect-readahead-common.o `test -f 'src/readahead/readahead-common.c' || echo '$(srcdir)/'`src/readahead/readahead-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Tpo src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-common.c' object='src/readahead/systemd_readahead_collect-readahead-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_collect-readahead-common.o `test -f 'src/readahead/readahead-common.c' || echo '$(srcdir)/'`src/readahead/readahead-common.c
-
-src/readahead/systemd_readahead_collect-readahead-common.obj: src/readahead/readahead-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_collect-readahead-common.obj -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Tpo -c -o src/readahead/systemd_readahead_collect-readahead-common.obj `if test -f 'src/readahead/readahead-common.c'; then $(CYGPATH_W) 'src/readahead/readahead-common.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Tpo src/readahead/$(DEPDIR)/systemd_readahead_collect-readahead-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-common.c' object='src/readahead/systemd_readahead_collect-readahead-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_collect_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_collect-readahead-common.obj `if test -f 'src/readahead/readahead-common.c'; then $(CYGPATH_W) 'src/readahead/readahead-common.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-common.c'; fi`
-
-src/readahead/systemd_readahead_replay-readahead-replay.o: src/readahead/readahead-replay.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_replay-readahead-replay.o -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Tpo -c -o src/readahead/systemd_readahead_replay-readahead-replay.o `test -f 'src/readahead/readahead-replay.c' || echo '$(srcdir)/'`src/readahead/readahead-replay.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Tpo src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-replay.c' object='src/readahead/systemd_readahead_replay-readahead-replay.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_replay-readahead-replay.o `test -f 'src/readahead/readahead-replay.c' || echo '$(srcdir)/'`src/readahead/readahead-replay.c
-
-src/readahead/systemd_readahead_replay-readahead-replay.obj: src/readahead/readahead-replay.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_replay-readahead-replay.obj -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Tpo -c -o src/readahead/systemd_readahead_replay-readahead-replay.obj `if test -f 'src/readahead/readahead-replay.c'; then $(CYGPATH_W) 'src/readahead/readahead-replay.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-replay.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Tpo src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-replay.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-replay.c' object='src/readahead/systemd_readahead_replay-readahead-replay.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_replay-readahead-replay.obj `if test -f 'src/readahead/readahead-replay.c'; then $(CYGPATH_W) 'src/readahead/readahead-replay.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-replay.c'; fi`
-
-src/readahead/systemd_readahead_replay-readahead-common.o: src/readahead/readahead-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_replay-readahead-common.o -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Tpo -c -o src/readahead/systemd_readahead_replay-readahead-common.o `test -f 'src/readahead/readahead-common.c' || echo '$(srcdir)/'`src/readahead/readahead-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Tpo src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-common.c' object='src/readahead/systemd_readahead_replay-readahead-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_replay-readahead-common.o `test -f 'src/readahead/readahead-common.c' || echo '$(srcdir)/'`src/readahead/readahead-common.c
-
-src/readahead/systemd_readahead_replay-readahead-common.obj: src/readahead/readahead-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -MT src/readahead/systemd_readahead_replay-readahead-common.obj -MD -MP -MF src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Tpo -c -o src/readahead/systemd_readahead_replay-readahead-common.obj `if test -f 'src/readahead/readahead-common.c'; then $(CYGPATH_W) 'src/readahead/readahead-common.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Tpo src/readahead/$(DEPDIR)/systemd_readahead_replay-readahead-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/readahead/readahead-common.c' object='src/readahead/systemd_readahead_replay-readahead-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_readahead_replay_CFLAGS) $(CFLAGS) -c -o src/readahead/systemd_readahead_replay-readahead-common.obj `if test -f 'src/readahead/readahead-common.c'; then $(CYGPATH_W) 'src/readahead/readahead-common.c'; else $(CYGPATH_W) '$(srcdir)/src/readahead/readahead-common.c'; fi`
-
-src/systemd_shutdown-mount-setup.o: src/mount-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -MT src/systemd_shutdown-mount-setup.o -MD -MP -MF src/$(DEPDIR)/systemd_shutdown-mount-setup.Tpo -c -o src/systemd_shutdown-mount-setup.o `test -f 'src/mount-setup.c' || echo '$(srcdir)/'`src/mount-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdown-mount-setup.Tpo src/$(DEPDIR)/systemd_shutdown-mount-setup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/mount-setup.c' object='src/systemd_shutdown-mount-setup.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdown-mount-setup.o `test -f 'src/mount-setup.c' || echo '$(srcdir)/'`src/mount-setup.c
-
-src/systemd_shutdown-mount-setup.obj: src/mount-setup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -MT src/systemd_shutdown-mount-setup.obj -MD -MP -MF src/$(DEPDIR)/systemd_shutdown-mount-setup.Tpo -c -o src/systemd_shutdown-mount-setup.obj `if test -f 'src/mount-setup.c'; then $(CYGPATH_W) 'src/mount-setup.c'; else $(CYGPATH_W) '$(srcdir)/src/mount-setup.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdown-mount-setup.Tpo src/$(DEPDIR)/systemd_shutdown-mount-setup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/mount-setup.c' object='src/systemd_shutdown-mount-setup.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdown-mount-setup.obj `if test -f 'src/mount-setup.c'; then $(CYGPATH_W) 'src/mount-setup.c'; else $(CYGPATH_W) '$(srcdir)/src/mount-setup.c'; fi`
-
-src/systemd_shutdown-umount.o: src/umount.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -MT src/systemd_shutdown-umount.o -MD -MP -MF src/$(DEPDIR)/systemd_shutdown-umount.Tpo -c -o src/systemd_shutdown-umount.o `test -f 'src/umount.c' || echo '$(srcdir)/'`src/umount.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdown-umount.Tpo src/$(DEPDIR)/systemd_shutdown-umount.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/umount.c' object='src/systemd_shutdown-umount.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdown-umount.o `test -f 'src/umount.c' || echo '$(srcdir)/'`src/umount.c
-
-src/systemd_shutdown-umount.obj: src/umount.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -MT src/systemd_shutdown-umount.obj -MD -MP -MF src/$(DEPDIR)/systemd_shutdown-umount.Tpo -c -o src/systemd_shutdown-umount.obj `if test -f 'src/umount.c'; then $(CYGPATH_W) 'src/umount.c'; else $(CYGPATH_W) '$(srcdir)/src/umount.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdown-umount.Tpo src/$(DEPDIR)/systemd_shutdown-umount.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/umount.c' object='src/systemd_shutdown-umount.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdown-umount.obj `if test -f 'src/umount.c'; then $(CYGPATH_W) 'src/umount.c'; else $(CYGPATH_W) '$(srcdir)/src/umount.c'; fi`
-
-src/systemd_shutdown-shutdown.o: src/shutdown.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -MT src/systemd_shutdown-shutdown.o -MD -MP -MF src/$(DEPDIR)/systemd_shutdown-shutdown.Tpo -c -o src/systemd_shutdown-shutdown.o `test -f 'src/shutdown.c' || echo '$(srcdir)/'`src/shutdown.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdown-shutdown.Tpo src/$(DEPDIR)/systemd_shutdown-shutdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/shutdown.c' object='src/systemd_shutdown-shutdown.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdown-shutdown.o `test -f 'src/shutdown.c' || echo '$(srcdir)/'`src/shutdown.c
-
-src/systemd_shutdown-shutdown.obj: src/shutdown.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -MT src/systemd_shutdown-shutdown.obj -MD -MP -MF src/$(DEPDIR)/systemd_shutdown-shutdown.Tpo -c -o src/systemd_shutdown-shutdown.obj `if test -f 'src/shutdown.c'; then $(CYGPATH_W) 'src/shutdown.c'; else $(CYGPATH_W) '$(srcdir)/src/shutdown.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdown-shutdown.Tpo src/$(DEPDIR)/systemd_shutdown-shutdown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/shutdown.c' object='src/systemd_shutdown-shutdown.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdown_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdown-shutdown.obj `if test -f 'src/shutdown.c'; then $(CYGPATH_W) 'src/shutdown.c'; else $(CYGPATH_W) '$(srcdir)/src/shutdown.c'; fi`
-
-src/systemd_shutdownd-utmp-wtmp.o: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -MT src/systemd_shutdownd-utmp-wtmp.o -MD -MP -MF src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Tpo -c -o src/systemd_shutdownd-utmp-wtmp.o `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Tpo src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/systemd_shutdownd-utmp-wtmp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdownd-utmp-wtmp.o `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-
-src/systemd_shutdownd-utmp-wtmp.obj: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -MT src/systemd_shutdownd-utmp-wtmp.obj -MD -MP -MF src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Tpo -c -o src/systemd_shutdownd-utmp-wtmp.obj `if test -f 'src/utmp-wtmp.c'; then $(CYGPATH_W) 'src/utmp-wtmp.c'; else $(CYGPATH_W) '$(srcdir)/src/utmp-wtmp.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Tpo src/$(DEPDIR)/systemd_shutdownd-utmp-wtmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/systemd_shutdownd-utmp-wtmp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdownd-utmp-wtmp.obj `if test -f 'src/utmp-wtmp.c'; then $(CYGPATH_W) 'src/utmp-wtmp.c'; else $(CYGPATH_W) '$(srcdir)/src/utmp-wtmp.c'; fi`
-
-src/systemd_shutdownd-shutdownd.o: src/shutdownd.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -MT src/systemd_shutdownd-shutdownd.o -MD -MP -MF src/$(DEPDIR)/systemd_shutdownd-shutdownd.Tpo -c -o src/systemd_shutdownd-shutdownd.o `test -f 'src/shutdownd.c' || echo '$(srcdir)/'`src/shutdownd.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdownd-shutdownd.Tpo src/$(DEPDIR)/systemd_shutdownd-shutdownd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/shutdownd.c' object='src/systemd_shutdownd-shutdownd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdownd-shutdownd.o `test -f 'src/shutdownd.c' || echo '$(srcdir)/'`src/shutdownd.c
-
-src/systemd_shutdownd-shutdownd.obj: src/shutdownd.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -MT src/systemd_shutdownd-shutdownd.obj -MD -MP -MF src/$(DEPDIR)/systemd_shutdownd-shutdownd.Tpo -c -o src/systemd_shutdownd-shutdownd.obj `if test -f 'src/shutdownd.c'; then $(CYGPATH_W) 'src/shutdownd.c'; else $(CYGPATH_W) '$(srcdir)/src/shutdownd.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_shutdownd-shutdownd.Tpo src/$(DEPDIR)/systemd_shutdownd-shutdownd.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/shutdownd.c' object='src/systemd_shutdownd-shutdownd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_shutdownd_CFLAGS) $(CFLAGS) -c -o src/systemd_shutdownd-shutdownd.obj `if test -f 'src/shutdownd.c'; then $(CYGPATH_W) 'src/shutdownd.c'; else $(CYGPATH_W) '$(srcdir)/src/shutdownd.c'; fi`
-
-src/timedate/systemd_timedated-timedated.o: src/timedate/timedated.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -MT src/timedate/systemd_timedated-timedated.o -MD -MP -MF src/timedate/$(DEPDIR)/systemd_timedated-timedated.Tpo -c -o src/timedate/systemd_timedated-timedated.o `test -f 'src/timedate/timedated.c' || echo '$(srcdir)/'`src/timedate/timedated.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/timedate/$(DEPDIR)/systemd_timedated-timedated.Tpo src/timedate/$(DEPDIR)/systemd_timedated-timedated.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/timedate/timedated.c' object='src/timedate/systemd_timedated-timedated.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -c -o src/timedate/systemd_timedated-timedated.o `test -f 'src/timedate/timedated.c' || echo '$(srcdir)/'`src/timedate/timedated.c
-
-src/timedate/systemd_timedated-timedated.obj: src/timedate/timedated.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -MT src/timedate/systemd_timedated-timedated.obj -MD -MP -MF src/timedate/$(DEPDIR)/systemd_timedated-timedated.Tpo -c -o src/timedate/systemd_timedated-timedated.obj `if test -f 'src/timedate/timedated.c'; then $(CYGPATH_W) 'src/timedate/timedated.c'; else $(CYGPATH_W) '$(srcdir)/src/timedate/timedated.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/timedate/$(DEPDIR)/systemd_timedated-timedated.Tpo src/timedate/$(DEPDIR)/systemd_timedated-timedated.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/timedate/timedated.c' object='src/timedate/systemd_timedated-timedated.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -c -o src/timedate/systemd_timedated-timedated.obj `if test -f 'src/timedate/timedated.c'; then $(CYGPATH_W) 'src/timedate/timedated.c'; else $(CYGPATH_W) '$(srcdir)/src/timedate/timedated.c'; fi`
-
-src/systemd_timedated-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -MT src/systemd_timedated-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_timedated-dbus-common.Tpo -c -o src/systemd_timedated-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_timedated-dbus-common.Tpo src/$(DEPDIR)/systemd_timedated-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_timedated-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -c -o src/systemd_timedated-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_timedated-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -MT src/systemd_timedated-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_timedated-dbus-common.Tpo -c -o src/systemd_timedated-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_timedated-dbus-common.Tpo src/$(DEPDIR)/systemd_timedated-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_timedated-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -c -o src/systemd_timedated-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_timedated-polkit.o: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -MT src/systemd_timedated-polkit.o -MD -MP -MF src/$(DEPDIR)/systemd_timedated-polkit.Tpo -c -o src/systemd_timedated-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_timedated-polkit.Tpo src/$(DEPDIR)/systemd_timedated-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_timedated-polkit.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -c -o src/systemd_timedated-polkit.o `test -f 'src/polkit.c' || echo '$(srcdir)/'`src/polkit.c
-
-src/systemd_timedated-polkit.obj: src/polkit.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -MT src/systemd_timedated-polkit.obj -MD -MP -MF src/$(DEPDIR)/systemd_timedated-polkit.Tpo -c -o src/systemd_timedated-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_timedated-polkit.Tpo src/$(DEPDIR)/systemd_timedated-polkit.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/polkit.c' object='src/systemd_timedated-polkit.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_timedated_CFLAGS) $(CFLAGS) -c -o src/systemd_timedated-polkit.obj `if test -f 'src/polkit.c'; then $(CYGPATH_W) 'src/polkit.c'; else $(CYGPATH_W) '$(srcdir)/src/polkit.c'; fi`
-
-src/login/systemd_uaccess-uaccess.o: src/login/uaccess.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -MT src/login/systemd_uaccess-uaccess.o -MD -MP -MF src/login/$(DEPDIR)/systemd_uaccess-uaccess.Tpo -c -o src/login/systemd_uaccess-uaccess.o `test -f 'src/login/uaccess.c' || echo '$(srcdir)/'`src/login/uaccess.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_uaccess-uaccess.Tpo src/login/$(DEPDIR)/systemd_uaccess-uaccess.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/uaccess.c' object='src/login/systemd_uaccess-uaccess.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -c -o src/login/systemd_uaccess-uaccess.o `test -f 'src/login/uaccess.c' || echo '$(srcdir)/'`src/login/uaccess.c
-
-src/login/systemd_uaccess-uaccess.obj: src/login/uaccess.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -MT src/login/systemd_uaccess-uaccess.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_uaccess-uaccess.Tpo -c -o src/login/systemd_uaccess-uaccess.obj `if test -f 'src/login/uaccess.c'; then $(CYGPATH_W) 'src/login/uaccess.c'; else $(CYGPATH_W) '$(srcdir)/src/login/uaccess.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_uaccess-uaccess.Tpo src/login/$(DEPDIR)/systemd_uaccess-uaccess.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/uaccess.c' object='src/login/systemd_uaccess-uaccess.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -c -o src/login/systemd_uaccess-uaccess.obj `if test -f 'src/login/uaccess.c'; then $(CYGPATH_W) 'src/login/uaccess.c'; else $(CYGPATH_W) '$(srcdir)/src/login/uaccess.c'; fi`
-
-src/login/systemd_uaccess-logind-acl.o: src/login/logind-acl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -MT src/login/systemd_uaccess-logind-acl.o -MD -MP -MF src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Tpo -c -o src/login/systemd_uaccess-logind-acl.o `test -f 'src/login/logind-acl.c' || echo '$(srcdir)/'`src/login/logind-acl.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Tpo src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-acl.c' object='src/login/systemd_uaccess-logind-acl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -c -o src/login/systemd_uaccess-logind-acl.o `test -f 'src/login/logind-acl.c' || echo '$(srcdir)/'`src/login/logind-acl.c
-
-src/login/systemd_uaccess-logind-acl.obj: src/login/logind-acl.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -MT src/login/systemd_uaccess-logind-acl.obj -MD -MP -MF src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Tpo -c -o src/login/systemd_uaccess-logind-acl.obj `if test -f 'src/login/logind-acl.c'; then $(CYGPATH_W) 'src/login/logind-acl.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-acl.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Tpo src/login/$(DEPDIR)/systemd_uaccess-logind-acl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/login/logind-acl.c' object='src/login/systemd_uaccess-logind-acl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -c -o src/login/systemd_uaccess-logind-acl.obj `if test -f 'src/login/logind-acl.c'; then $(CYGPATH_W) 'src/login/logind-acl.c'; else $(CYGPATH_W) '$(srcdir)/src/login/logind-acl.c'; fi`
-
-src/systemd_uaccess-acl-util.o: src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -MT src/systemd_uaccess-acl-util.o -MD -MP -MF src/$(DEPDIR)/systemd_uaccess-acl-util.Tpo -c -o src/systemd_uaccess-acl-util.o `test -f 'src/acl-util.c' || echo '$(srcdir)/'`src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_uaccess-acl-util.Tpo src/$(DEPDIR)/systemd_uaccess-acl-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/acl-util.c' object='src/systemd_uaccess-acl-util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -c -o src/systemd_uaccess-acl-util.o `test -f 'src/acl-util.c' || echo '$(srcdir)/'`src/acl-util.c
-
-src/systemd_uaccess-acl-util.obj: src/acl-util.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -MT src/systemd_uaccess-acl-util.obj -MD -MP -MF src/$(DEPDIR)/systemd_uaccess-acl-util.Tpo -c -o src/systemd_uaccess-acl-util.obj `if test -f 'src/acl-util.c'; then $(CYGPATH_W) 'src/acl-util.c'; else $(CYGPATH_W) '$(srcdir)/src/acl-util.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_uaccess-acl-util.Tpo src/$(DEPDIR)/systemd_uaccess-acl-util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/acl-util.c' object='src/systemd_uaccess-acl-util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_uaccess_CFLAGS) $(CFLAGS) -c -o src/systemd_uaccess-acl-util.obj `if test -f 'src/acl-util.c'; then $(CYGPATH_W) 'src/acl-util.c'; else $(CYGPATH_W) '$(srcdir)/src/acl-util.c'; fi`
-
-src/systemd_update_utmp-update-utmp.o: src/update-utmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -MT src/systemd_update_utmp-update-utmp.o -MD -MP -MF src/$(DEPDIR)/systemd_update_utmp-update-utmp.Tpo -c -o src/systemd_update_utmp-update-utmp.o `test -f 'src/update-utmp.c' || echo '$(srcdir)/'`src/update-utmp.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_update_utmp-update-utmp.Tpo src/$(DEPDIR)/systemd_update_utmp-update-utmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/update-utmp.c' object='src/systemd_update_utmp-update-utmp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -c -o src/systemd_update_utmp-update-utmp.o `test -f 'src/update-utmp.c' || echo '$(srcdir)/'`src/update-utmp.c
-
-src/systemd_update_utmp-update-utmp.obj: src/update-utmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -MT src/systemd_update_utmp-update-utmp.obj -MD -MP -MF src/$(DEPDIR)/systemd_update_utmp-update-utmp.Tpo -c -o src/systemd_update_utmp-update-utmp.obj `if test -f 'src/update-utmp.c'; then $(CYGPATH_W) 'src/update-utmp.c'; else $(CYGPATH_W) '$(srcdir)/src/update-utmp.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_update_utmp-update-utmp.Tpo src/$(DEPDIR)/systemd_update_utmp-update-utmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/update-utmp.c' object='src/systemd_update_utmp-update-utmp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -c -o src/systemd_update_utmp-update-utmp.obj `if test -f 'src/update-utmp.c'; then $(CYGPATH_W) 'src/update-utmp.c'; else $(CYGPATH_W) '$(srcdir)/src/update-utmp.c'; fi`
-
-src/systemd_update_utmp-dbus-common.o: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -MT src/systemd_update_utmp-dbus-common.o -MD -MP -MF src/$(DEPDIR)/systemd_update_utmp-dbus-common.Tpo -c -o src/systemd_update_utmp-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_update_utmp-dbus-common.Tpo src/$(DEPDIR)/systemd_update_utmp-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_update_utmp-dbus-common.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -c -o src/systemd_update_utmp-dbus-common.o `test -f 'src/dbus-common.c' || echo '$(srcdir)/'`src/dbus-common.c
-
-src/systemd_update_utmp-dbus-common.obj: src/dbus-common.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -MT src/systemd_update_utmp-dbus-common.obj -MD -MP -MF src/$(DEPDIR)/systemd_update_utmp-dbus-common.Tpo -c -o src/systemd_update_utmp-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_update_utmp-dbus-common.Tpo src/$(DEPDIR)/systemd_update_utmp-dbus-common.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/dbus-common.c' object='src/systemd_update_utmp-dbus-common.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -c -o src/systemd_update_utmp-dbus-common.obj `if test -f 'src/dbus-common.c'; then $(CYGPATH_W) 'src/dbus-common.c'; else $(CYGPATH_W) '$(srcdir)/src/dbus-common.c'; fi`
-
-src/systemd_update_utmp-utmp-wtmp.o: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -MT src/systemd_update_utmp-utmp-wtmp.o -MD -MP -MF src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Tpo -c -o src/systemd_update_utmp-utmp-wtmp.o `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Tpo src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/systemd_update_utmp-utmp-wtmp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -c -o src/systemd_update_utmp-utmp-wtmp.o `test -f 'src/utmp-wtmp.c' || echo '$(srcdir)/'`src/utmp-wtmp.c
-
-src/systemd_update_utmp-utmp-wtmp.obj: src/utmp-wtmp.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -MT src/systemd_update_utmp-utmp-wtmp.obj -MD -MP -MF src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Tpo -c -o src/systemd_update_utmp-utmp-wtmp.obj `if test -f 'src/utmp-wtmp.c'; then $(CYGPATH_W) 'src/utmp-wtmp.c'; else $(CYGPATH_W) '$(srcdir)/src/utmp-wtmp.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Tpo src/$(DEPDIR)/systemd_update_utmp-utmp-wtmp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/utmp-wtmp.c' object='src/systemd_update_utmp-utmp-wtmp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(systemd_update_utmp_CFLAGS) $(CFLAGS) -c -o src/systemd_update_utmp-utmp-wtmp.obj `if test -f 'src/utmp-wtmp.c'; then $(CYGPATH_W) 'src/utmp-wtmp.c'; else $(CYGPATH_W) '$(srcdir)/src/utmp-wtmp.c'; fi`
-
-src/test_engine-test-engine.o: src/test-engine.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_engine_CFLAGS) $(CFLAGS) -MT src/test_engine-test-engine.o -MD -MP -MF src/$(DEPDIR)/test_engine-test-engine.Tpo -c -o src/test_engine-test-engine.o `test -f 'src/test-engine.c' || echo '$(srcdir)/'`src/test-engine.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_engine-test-engine.Tpo src/$(DEPDIR)/test_engine-test-engine.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-engine.c' object='src/test_engine-test-engine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_engine_CFLAGS) $(CFLAGS) -c -o src/test_engine-test-engine.o `test -f 'src/test-engine.c' || echo '$(srcdir)/'`src/test-engine.c
-
-src/test_engine-test-engine.obj: src/test-engine.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_engine_CFLAGS) $(CFLAGS) -MT src/test_engine-test-engine.obj -MD -MP -MF src/$(DEPDIR)/test_engine-test-engine.Tpo -c -o src/test_engine-test-engine.obj `if test -f 'src/test-engine.c'; then $(CYGPATH_W) 'src/test-engine.c'; else $(CYGPATH_W) '$(srcdir)/src/test-engine.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_engine-test-engine.Tpo src/$(DEPDIR)/test_engine-test-engine.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-engine.c' object='src/test_engine-test-engine.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_engine_CFLAGS) $(CFLAGS) -c -o src/test_engine-test-engine.obj `if test -f 'src/test-engine.c'; then $(CYGPATH_W) 'src/test-engine.c'; else $(CYGPATH_W) '$(srcdir)/src/test-engine.c'; fi`
-
-src/test_install-test-install.o: src/test-install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-test-install.o -MD -MP -MF src/$(DEPDIR)/test_install-test-install.Tpo -c -o src/test_install-test-install.o `test -f 'src/test-install.c' || echo '$(srcdir)/'`src/test-install.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-test-install.Tpo src/$(DEPDIR)/test_install-test-install.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-install.c' object='src/test_install-test-install.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-test-install.o `test -f 'src/test-install.c' || echo '$(srcdir)/'`src/test-install.c
-
-src/test_install-test-install.obj: src/test-install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-test-install.obj -MD -MP -MF src/$(DEPDIR)/test_install-test-install.Tpo -c -o src/test_install-test-install.obj `if test -f 'src/test-install.c'; then $(CYGPATH_W) 'src/test-install.c'; else $(CYGPATH_W) '$(srcdir)/src/test-install.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-test-install.Tpo src/$(DEPDIR)/test_install-test-install.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-install.c' object='src/test_install-test-install.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-test-install.obj `if test -f 'src/test-install.c'; then $(CYGPATH_W) 'src/test-install.c'; else $(CYGPATH_W) '$(srcdir)/src/test-install.c'; fi`
-
-src/test_install-install.o: src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-install.o -MD -MP -MF src/$(DEPDIR)/test_install-install.Tpo -c -o src/test_install-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-install.Tpo src/$(DEPDIR)/test_install-install.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/install.c' object='src/test_install-install.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-install.o `test -f 'src/install.c' || echo '$(srcdir)/'`src/install.c
-
-src/test_install-install.obj: src/install.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-install.obj -MD -MP -MF src/$(DEPDIR)/test_install-install.Tpo -c -o src/test_install-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-install.Tpo src/$(DEPDIR)/test_install-install.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/install.c' object='src/test_install-install.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-install.obj `if test -f 'src/install.c'; then $(CYGPATH_W) 'src/install.c'; else $(CYGPATH_W) '$(srcdir)/src/install.c'; fi`
-
-src/test_install-path-lookup.o: src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-path-lookup.o -MD -MP -MF src/$(DEPDIR)/test_install-path-lookup.Tpo -c -o src/test_install-path-lookup.o `test -f 'src/path-lookup.c' || echo '$(srcdir)/'`src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-path-lookup.Tpo src/$(DEPDIR)/test_install-path-lookup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/path-lookup.c' object='src/test_install-path-lookup.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-path-lookup.o `test -f 'src/path-lookup.c' || echo '$(srcdir)/'`src/path-lookup.c
-
-src/test_install-path-lookup.obj: src/path-lookup.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-path-lookup.obj -MD -MP -MF src/$(DEPDIR)/test_install-path-lookup.Tpo -c -o src/test_install-path-lookup.obj `if test -f 'src/path-lookup.c'; then $(CYGPATH_W) 'src/path-lookup.c'; else $(CYGPATH_W) '$(srcdir)/src/path-lookup.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-path-lookup.Tpo src/$(DEPDIR)/test_install-path-lookup.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/path-lookup.c' object='src/test_install-path-lookup.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-path-lookup.obj `if test -f 'src/path-lookup.c'; then $(CYGPATH_W) 'src/path-lookup.c'; else $(CYGPATH_W) '$(srcdir)/src/path-lookup.c'; fi`
-
-src/test_install-unit-name.o: src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-unit-name.o -MD -MP -MF src/$(DEPDIR)/test_install-unit-name.Tpo -c -o src/test_install-unit-name.o `test -f 'src/unit-name.c' || echo '$(srcdir)/'`src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-unit-name.Tpo src/$(DEPDIR)/test_install-unit-name.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/unit-name.c' object='src/test_install-unit-name.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-unit-name.o `test -f 'src/unit-name.c' || echo '$(srcdir)/'`src/unit-name.c
-
-src/test_install-unit-name.obj: src/unit-name.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -MT src/test_install-unit-name.obj -MD -MP -MF src/$(DEPDIR)/test_install-unit-name.Tpo -c -o src/test_install-unit-name.obj `if test -f 'src/unit-name.c'; then $(CYGPATH_W) 'src/unit-name.c'; else $(CYGPATH_W) '$(srcdir)/src/unit-name.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_install-unit-name.Tpo src/$(DEPDIR)/test_install-unit-name.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/unit-name.c' object='src/test_install-unit-name.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_install_CFLAGS) $(CFLAGS) -c -o src/test_install-unit-name.obj `if test -f 'src/unit-name.c'; then $(CYGPATH_W) 'src/unit-name.c'; else $(CYGPATH_W) '$(srcdir)/src/unit-name.c'; fi`
-
-src/test_job_type-test-job-type.o: src/test-job-type.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_type_CFLAGS) $(CFLAGS) -MT src/test_job_type-test-job-type.o -MD -MP -MF src/$(DEPDIR)/test_job_type-test-job-type.Tpo -c -o src/test_job_type-test-job-type.o `test -f 'src/test-job-type.c' || echo '$(srcdir)/'`src/test-job-type.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_job_type-test-job-type.Tpo src/$(DEPDIR)/test_job_type-test-job-type.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-job-type.c' object='src/test_job_type-test-job-type.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_type_CFLAGS) $(CFLAGS) -c -o src/test_job_type-test-job-type.o `test -f 'src/test-job-type.c' || echo '$(srcdir)/'`src/test-job-type.c
-
-src/test_job_type-test-job-type.obj: src/test-job-type.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_type_CFLAGS) $(CFLAGS) -MT src/test_job_type-test-job-type.obj -MD -MP -MF src/$(DEPDIR)/test_job_type-test-job-type.Tpo -c -o src/test_job_type-test-job-type.obj `if test -f 'src/test-job-type.c'; then $(CYGPATH_W) 'src/test-job-type.c'; else $(CYGPATH_W) '$(srcdir)/src/test-job-type.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_job_type-test-job-type.Tpo src/$(DEPDIR)/test_job_type-test-job-type.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-job-type.c' object='src/test_job_type-test-job-type.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_job_type_CFLAGS) $(CFLAGS) -c -o src/test_job_type-test-job-type.obj `if test -f 'src/test-job-type.c'; then $(CYGPATH_W) 'src/test-job-type.c'; else $(CYGPATH_W) '$(srcdir)/src/test-job-type.c'; fi`
-
-src/journal/test_journal-test-journal.o: src/journal/test-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-test-journal.o -MD -MP -MF src/journal/$(DEPDIR)/test_journal-test-journal.Tpo -c -o src/journal/test_journal-test-journal.o `test -f 'src/journal/test-journal.c' || echo '$(srcdir)/'`src/journal/test-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-test-journal.Tpo src/journal/$(DEPDIR)/test_journal-test-journal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/test-journal.c' object='src/journal/test_journal-test-journal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-test-journal.o `test -f 'src/journal/test-journal.c' || echo '$(srcdir)/'`src/journal/test-journal.c
-
-src/journal/test_journal-test-journal.obj: src/journal/test-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-test-journal.obj -MD -MP -MF src/journal/$(DEPDIR)/test_journal-test-journal.Tpo -c -o src/journal/test_journal-test-journal.obj `if test -f 'src/journal/test-journal.c'; then $(CYGPATH_W) 'src/journal/test-journal.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/test-journal.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-test-journal.Tpo src/journal/$(DEPDIR)/test_journal-test-journal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/test-journal.c' object='src/journal/test_journal-test-journal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-test-journal.obj `if test -f 'src/journal/test-journal.c'; then $(CYGPATH_W) 'src/journal/test-journal.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/test-journal.c'; fi`
-
-src/journal/test_journal-sd-journal.o: src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-sd-journal.o -MD -MP -MF src/journal/$(DEPDIR)/test_journal-sd-journal.Tpo -c -o src/journal/test_journal-sd-journal.o `test -f 'src/journal/sd-journal.c' || echo '$(srcdir)/'`src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-sd-journal.Tpo src/journal/$(DEPDIR)/test_journal-sd-journal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/sd-journal.c' object='src/journal/test_journal-sd-journal.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-sd-journal.o `test -f 'src/journal/sd-journal.c' || echo '$(srcdir)/'`src/journal/sd-journal.c
-
-src/journal/test_journal-sd-journal.obj: src/journal/sd-journal.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-sd-journal.obj -MD -MP -MF src/journal/$(DEPDIR)/test_journal-sd-journal.Tpo -c -o src/journal/test_journal-sd-journal.obj `if test -f 'src/journal/sd-journal.c'; then $(CYGPATH_W) 'src/journal/sd-journal.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/sd-journal.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-sd-journal.Tpo src/journal/$(DEPDIR)/test_journal-sd-journal.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/sd-journal.c' object='src/journal/test_journal-sd-journal.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-sd-journal.obj `if test -f 'src/journal/sd-journal.c'; then $(CYGPATH_W) 'src/journal/sd-journal.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/sd-journal.c'; fi`
-
-src/journal/test_journal-journal-file.o: src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-journal-file.o -MD -MP -MF src/journal/$(DEPDIR)/test_journal-journal-file.Tpo -c -o src/journal/test_journal-journal-file.o `test -f 'src/journal/journal-file.c' || echo '$(srcdir)/'`src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-journal-file.Tpo src/journal/$(DEPDIR)/test_journal-journal-file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-file.c' object='src/journal/test_journal-journal-file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-journal-file.o `test -f 'src/journal/journal-file.c' || echo '$(srcdir)/'`src/journal/journal-file.c
-
-src/journal/test_journal-journal-file.obj: src/journal/journal-file.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-journal-file.obj -MD -MP -MF src/journal/$(DEPDIR)/test_journal-journal-file.Tpo -c -o src/journal/test_journal-journal-file.obj `if test -f 'src/journal/journal-file.c'; then $(CYGPATH_W) 'src/journal/journal-file.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-file.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-journal-file.Tpo src/journal/$(DEPDIR)/test_journal-journal-file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-file.c' object='src/journal/test_journal-journal-file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-journal-file.obj `if test -f 'src/journal/journal-file.c'; then $(CYGPATH_W) 'src/journal/journal-file.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-file.c'; fi`
-
-src/journal/test_journal-lookup3.o: src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-lookup3.o -MD -MP -MF src/journal/$(DEPDIR)/test_journal-lookup3.Tpo -c -o src/journal/test_journal-lookup3.o `test -f 'src/journal/lookup3.c' || echo '$(srcdir)/'`src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-lookup3.Tpo src/journal/$(DEPDIR)/test_journal-lookup3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/lookup3.c' object='src/journal/test_journal-lookup3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-lookup3.o `test -f 'src/journal/lookup3.c' || echo '$(srcdir)/'`src/journal/lookup3.c
-
-src/journal/test_journal-lookup3.obj: src/journal/lookup3.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-lookup3.obj -MD -MP -MF src/journal/$(DEPDIR)/test_journal-lookup3.Tpo -c -o src/journal/test_journal-lookup3.obj `if test -f 'src/journal/lookup3.c'; then $(CYGPATH_W) 'src/journal/lookup3.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/lookup3.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-lookup3.Tpo src/journal/$(DEPDIR)/test_journal-lookup3.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/lookup3.c' object='src/journal/test_journal-lookup3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-lookup3.obj `if test -f 'src/journal/lookup3.c'; then $(CYGPATH_W) 'src/journal/lookup3.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/lookup3.c'; fi`
-
-src/journal/test_journal-journal-send.o: src/journal/journal-send.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-journal-send.o -MD -MP -MF src/journal/$(DEPDIR)/test_journal-journal-send.Tpo -c -o src/journal/test_journal-journal-send.o `test -f 'src/journal/journal-send.c' || echo '$(srcdir)/'`src/journal/journal-send.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-journal-send.Tpo src/journal/$(DEPDIR)/test_journal-journal-send.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-send.c' object='src/journal/test_journal-journal-send.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-journal-send.o `test -f 'src/journal/journal-send.c' || echo '$(srcdir)/'`src/journal/journal-send.c
-
-src/journal/test_journal-journal-send.obj: src/journal/journal-send.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-journal-send.obj -MD -MP -MF src/journal/$(DEPDIR)/test_journal-journal-send.Tpo -c -o src/journal/test_journal-journal-send.obj `if test -f 'src/journal/journal-send.c'; then $(CYGPATH_W) 'src/journal/journal-send.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-send.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-journal-send.Tpo src/journal/$(DEPDIR)/test_journal-journal-send.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/journal-send.c' object='src/journal/test_journal-journal-send.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-journal-send.obj `if test -f 'src/journal/journal-send.c'; then $(CYGPATH_W) 'src/journal/journal-send.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/journal-send.c'; fi`
-
-src/test_journal-sd-id128.o: src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/test_journal-sd-id128.o -MD -MP -MF src/$(DEPDIR)/test_journal-sd-id128.Tpo -c -o src/test_journal-sd-id128.o `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_journal-sd-id128.Tpo src/$(DEPDIR)/test_journal-sd-id128.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-id128.c' object='src/test_journal-sd-id128.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/test_journal-sd-id128.o `test -f 'src/sd-id128.c' || echo '$(srcdir)/'`src/sd-id128.c
-
-src/test_journal-sd-id128.obj: src/sd-id128.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/test_journal-sd-id128.obj -MD -MP -MF src/$(DEPDIR)/test_journal-sd-id128.Tpo -c -o src/test_journal-sd-id128.obj `if test -f 'src/sd-id128.c'; then $(CYGPATH_W) 'src/sd-id128.c'; else $(CYGPATH_W) '$(srcdir)/src/sd-id128.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_journal-sd-id128.Tpo src/$(DEPDIR)/test_journal-sd-id128.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/sd-id128.c' object='src/test_journal-sd-id128.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/test_journal-sd-id128.obj `if test -f 'src/sd-id128.c'; then $(CYGPATH_W) 'src/sd-id128.c'; else $(CYGPATH_W) '$(srcdir)/src/sd-id128.c'; fi`
-
-src/journal/test_journal-compress.o: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-compress.o -MD -MP -MF src/journal/$(DEPDIR)/test_journal-compress.Tpo -c -o src/journal/test_journal-compress.o `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-compress.Tpo src/journal/$(DEPDIR)/test_journal-compress.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/test_journal-compress.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-compress.o `test -f 'src/journal/compress.c' || echo '$(srcdir)/'`src/journal/compress.c
-
-src/journal/test_journal-compress.obj: src/journal/compress.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -MT src/journal/test_journal-compress.obj -MD -MP -MF src/journal/$(DEPDIR)/test_journal-compress.Tpo -c -o src/journal/test_journal-compress.obj `if test -f 'src/journal/compress.c'; then $(CYGPATH_W) 'src/journal/compress.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/compress.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/journal/$(DEPDIR)/test_journal-compress.Tpo src/journal/$(DEPDIR)/test_journal-compress.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/journal/compress.c' object='src/journal/test_journal-compress.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_journal_CFLAGS) $(CFLAGS) -c -o src/journal/test_journal-compress.obj `if test -f 'src/journal/compress.c'; then $(CYGPATH_W) 'src/journal/compress.c'; else $(CYGPATH_W) '$(srcdir)/src/journal/compress.c'; fi`
-
-src/test_ns-test-ns.o: src/test-ns.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ns_CFLAGS) $(CFLAGS) -MT src/test_ns-test-ns.o -MD -MP -MF src/$(DEPDIR)/test_ns-test-ns.Tpo -c -o src/test_ns-test-ns.o `test -f 'src/test-ns.c' || echo '$(srcdir)/'`src/test-ns.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_ns-test-ns.Tpo src/$(DEPDIR)/test_ns-test-ns.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-ns.c' object='src/test_ns-test-ns.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ns_CFLAGS) $(CFLAGS) -c -o src/test_ns-test-ns.o `test -f 'src/test-ns.c' || echo '$(srcdir)/'`src/test-ns.c
-
-src/test_ns-test-ns.obj: src/test-ns.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ns_CFLAGS) $(CFLAGS) -MT src/test_ns-test-ns.obj -MD -MP -MF src/$(DEPDIR)/test_ns-test-ns.Tpo -c -o src/test_ns-test-ns.obj `if test -f 'src/test-ns.c'; then $(CYGPATH_W) 'src/test-ns.c'; else $(CYGPATH_W) '$(srcdir)/src/test-ns.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/test_ns-test-ns.Tpo src/$(DEPDIR)/test_ns-test-ns.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/test-ns.c' object='src/test_ns-test-ns.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_ns_CFLAGS) $(CFLAGS) -c -o src/test_ns-test-ns.obj `if test -f 'src/test-ns.c'; then $(CYGPATH_W) 'src/test-ns.c'; else $(CYGPATH_W) '$(srcdir)/src/test-ns.c'; fi`
-$(srcdir)/test_loopback_vala.stamp: $(test_loopback_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_loopback_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_shutdownd_vala.stamp: $(systemd_shutdownd_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_shutdownd_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_journal_vala.stamp: $(test_journal_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_journal_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_readahead_replay_vala.stamp: $(systemd_readahead_replay_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_readahead_replay_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_getty_generator_vala.stamp: $(systemd_getty_generator_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_getty_generator_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_coredump_vala.stamp: $(systemd_coredump_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_coredump_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_ask_password_vala.stamp: $(systemd_ask_password_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_ask_password_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_localed_vala.stamp: $(systemd_localed_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_localed_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_nspawn_vala.stamp: $(systemd_nspawn_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_nspawn_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_uaccess_vala.stamp: $(systemd_uaccess_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_uaccess_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_cgroups_agent_vala.stamp: $(systemd_cgroups_agent_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_cgroups_agent_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_shutdown_vala.stamp: $(systemd_shutdown_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_shutdown_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_env_replace_vala.stamp: $(test_env_replace_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_env_replace_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_user_sessions_vala.stamp: $(systemd_user_sessions_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_user_sessions_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_ns_vala.stamp: $(test_ns_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_ns_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_readahead_collect_vala.stamp: $(systemd_readahead_collect_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_readahead_collect_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_fsck_vala.stamp: $(systemd_fsck_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_fsck_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_vala.stamp: $(systemd_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_strv_vala.stamp: $(test_strv_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_strv_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_tty_ask_password_agent_vala.stamp: $(systemd_tty_ask_password_agent_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_tty_ask_password_agent_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_modules_load_vala.stamp: $(systemd_modules_load_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_modules_load_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_cgroup_vala.stamp: $(test_cgroup_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_cgroup_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_random_seed_vala.stamp: $(systemd_random_seed_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_random_seed_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_id128_vala.stamp: $(test_id128_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_id128_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_vconsole_setup_vala.stamp: $(systemd_vconsole_setup_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_vconsole_setup_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_binfmt_vala.stamp: $(systemd_binfmt_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_binfmt_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_cryptsetup_vala.stamp: $(systemd_cryptsetup_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_cryptsetup_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_update_utmp_vala.stamp: $(systemd_update_utmp_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_update_utmp_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_reply_password_vala.stamp: $(systemd_reply_password_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_reply_password_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_timedated_vala.stamp: $(systemd_timedated_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_timedated_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_notify_vala.stamp: $(systemd_notify_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_notify_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/src/gnome-ask-password-agent.c: $(srcdir)/systemd_gnome_ask_password_agent_vala.stamp
-       @if test -f $@; then :; else rm -f $(srcdir)/systemd_gnome_ask_password_agent_vala.stamp; fi
-       @if test -f $@; then :; else \
-         $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/systemd_gnome_ask_password_agent_vala.stamp; \
-       fi
-$(srcdir)/systemd_gnome_ask_password_agent_vala.stamp: $(systemd_gnome_ask_password_agent_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(systemd_gnome_ask_password_agent_VALAFLAGS) $(VALAFLAGS) -C $(systemd_gnome_ask_password_agent_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_tmpfiles_vala.stamp: $(systemd_tmpfiles_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_tmpfiles_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_login_vala.stamp: $(test_login_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_login_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_remount_api_vfs_vala.stamp: $(systemd_remount_api_vfs_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_remount_api_vfs_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_hostnamed_vala.stamp: $(systemd_hostnamed_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_hostnamed_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_quotacheck_vala.stamp: $(systemd_quotacheck_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_quotacheck_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_rc_local_generator_vala.stamp: $(systemd_rc_local_generator_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_rc_local_generator_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_ac_power_vala.stamp: $(systemd_ac_power_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_ac_power_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_initctl_vala.stamp: $(systemd_initctl_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_initctl_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_engine_vala.stamp: $(test_engine_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_engine_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_cat_vala.stamp: $(systemd_cat_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_cat_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_detect_virt_vala.stamp: $(systemd_detect_virt_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_detect_virt_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_cgtop_vala.stamp: $(systemd_cgtop_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_cgtop_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemctl_vala.stamp: $(systemctl_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemctl_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/src/systemadm.c: $(srcdir)/systemadm_vala.stamp
-       @if test -f $@; then :; else rm -f $(srcdir)/systemadm_vala.stamp; fi
-       @if test -f $@; then :; else \
-         $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/systemadm_vala.stamp; \
-       fi
-$(srcdir)/src/systemd-interfaces.c: $(srcdir)/systemadm_vala.stamp
-       @if test -f $@; then :; else rm -f $(srcdir)/systemadm_vala.stamp; fi
-       @if test -f $@; then :; else \
-         $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/systemadm_vala.stamp; \
-       fi
-$(srcdir)/src/wraplabel.c: $(srcdir)/systemadm_vala.stamp
-       @if test -f $@; then :; else rm -f $(srcdir)/systemadm_vala.stamp; fi
-       @if test -f $@; then :; else \
-         $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/systemadm_vala.stamp; \
-       fi
-$(srcdir)/systemadm_vala.stamp: $(systemadm_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(systemadm_VALAFLAGS) $(VALAFLAGS) -C $(systemadm_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_loginctl_vala.stamp: $(systemd_loginctl_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_loginctl_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_machine_id_setup_vala.stamp: $(systemd_machine_id_setup_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_machine_id_setup_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_daemon_vala.stamp: $(test_daemon_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_daemon_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_install_vala.stamp: $(test_install_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_install_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_cryptsetup_generator_vala.stamp: $(systemd_cryptsetup_generator_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_cryptsetup_generator_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_timestamp_vala.stamp: $(systemd_timestamp_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_timestamp_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_journalctl_vala.stamp: $(systemd_journalctl_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_journalctl_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_multi_seat_x_vala.stamp: $(systemd_multi_seat_x_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_multi_seat_x_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_stdio_bridge_vala.stamp: $(systemd_stdio_bridge_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_stdio_bridge_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_sysctl_vala.stamp: $(systemd_sysctl_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_sysctl_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_logind_vala.stamp: $(systemd_logind_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_logind_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_job_type_vala.stamp: $(test_job_type_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_job_type_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/test_hostname_vala.stamp: $(test_hostname_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(test_hostname_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_journald_vala.stamp: $(systemd_journald_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_journald_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/systemd_cgls_vala.stamp: $(systemd_cgls_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(systemd_cgls_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/libsystemd_journal_la_vala.stamp: $(libsystemd_journal_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsystemd_journal_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/libsystemd_daemon_la_vala.stamp: $(libsystemd_daemon_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsystemd_daemon_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/libsystemd_core_la_vala.stamp: $(libsystemd_core_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsystemd_core_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/libsystemd_basic_la_vala.stamp: $(libsystemd_basic_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsystemd_basic_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/pam_systemd_la_vala.stamp: $(pam_systemd_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(pam_systemd_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/libsystemd_id128_la_vala.stamp: $(libsystemd_id128_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsystemd_id128_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-$(srcdir)/libsystemd_login_la_vala.stamp: $(libsystemd_login_la_SOURCES)
-       $(AM_V_at)rm -f $@ && echo stamp > $@-t
-       $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libsystemd_login_la_SOURCES)
-       $(AM_V_at)mv -f $@-t $@
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-       -rm -rf src/.libs src/_libs
-       -rm -rf src/journal/.libs src/journal/_libs
-       -rm -rf src/login/.libs src/login/_libs
-
-distclean-libtool:
-       -rm -f libtool config.lt
-install-man1: $(dist_man_MANS) $(nodist_man_MANS)
-       @$(NORMAL_INSTALL)
-       test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-       @list=''; test -n "$(man1dir)" || exit 0; \
-       { for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.1[a-z]*$$/p'; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man1:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man1dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.1[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man3: $(dist_man_MANS) $(nodist_man_MANS)
-       @$(NORMAL_INSTALL)
-       test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
-       @list=''; test -n "$(man3dir)" || exit 0; \
-       { for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.3[a-z]*$$/p'; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man3:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man3dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.3[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(dist_man_MANS) $(nodist_man_MANS)
-       @$(NORMAL_INSTALL)
-       test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-       @list=''; test -n "$(man5dir)" || exit 0; \
-       { for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.5[a-z]*$$/p'; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man5:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man5dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.5[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-man7: $(dist_man_MANS) $(nodist_man_MANS)
-       @$(NORMAL_INSTALL)
-       test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)"
-       @list=''; test -n "$(man7dir)" || exit 0; \
-       { for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.7[a-z]*$$/p'; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man7:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man7dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.7[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
-install-man8: $(dist_man_MANS) $(nodist_man_MANS)
-       @$(NORMAL_INSTALL)
-       test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
-       @list=''; test -n "$(man8dir)" || exit 0; \
-       { for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.8[a-z]*$$/p'; \
-       } | while read p; do \
-         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; echo "$$p"; \
-       done | \
-       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-       sed 'N;N;s,\n, ,g' | { \
-       list=; while read file base inst; do \
-         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-         fi; \
-       done; \
-       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-       while read files; do \
-         test -z "$$files" || { \
-           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-           $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-       done; }
-
-uninstall-man8:
-       @$(NORMAL_UNINSTALL)
-       @list=''; test -n "$(man8dir)" || exit 0; \
-       files=`{ for i in $$list; do echo "$$i"; done; \
-       l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-         sed -n '/\.8[a-z]*$$/p'; \
-       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-       dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-install-dbusinterfaceDATA: $(dbusinterface_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(dbusinterfacedir)" || $(MKDIR_P) "$(DESTDIR)$(dbusinterfacedir)"
-       @list='$(dbusinterface_DATA)'; test -n "$(dbusinterfacedir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbusinterfacedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(dbusinterfacedir)" || exit $$?; \
-       done
-
-uninstall-dbusinterfaceDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dbusinterface_DATA)'; test -n "$(dbusinterfacedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(dbusinterfacedir)'; $(am__uninstall_files_from_dir)
-install-dist_bashcompletionDATA: $(dist_bashcompletion_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(bashcompletiondir)" || $(MKDIR_P) "$(DESTDIR)$(bashcompletiondir)"
-       @list='$(dist_bashcompletion_DATA)'; test -n "$(bashcompletiondir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bashcompletiondir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletiondir)" || exit $$?; \
-       done
-
-uninstall-dist_bashcompletionDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_bashcompletion_DATA)'; test -n "$(bashcompletiondir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(bashcompletiondir)'; $(am__uninstall_files_from_dir)
-install-dist_dbuspolicyDATA: $(dist_dbuspolicy_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(dbuspolicydir)" || $(MKDIR_P) "$(DESTDIR)$(dbuspolicydir)"
-       @list='$(dist_dbuspolicy_DATA)'; test -n "$(dbuspolicydir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbuspolicydir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(dbuspolicydir)" || exit $$?; \
-       done
-
-uninstall-dist_dbuspolicyDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_dbuspolicy_DATA)'; test -n "$(dbuspolicydir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(dbuspolicydir)'; $(am__uninstall_files_from_dir)
-install-dist_dbussystemserviceDATA: $(dist_dbussystemservice_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(dbussystemservicedir)" || $(MKDIR_P) "$(DESTDIR)$(dbussystemservicedir)"
-       @list='$(dist_dbussystemservice_DATA)'; test -n "$(dbussystemservicedir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dbussystemservicedir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(dbussystemservicedir)" || exit $$?; \
-       done
-
-uninstall-dist_dbussystemserviceDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_dbussystemservice_DATA)'; test -n "$(dbussystemservicedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(dbussystemservicedir)'; $(am__uninstall_files_from_dir)
-install-dist_docDATA: $(dist_doc_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-       @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-       done
-
-uninstall-dist_docDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-       @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-       done
-
-uninstall-dist_pkgdataDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir)
-install-dist_pkgsysconfDATA: $(dist_pkgsysconf_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgsysconfdir)"
-       @list='$(dist_pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgsysconfdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgsysconfdir)" || exit $$?; \
-       done
-
-uninstall-dist_pkgsysconfDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(pkgsysconfdir)'; $(am__uninstall_files_from_dir)
-install-dist_systemunitDATA: $(dist_systemunit_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(systemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemunitdir)"
-       @list='$(dist_systemunit_DATA)'; test -n "$(systemunitdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemunitdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(systemunitdir)" || exit $$?; \
-       done
-
-uninstall-dist_systemunitDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_systemunit_DATA)'; test -n "$(systemunitdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(systemunitdir)'; $(am__uninstall_files_from_dir)
-install-dist_tmpfilesDATA: $(dist_tmpfiles_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(tmpfilesdir)" || $(MKDIR_P) "$(DESTDIR)$(tmpfilesdir)"
-       @list='$(dist_tmpfiles_DATA)'; test -n "$(tmpfilesdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tmpfilesdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(tmpfilesdir)" || exit $$?; \
-       done
-
-uninstall-dist_tmpfilesDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_tmpfiles_DATA)'; test -n "$(tmpfilesdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(tmpfilesdir)'; $(am__uninstall_files_from_dir)
-install-dist_udevrulesDATA: $(dist_udevrules_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)"
-       @list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
-       done
-
-uninstall-dist_udevrulesDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir)
-install-dist_userunitDATA: $(dist_userunit_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(userunitdir)" || $(MKDIR_P) "$(DESTDIR)$(userunitdir)"
-       @list='$(dist_userunit_DATA)'; test -n "$(userunitdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(userunitdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(userunitdir)" || exit $$?; \
-       done
-
-uninstall-dist_userunitDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dist_userunit_DATA)'; test -n "$(userunitdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(userunitdir)'; $(am__uninstall_files_from_dir)
-install-nodist_polkitpolicyDATA: $(nodist_polkitpolicy_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(polkitpolicydir)" || $(MKDIR_P) "$(DESTDIR)$(polkitpolicydir)"
-       @list='$(nodist_polkitpolicy_DATA)'; test -n "$(polkitpolicydir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(polkitpolicydir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(polkitpolicydir)" || exit $$?; \
-       done
-
-uninstall-nodist_polkitpolicyDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(nodist_polkitpolicy_DATA)'; test -n "$(polkitpolicydir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(polkitpolicydir)'; $(am__uninstall_files_from_dir)
-install-nodist_systemunitDATA: $(nodist_systemunit_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(systemunitdir)" || $(MKDIR_P) "$(DESTDIR)$(systemunitdir)"
-       @list='$(nodist_systemunit_DATA)'; test -n "$(systemunitdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemunitdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(systemunitdir)" || exit $$?; \
-       done
-
-uninstall-nodist_systemunitDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(nodist_systemunit_DATA)'; test -n "$(systemunitdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(systemunitdir)'; $(am__uninstall_files_from_dir)
-install-nodist_udevrulesDATA: $(nodist_udevrules_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(udevrulesdir)" || $(MKDIR_P) "$(DESTDIR)$(udevrulesdir)"
-       @list='$(nodist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(udevrulesdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(udevrulesdir)" || exit $$?; \
-       done
-
-uninstall-nodist_udevrulesDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(nodist_udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir)
-install-nodist_userunitDATA: $(nodist_userunit_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(userunitdir)" || $(MKDIR_P) "$(DESTDIR)$(userunitdir)"
-       @list='$(nodist_userunit_DATA)'; test -n "$(userunitdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(userunitdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(userunitdir)" || exit $$?; \
-       done
-
-uninstall-nodist_userunitDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(nodist_userunit_DATA)'; test -n "$(userunitdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(userunitdir)'; $(am__uninstall_files_from_dir)
-install-pkgconfigdataDATA: $(pkgconfigdata_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgconfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdatadir)"
-       @list='$(pkgconfigdata_DATA)'; test -n "$(pkgconfigdatadir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdatadir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdatadir)" || exit $$?; \
-       done
-
-uninstall-pkgconfigdataDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkgconfigdata_DATA)'; test -n "$(pkgconfigdatadir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(pkgconfigdatadir)'; $(am__uninstall_files_from_dir)
-install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgconfiglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfiglibdir)"
-       @list='$(pkgconfiglib_DATA)'; test -n "$(pkgconfiglibdir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfiglibdir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfiglibdir)" || exit $$?; \
-       done
-
-uninstall-pkgconfiglibDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkgconfiglib_DATA)'; test -n "$(pkgconfiglibdir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(pkgconfiglibdir)'; $(am__uninstall_files_from_dir)
-install-sysctlDATA: $(sysctl_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(sysctldir)" || $(MKDIR_P) "$(DESTDIR)$(sysctldir)"
-       @list='$(sysctl_DATA)'; test -n "$(sysctldir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysctldir)'"; \
-         $(INSTALL_DATA) $$files "$(DESTDIR)$(sysctldir)" || exit $$?; \
-       done
-
-uninstall-sysctlDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(sysctl_DATA)'; test -n "$(sysctldir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(sysctldir)'; $(am__uninstall_files_from_dir)
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-       @$(NORMAL_INSTALL)
-       test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
-       @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-       for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         echo "$$d$$p"; \
-       done | $(am__base_list) | \
-       while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-       done
-
-uninstall-pkgincludeHEADERS:
-       @$(NORMAL_UNINSTALL)
-       @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-       dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       target=`echo $@ | sed s/-recursive//`; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           dot_seen=yes; \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done; \
-       if test "$$dot_seen" = "no"; then \
-         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-       fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-       @fail= failcom='exit 1'; \
-       for f in x $$MAKEFLAGS; do \
-         case $$f in \
-           *=* | --[!k]*);; \
-           *k*) failcom='fail=yes';; \
-         esac; \
-       done; \
-       dot_seen=no; \
-       case "$@" in \
-         distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-         *) list='$(SUBDIRS)' ;; \
-       esac; \
-       rev=''; for subdir in $$list; do \
-         if test "$$subdir" = "."; then :; else \
-           rev="$$subdir $$rev"; \
-         fi; \
-       done; \
-       rev="$$rev ."; \
-       target=`echo $@ | sed s/-recursive//`; \
-       for subdir in $$rev; do \
-         echo "Making $$target in $$subdir"; \
-         if test "$$subdir" = "."; then \
-           local_target="$$target-am"; \
-         else \
-           local_target="$$target"; \
-         fi; \
-         ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-         || eval $$failcom; \
-       done && test -z "$$fail"
-tags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-       done
-ctags-recursive:
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-       done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-         include_option=--etags-include; \
-         empty_fix=.; \
-       else \
-         include_option=--include; \
-         empty_fix=; \
-       fi; \
-       list='$(SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test ! -f $$subdir/TAGS || \
-             set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-         fi; \
-       done; \
-       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @case `sed 15q $(srcdir)/NEWS` in \
-       *"$(VERSION)"*) : ;; \
-       *) \
-         echo "NEWS not updated; not releasing" 1>&2; \
-         exit 1;; \
-       esac
-       @list='$(MANS)'; if test -n "$$list"; then \
-         list=`for p in $$list; do \
-           if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-           if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-         if test -n "$$list" && \
-           grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-           echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-           grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-           echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-           echo "       typically \`make maintainer-clean' will remove them" >&2; \
-           exit 1; \
-         else :; fi; \
-       else :; fi
-       $(am__remove_distdir)
-       test -d "$(distdir)" || mkdir "$(distdir)"
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           test -d "$(distdir)/$$subdir" \
-           || $(MKDIR_P) "$(distdir)/$$subdir" \
-           || exit 1; \
-         fi; \
-       done
-       @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-         if test "$$subdir" = .; then :; else \
-           dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-           $(am__relativize); \
-           new_distdir=$$reldir; \
-           dir1=$$subdir; dir2="$(top_distdir)"; \
-           $(am__relativize); \
-           new_top_distdir=$$reldir; \
-           echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-           echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-           ($(am__cd) $$subdir && \
-             $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$$new_top_distdir" \
-               distdir="$$new_distdir" \
-               am__remove_distdir=: \
-               am__skip_length_check=: \
-               am__skip_mode_fix=: \
-               distdir) \
-             || exit 1; \
-         fi; \
-       done
-       -test -n "$(am__skip_mode_fix)" \
-       || find "$(distdir)" -type d ! -perm -755 \
-               -exec chmod u+rwx,go+rx {} \; -o \
-         ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-         ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-       || chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-       $(am__remove_distdir)
-
-dist-bzip2: distdir
-       tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-       $(am__remove_distdir)
-
-dist-lzip: distdir
-       tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-       $(am__remove_distdir)
-
-dist-lzma: distdir
-       tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-       $(am__remove_distdir)
-dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-       $(am__remove_distdir)
-
-dist-tarZ: distdir
-       tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-       $(am__remove_distdir)
-
-dist-shar: distdir
-       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-       $(am__remove_distdir)
-
-dist-zip: distdir
-       -rm -f $(distdir).zip
-       zip -rq $(distdir).zip $(distdir)
-       $(am__remove_distdir)
-
-dist dist-all: distdir
-       tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-       $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-       case '$(DIST_ARCHIVES)' in \
-       *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-       *.tar.bz2*) \
-         bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-       *.tar.lzma*) \
-         lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-       *.tar.lz*) \
-         lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-       *.tar.xz*) \
-         xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-       *.tar.Z*) \
-         uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-       *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-       *.zip*) \
-         unzip $(distdir).zip ;;\
-       esac
-       chmod -R a-w $(distdir); chmod a+w $(distdir)
-       mkdir $(distdir)/_build
-       mkdir $(distdir)/_inst
-       chmod a-w $(distdir)
-       test -d $(distdir)/_build || exit 0; \
-       dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-         && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-         && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build \
-         && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-           $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-           $(DISTCHECK_CONFIGURE_FLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) \
-         && $(MAKE) $(AM_MAKEFLAGS) dvi \
-         && $(MAKE) $(AM_MAKEFLAGS) check \
-         && $(MAKE) $(AM_MAKEFLAGS) install \
-         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-         && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-         && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-               distuninstallcheck \
-         && chmod -R a-w "$$dc_install_base" \
-         && ({ \
-              (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-              && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-                   distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-             } || { rm -rf "$$dc_destdir"; exit 1; }) \
-         && rm -rf "$$dc_destdir" \
-         && $(MAKE) $(AM_MAKEFLAGS) dist \
-         && rm -rf $(DIST_ARCHIVES) \
-         && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-         && cd "$$am__cwd" \
-         || exit 1
-       $(am__remove_distdir)
-       @(echo "$(distdir) archives ready for distribution: "; \
-         list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-         sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-       @test -n '$(distuninstallcheck_dir)' || { \
-         echo 'ERROR: trying to run $@ with an empty' \
-              '$$(distuninstallcheck_dir)' >&2; \
-         exit 1; \
-       }; \
-       $(am__cd) '$(distuninstallcheck_dir)' || { \
-         echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-         exit 1; \
-       }; \
-       test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-          || { echo "ERROR: files left after uninstall:" ; \
-               if test -n "$(DESTDIR)"; then \
-                 echo "  (check DESTDIR support)"; \
-               fi ; \
-               $(distuninstallcheck_listfiles) ; \
-               exit 1; } >&2
-distcleancheck: distclean
-       @if test '$(srcdir)' = . ; then \
-         echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-         exit 1 ; \
-       fi
-       @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-         || { echo "ERROR: files left in build directory after distclean:" ; \
-              $(distcleancheck_listfiles) ; \
-              exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
-               $(HEADERS) config.h
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs: installdirs-recursive
-installdirs-am:
-       for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pamlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rootbindir)" "$(DESTDIR)$(rootlibexecdir)" "$(DESTDIR)$(systemgeneratordir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusinterfacedir)" "$(DESTDIR)$(bashcompletiondir)" "$(DESTDIR)$(dbuspolicydir)" "$(DESTDIR)$(dbussystemservicedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgsysconfdir)" "$(DESTDIR)$(systemunitdir)" "$(DESTDIR)$(tmpfilesdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(userunitdir)" "$(DESTDIR)$(polkitpolicydir)" "$(DESTDIR)$(systemunitdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(userunitdir)" "$(DESTDIR)$(pkgconfigdatadir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(sysctldir)" "$(DESTDIR)$(pkgincludedir)"; do \
-         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-       done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
-mostlyclean-generic:
-
-clean-generic:
-       -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-       -rm -f src/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/$(am__dirstamp)
-       -rm -f src/binfmt/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/binfmt/$(am__dirstamp)
-       -rm -f src/cryptsetup/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/cryptsetup/$(am__dirstamp)
-       -rm -f src/hostname/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/hostname/$(am__dirstamp)
-       -rm -f src/journal/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/journal/$(am__dirstamp)
-       -rm -f src/locale/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/locale/$(am__dirstamp)
-       -rm -f src/login/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/login/$(am__dirstamp)
-       -rm -f src/readahead/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/readahead/$(am__dirstamp)
-       -rm -f src/timedate/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/timedate/$(am__dirstamp)
-       -rm -f src/vconsole/$(DEPDIR)/$(am__dirstamp)
-       -rm -f src/vconsole/$(am__dirstamp)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-       -rm -f libsystemd_basic_la_vala.stamp
-       -rm -f libsystemd_core_la_vala.stamp
-       -rm -f libsystemd_daemon_la_vala.stamp
-       -rm -f libsystemd_id128_la_vala.stamp
-       -rm -f libsystemd_journal_la_vala.stamp
-       -rm -f libsystemd_login_la_vala.stamp
-       -rm -f pam_systemd_la_vala.stamp
-       -rm -f src/gnome-ask-password-agent.c
-       -rm -f src/systemadm.c
-       -rm -f src/systemd-interfaces.c
-       -rm -f src/wraplabel.c
-       -rm -f systemadm_vala.stamp
-       -rm -f systemctl_vala.stamp
-       -rm -f systemd_ac_power_vala.stamp
-       -rm -f systemd_ask_password_vala.stamp
-       -rm -f systemd_binfmt_vala.stamp
-       -rm -f systemd_cat_vala.stamp
-       -rm -f systemd_cgls_vala.stamp
-       -rm -f systemd_cgroups_agent_vala.stamp
-       -rm -f systemd_cgtop_vala.stamp
-       -rm -f systemd_coredump_vala.stamp
-       -rm -f systemd_cryptsetup_generator_vala.stamp
-       -rm -f systemd_cryptsetup_vala.stamp
-       -rm -f systemd_detect_virt_vala.stamp
-       -rm -f systemd_fsck_vala.stamp
-       -rm -f systemd_getty_generator_vala.stamp
-       -rm -f systemd_gnome_ask_password_agent_vala.stamp
-       -rm -f systemd_hostnamed_vala.stamp
-       -rm -f systemd_initctl_vala.stamp
-       -rm -f systemd_journalctl_vala.stamp
-       -rm -f systemd_journald_vala.stamp
-       -rm -f systemd_localed_vala.stamp
-       -rm -f systemd_loginctl_vala.stamp
-       -rm -f systemd_logind_vala.stamp
-       -rm -f systemd_machine_id_setup_vala.stamp
-       -rm -f systemd_modules_load_vala.stamp
-       -rm -f systemd_multi_seat_x_vala.stamp
-       -rm -f systemd_notify_vala.stamp
-       -rm -f systemd_nspawn_vala.stamp
-       -rm -f systemd_quotacheck_vala.stamp
-       -rm -f systemd_random_seed_vala.stamp
-       -rm -f systemd_rc_local_generator_vala.stamp
-       -rm -f systemd_readahead_collect_vala.stamp
-       -rm -f systemd_readahead_replay_vala.stamp
-       -rm -f systemd_remount_api_vfs_vala.stamp
-       -rm -f systemd_reply_password_vala.stamp
-       -rm -f systemd_shutdown_vala.stamp
-       -rm -f systemd_shutdownd_vala.stamp
-       -rm -f systemd_stdio_bridge_vala.stamp
-       -rm -f systemd_sysctl_vala.stamp
-       -rm -f systemd_timedated_vala.stamp
-       -rm -f systemd_timestamp_vala.stamp
-       -rm -f systemd_tmpfiles_vala.stamp
-       -rm -f systemd_tty_ask_password_agent_vala.stamp
-       -rm -f systemd_uaccess_vala.stamp
-       -rm -f systemd_update_utmp_vala.stamp
-       -rm -f systemd_user_sessions_vala.stamp
-       -rm -f systemd_vala.stamp
-       -rm -f systemd_vconsole_setup_vala.stamp
-       -rm -f test_cgroup_vala.stamp
-       -rm -f test_daemon_vala.stamp
-       -rm -f test_engine_vala.stamp
-       -rm -f test_env_replace_vala.stamp
-       -rm -f test_hostname_vala.stamp
-       -rm -f test_id128_vala.stamp
-       -rm -f test_install_vala.stamp
-       -rm -f test_job_type_vala.stamp
-       -rm -f test_journal_vala.stamp
-       -rm -f test_login_vala.stamp
-       -rm -f test_loopback_vala.stamp
-       -rm -f test_ns_vala.stamp
-       -rm -f test_strv_vala.stamp
-clean: clean-recursive
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
-       clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-       clean-pamlibLTLIBRARIES clean-rootbinPROGRAMS \
-       clean-rootlibexecPROGRAMS clean-systemgeneratorPROGRAMS \
-       mostlyclean-am
-
-distclean: distclean-recursive
-       -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf src/$(DEPDIR) src/binfmt/$(DEPDIR) src/cryptsetup/$(DEPDIR) src/hostname/$(DEPDIR) src/journal/$(DEPDIR) src/locale/$(DEPDIR) src/login/$(DEPDIR) src/readahead/$(DEPDIR) src/timedate/$(DEPDIR) src/vconsole/$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-dbusinterfaceDATA \
-       install-dist_bashcompletionDATA install-dist_dbuspolicyDATA \
-       install-dist_dbussystemserviceDATA install-dist_docDATA \
-       install-dist_pkgdataDATA install-dist_pkgsysconfDATA \
-       install-dist_systemunitDATA install-dist_tmpfilesDATA \
-       install-dist_udevrulesDATA install-dist_userunitDATA \
-       install-man install-nodist_polkitpolicyDATA \
-       install-nodist_systemunitDATA install-nodist_udevrulesDATA \
-       install-nodist_userunitDATA install-pamlibLTLIBRARIES \
-       install-pkgconfigdataDATA install-pkgconfiglibDATA \
-       install-pkgincludeHEADERS install-rootbinPROGRAMS \
-       install-sysctlDATA install-systemgeneratorPROGRAMS
-       @$(NORMAL_INSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \
-       install-libLTLIBRARIES install-rootlibexecPROGRAMS
-       @$(NORMAL_INSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man: install-man1 install-man3 install-man5 install-man7 \
-       install-man8
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-       -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf src/$(DEPDIR) src/binfmt/$(DEPDIR) src/cryptsetup/$(DEPDIR) src/hostname/$(DEPDIR) src/journal/$(DEPDIR) src/locale/$(DEPDIR) src/login/$(DEPDIR) src/readahead/$(DEPDIR) src/timedate/$(DEPDIR) src/vconsole/$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-dbusinterfaceDATA \
-       uninstall-dist_bashcompletionDATA uninstall-dist_binSCRIPTS \
-       uninstall-dist_dbuspolicyDATA \
-       uninstall-dist_dbussystemserviceDATA uninstall-dist_docDATA \
-       uninstall-dist_pkgdataDATA uninstall-dist_pkgsysconfDATA \
-       uninstall-dist_systemunitDATA uninstall-dist_tmpfilesDATA \
-       uninstall-dist_udevrulesDATA uninstall-dist_userunitDATA \
-       uninstall-libLTLIBRARIES uninstall-man \
-       uninstall-nodist_polkitpolicyDATA \
-       uninstall-nodist_systemunitDATA uninstall-nodist_udevrulesDATA \
-       uninstall-nodist_userunitDATA uninstall-pamlibLTLIBRARIES \
-       uninstall-pkgconfigdataDATA uninstall-pkgconfiglibDATA \
-       uninstall-pkgincludeHEADERS uninstall-rootbinPROGRAMS \
-       uninstall-rootlibexecPROGRAMS uninstall-sysctlDATA \
-       uninstall-systemgeneratorPROGRAMS
-       @$(NORMAL_INSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \
-       uninstall-man7 uninstall-man8
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-       ctags-recursive install-am install-data-am install-exec-am \
-       install-strip tags-recursive uninstall-am
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-       all all-am am--refresh check check-am clean clean-binPROGRAMS \
-       clean-generic clean-libLTLIBRARIES clean-libtool \
-       clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-       clean-pamlibLTLIBRARIES clean-rootbinPROGRAMS \
-       clean-rootlibexecPROGRAMS clean-systemgeneratorPROGRAMS ctags \
-       ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-lzip \
-       dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-       distclean distclean-compile distclean-generic distclean-hdr \
-       distclean-libtool distclean-tags distcleancheck distdir \
-       distuninstallcheck dvi dvi-am html html-am info info-am \
-       install install-am install-binPROGRAMS install-data \
-       install-data-am install-data-hook install-dbusinterfaceDATA \
-       install-dist_bashcompletionDATA install-dist_binSCRIPTS \
-       install-dist_dbuspolicyDATA install-dist_dbussystemserviceDATA \
-       install-dist_docDATA install-dist_pkgdataDATA \
-       install-dist_pkgsysconfDATA install-dist_systemunitDATA \
-       install-dist_tmpfilesDATA install-dist_udevrulesDATA \
-       install-dist_userunitDATA install-dvi install-dvi-am \
-       install-exec install-exec-am install-exec-hook install-html \
-       install-html-am install-info install-info-am \
-       install-libLTLIBRARIES install-man install-man1 install-man3 \
-       install-man5 install-man7 install-man8 \
-       install-nodist_polkitpolicyDATA install-nodist_systemunitDATA \
-       install-nodist_udevrulesDATA install-nodist_userunitDATA \
-       install-pamlibLTLIBRARIES install-pdf install-pdf-am \
-       install-pkgconfigdataDATA install-pkgconfiglibDATA \
-       install-pkgincludeHEADERS install-ps install-ps-am \
-       install-rootbinPROGRAMS install-rootlibexecPROGRAMS \
-       install-strip install-sysctlDATA \
-       install-systemgeneratorPROGRAMS installcheck installcheck-am \
-       installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-       tags tags-recursive uninstall uninstall-am \
-       uninstall-binPROGRAMS uninstall-dbusinterfaceDATA \
-       uninstall-dist_bashcompletionDATA uninstall-dist_binSCRIPTS \
-       uninstall-dist_dbuspolicyDATA \
-       uninstall-dist_dbussystemserviceDATA uninstall-dist_docDATA \
-       uninstall-dist_pkgdataDATA uninstall-dist_pkgsysconfDATA \
-       uninstall-dist_systemunitDATA uninstall-dist_tmpfilesDATA \
-       uninstall-dist_udevrulesDATA uninstall-dist_userunitDATA \
-       uninstall-hook uninstall-libLTLIBRARIES uninstall-man \
-       uninstall-man1 uninstall-man3 uninstall-man5 uninstall-man7 \
-       uninstall-man8 uninstall-nodist_polkitpolicyDATA \
-       uninstall-nodist_systemunitDATA uninstall-nodist_udevrulesDATA \
-       uninstall-nodist_userunitDATA uninstall-pamlibLTLIBRARIES \
-       uninstall-pkgconfigdataDATA uninstall-pkgconfiglibDATA \
-       uninstall-pkgincludeHEADERS uninstall-rootbinPROGRAMS \
-       uninstall-rootlibexecPROGRAMS uninstall-sysctlDATA \
-       uninstall-systemgeneratorPROGRAMS
-
-
-@INTLTOOL_POLICY_RULE@
-
-man/reboot.8: man/halt.8
-man/poweroff.8: man/halt.8
-man/init.1: man/systemd.1
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-libsystemd-daemon-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_is_mq.3: man/sd_is_fifo.3
-man/sd_notifyf.3: man/sd_notify.3
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-id128-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-libsystemd-id128-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-journal-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               mkdir -p $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-libsystemd-journal-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-
-journal-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir)/sockets.target.wants \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-journald.socket && \
-               $(LN_S) ../systemd-journald.socket )
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f systemd-journald.service && \
-               $(LN_S) ../systemd-journald.service )
-
-@ENABLE_BINFMT_TRUE@binfmt-install-data-hook:
-@ENABLE_BINFMT_TRUE@   $(MKDIR_P) -m 0755 \
-@ENABLE_BINFMT_TRUE@           $(DESTDIR)$(prefix)/lib/binfmt.d \
-@ENABLE_BINFMT_TRUE@           $(DESTDIR)$(sysconfdir)/binfmt.d \
-@ENABLE_BINFMT_TRUE@           $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-@ENABLE_BINFMT_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-@ENABLE_BINFMT_TRUE@           rm -f systemd-binfmt.service \
-@ENABLE_BINFMT_TRUE@                   proc-sys-fs-binfmt_misc.automount && \
-@ENABLE_BINFMT_TRUE@           $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
-@ENABLE_BINFMT_TRUE@           $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
-
-@ENABLE_VCONSOLE_TRUE@vconsole-install-data-hook:
-@ENABLE_VCONSOLE_TRUE@ $(MKDIR_P) -m 0755 \
-@ENABLE_VCONSOLE_TRUE@         $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-@ENABLE_VCONSOLE_TRUE@ ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-@ENABLE_VCONSOLE_TRUE@         rm -f systemd-vconsole-setup.service && \
-@ENABLE_VCONSOLE_TRUE@         $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
-
-@ENABLE_RANDOMSEED_TRUE@randomseed-install-data-hook:
-@ENABLE_RANDOMSEED_TRUE@       $(MKDIR_P) -m 0755 \
-@ENABLE_RANDOMSEED_TRUE@               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
-@ENABLE_RANDOMSEED_TRUE@               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-@ENABLE_RANDOMSEED_TRUE@       ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-@ENABLE_RANDOMSEED_TRUE@               rm -f systemd-random-seed-save.service && \
-@ENABLE_RANDOMSEED_TRUE@               $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
-@ENABLE_RANDOMSEED_TRUE@       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-@ENABLE_RANDOMSEED_TRUE@               rm -f systemd-random-seed-load.service && \
-@ENABLE_RANDOMSEED_TRUE@               $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service )
-
-@HAVE_LIBCRYPTSETUP_TRUE@cryptsetup-install-data-hook:
-@HAVE_LIBCRYPTSETUP_TRUE@      $(MKDIR_P) -m 0755 \
-@HAVE_LIBCRYPTSETUP_TRUE@              $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-@HAVE_LIBCRYPTSETUP_TRUE@      ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-@HAVE_LIBCRYPTSETUP_TRUE@              rm -f cryptsetup.target && \
-@HAVE_LIBCRYPTSETUP_TRUE@              $(LN_S) ../cryptsetup.target cryptsetup.target )
-
-@ENABLE_HOSTNAMED_TRUE@org.freedesktop.hostname1.xml: systemd-hostnamed
-@ENABLE_HOSTNAMED_TRUE@        $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-@ENABLE_HOSTNAMED_TRUE@                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-@ENABLE_HOSTNAMED_TRUE@                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-@ENABLE_HOSTNAMED_TRUE@hostnamed-install-data-hook:
-@ENABLE_HOSTNAMED_TRUE@        ( cd $(DESTDIR)$(systemunitdir) && \
-@ENABLE_HOSTNAMED_TRUE@                rm -f dbus-org.freedesktop.hostname1.service && \
-@ENABLE_HOSTNAMED_TRUE@                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
-
-@ENABLE_LOCALED_TRUE@org.freedesktop.locale1.xml: systemd-localed
-@ENABLE_LOCALED_TRUE@  $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-@ENABLE_LOCALED_TRUE@          $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-@ENABLE_LOCALED_TRUE@          $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-@ENABLE_LOCALED_TRUE@localed-install-data-hook:
-@ENABLE_LOCALED_TRUE@  ( cd $(DESTDIR)$(systemunitdir) && \
-@ENABLE_LOCALED_TRUE@          rm -f dbus-org.freedesktop.locale1.service && \
-@ENABLE_LOCALED_TRUE@          $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
-
-@ENABLE_LOCALED_TRUE@update-kbd-model-map:
-@ENABLE_LOCALED_TRUE@  src/locale/generate-kbd-model-map > src/locale/kbd-model-map
-
-@ENABLE_TIMEDATED_TRUE@org.freedesktop.timedate1.xml: systemd-timedated
-@ENABLE_TIMEDATED_TRUE@        $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-@ENABLE_TIMEDATED_TRUE@                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-@ENABLE_TIMEDATED_TRUE@                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-@ENABLE_TIMEDATED_TRUE@timedated-install-data-hook:
-@ENABLE_TIMEDATED_TRUE@        ( cd $(DESTDIR)$(systemunitdir) && \
-@ENABLE_TIMEDATED_TRUE@                rm -f dbus-org.freedesktop.timedate1.service  && \
-@ENABLE_TIMEDATED_TRUE@                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-@ENABLE_LOGIND_TRUE@libsystemd-login-install-hook:
-@ENABLE_LOGIND_TRUE@   if test "$(libdir)" != "$(rootlibdir)"; then \
-@ENABLE_LOGIND_TRUE@           mkdir -p $(DESTDIR)$(rootlibdir) && \
-@ENABLE_LOGIND_TRUE@           so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
-@ENABLE_LOGIND_TRUE@           so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-@ENABLE_LOGIND_TRUE@           ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
-@ENABLE_LOGIND_TRUE@           mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
-@ENABLE_LOGIND_TRUE@   fi
-
-@ENABLE_LOGIND_TRUE@libsystemd-login-uninstall-hook:
-@ENABLE_LOGIND_TRUE@   rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
-
-@ENABLE_LOGIND_TRUE@logind-install-data-hook:
-@ENABLE_LOGIND_TRUE@   $(MKDIR_P) -m 0755 \
-@ENABLE_LOGIND_TRUE@           $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-@ENABLE_LOGIND_TRUE@                $(DESTDIR)$(localstatedir)/lib/systemd
-@ENABLE_LOGIND_TRUE@   ( cd $(DESTDIR)$(systemunitdir) && \
-@ENABLE_LOGIND_TRUE@           rm -f dbus-org.freedesktop.login1.service && \
-@ENABLE_LOGIND_TRUE@           $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
-@ENABLE_LOGIND_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-@ENABLE_LOGIND_TRUE@           rm -f systemd-logind.service systemd-user-sessions.service && \
-@ENABLE_LOGIND_TRUE@           $(LN_S) ../systemd-logind.service systemd-logind.service && \
-@ENABLE_LOGIND_TRUE@           $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
-
-@ENABLE_LOGIND_TRUE@man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
-@ENABLE_LOGIND_TRUE@man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
-@ENABLE_LOGIND_TRUE@man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
-@ENABLE_LOGIND_TRUE@man/sd_session_get_uid.3: man/sd_session_is_active.3
-@ENABLE_LOGIND_TRUE@man/sd_session_get_seat.3: man/sd_session_is_active.3
-@ENABLE_LOGIND_TRUE@man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
-@ENABLE_LOGIND_TRUE@man/sd_pid_get_unit.3: man/sd_pid_get_session.3
-@ENABLE_LOGIND_TRUE@man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-@ENABLE_LOGIND_TRUE@man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
-@ENABLE_LOGIND_TRUE@man/sd_uid_get_seats.3: man/sd_uid_get_state.3
-@ENABLE_LOGIND_TRUE@man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
-@ENABLE_LOGIND_TRUE@man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
-@ENABLE_LOGIND_TRUE@man/sd_get_sessions.3: man/sd_get_seats.3
-@ENABLE_LOGIND_TRUE@man/sd_get_uids.3: man/sd_get_seats.3
-
-units/%: units/%.in Makefile
-       $(SED_PROCESS)
-
-man/%: man/%.in Makefile
-       $(SED_PROCESS)
-
-sysctl.d/%: sysctl.d/%.in Makefile
-       $(SED_PROCESS)
-
-%.pc: %.pc.in Makefile
-       $(SED_PROCESS)
-
-src/%.policy.in: src/%.policy.in.in Makefile
-       $(SED_PROCESS)
-
-src/%.rules: src/%.rules.in Makefile
-       $(SED_PROCESS)
-
-src/%.c: src/%.gperf
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(GPERF) < $< > $@
-
-src/%: src/%.m4
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
-
-src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
-
-units/%: units/%.m4 Makefile
-       $(M4_PROCESS_SYSTEM)
-
-units/user/%: units/%.m4 Makefile
-       $(M4_PROCESS_USER)
-
-@HAVE_XSLTPROC_TRUE@man/%.1: man/%.xml
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.1.in: man/%.xml.in
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.3: man/%.xml
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.3.in: man/%.xml.in
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.5: man/%.xml
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.5.in: man/%.xml.in
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.7: man/%.xml
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.7.in: man/%.xml.in
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN_IN)
-
-@HAVE_XSLTPROC_TRUE@man/%.8: man/%.xml
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN)
-
-@HAVE_XSLTPROC_TRUE@man/%.8.in: man/%.xml.in
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_MAN_IN)
-
-@HAVE_XSLTPROC_TRUE@man/%.html: man/%.xml
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_HTML)
-
-@HAVE_XSLTPROC_TRUE@man/%.html.in: man/%.xml.in
-@HAVE_XSLTPROC_TRUE@   $(XSLTPROC_PROCESS_HTML_IN)
-
-org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-systemd-install-data-hook:
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(tmpfilesdir) \
-               $(DESTDIR)$(sysconfdir)/tmpfiles.d \
-               $(DESTDIR)$(prefix)/lib/modules-load.d \
-               $(DESTDIR)$(sysconfdir)/modules-load.d \
-               $(DESTDIR)$(prefix)/lib/sysctl.d \
-               $(DESTDIR)$(sysconfdir)/sysctl.d \
-               $(DESTDIR)$(systemshutdowndir) \
-               $(DESTDIR)$(systemgeneratordir) \
-               $(DESTDIR)$(usergeneratordir)
-       $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(systemunitdir) \
-               $(DESTDIR)$(userunitdir) \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
-               $(DESTDIR)$(systemunitdir)/sockets.target.wants \
-               $(DESTDIR)$(systemunitdir)/basic.target.wants \
-               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
-               $(DESTDIR)$(systemunitdir)/local-fs.target.wants \
-               $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
-               $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
-               $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
-               $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
-               $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
-               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
-               $(DESTDIR)$(systemunitdir)/graphical.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system \
-               $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
-               $(DESTDIR)$(pkgsysconfdir)/user \
-               $(DESTDIR)$(dbussessionservicedir) \
-               $(DESTDIR)$(sysconfdir)/xdg/systemd
-       ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
-               rm -f user && \
-               $(LN_S) $(pkgsysconfdir)/user user )
-       ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-shutdownd.socket && \
-               $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
-       ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
-               rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
-       ( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
-               rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
-       ( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
-               rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
-       ( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
-               rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
-       ( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
-               rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
-       ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
-               rm -f systemd-update-utmp-shutdown.service && \
-               $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
-       ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-               rm -f systemd-remount-api-vfs.service \
-                       fsck-root.service \
-                       remount-rootfs.service \
-                       var-run.mount \
-                       media.mount && \
-               $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
-               $(LN_S) ../fsck-root.service fsck-root.service && \
-               $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
-               $(LN_S) ../var-run.mount var-run.mount && \
-               $(LN_S) ../media.mount media.mount )
-       ( cd $(DESTDIR)$(userunitdir) && \
-               rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
-               $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
-               $(LN_S) $(systemunitdir)/sockets.target sockets.target && \
-               $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
-               $(LN_S) $(systemunitdir)/printer.target printer.target && \
-               $(LN_S) $(systemunitdir)/sound.target sound.target )
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
-               $(LN_S) poweroff.target runlevel0.target && \
-               $(LN_S) rescue.target runlevel1.target && \
-               $(LN_S) multi-user.target runlevel2.target && \
-               $(LN_S) multi-user.target runlevel3.target && \
-               $(LN_S) multi-user.target runlevel4.target && \
-               $(LN_S) graphical.target runlevel5.target && \
-               $(LN_S) reboot.target runlevel6.target )
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target autovt@.service && \
-               $(LN_S) graphical.target default.target && \
-               $(LN_S) reboot.target ctrl-alt-del.target && \
-               $(LN_S) getty@.service autovt@.service )
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target systemd-ask-password-wall.path && \
-               $(LN_S) ../getty.target getty.target && \
-               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f getty@tty1.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f remote-fs.target && \
-               $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f dev-hugepages.mount \
-                       dev-mqueue.mount \
-                       sys-kernel-config.mount \
-                       sys-kernel-debug.mount \
-                       sys-kernel-security.mount \
-                       sys-fs-fuse-connections.mount \
-                       systemd-modules-load.service \
-                       systemd-tmpfiles-setup.service \
-                       systemd-sysctl.service \
-                       systemd-ask-password-console.path && \
-               $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
-               $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
-               $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
-               $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
-               $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
-               $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
-               $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
-               $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
-               $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-               $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
-       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
-               rm -f systemd-tmpfiles-clean.timer && \
-               $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
-       ( cd $(DESTDIR)$(dbussessionservicedir) && \
-               rm -f org.freedesktop.systemd1.service && \
-               $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-@HAVE_PLYMOUTH_TRUE@   $(MKDIR_P) -m 0755 \
-@HAVE_PLYMOUTH_TRUE@           $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
-@HAVE_PLYMOUTH_TRUE@           $(DESTDIR)$(systemunitdir)/reboot.target.wants \
-@HAVE_PLYMOUTH_TRUE@           $(DESTDIR)$(systemunitdir)/kexec.target.wants \
-@HAVE_PLYMOUTH_TRUE@           $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-@HAVE_PLYMOUTH_TRUE@           $(DESTDIR)$(systemunitdir)/halt.target.wants
-@HAVE_PLYMOUTH_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-@HAVE_PLYMOUTH_TRUE@           rm -f plymouth-start.service plymouth-read-write.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-start.service plymouth-start.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
-@HAVE_PLYMOUTH_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-@HAVE_PLYMOUTH_TRUE@           rm -f plymouth-quit.service plymouth-quit-wait.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
-@HAVE_PLYMOUTH_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
-@HAVE_PLYMOUTH_TRUE@           rm -f plymouth-reboot.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
-@HAVE_PLYMOUTH_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
-@HAVE_PLYMOUTH_TRUE@           rm -f plymouth-kexec.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
-@HAVE_PLYMOUTH_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
-@HAVE_PLYMOUTH_TRUE@           rm -f plymouth-poweroff.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
-@HAVE_PLYMOUTH_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
-@HAVE_PLYMOUTH_TRUE@           rm -f plymouth-halt.service && \
-@HAVE_PLYMOUTH_TRUE@           $(LN_S) ../plymouth-halt.service plymouth-halt.service )
-@TARGET_MEEGO_TRUE@    $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-@TARGET_MEEGO_TRUE@    ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-@TARGET_MEEGO_TRUE@            rm -f network.target && \
-@TARGET_MEEGO_TRUE@            $(LN_S) $(systemunitdir)/network.target network.target )
-@TARGET_MEEGO_TRUE@    ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
-@TARGET_MEEGO_TRUE@            rm -f * )
-@TARGET_MEEGO_TRUE@    ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-@TARGET_MEEGO_TRUE@            rm -f * )
-@TARGET_MEEGO_TRUE@    ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-@TARGET_MEEGO_TRUE@            rm -f * )
-@TARGET_MEEGO_TRUE@    ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-@TARGET_MEEGO_TRUE@            rm -f * )
-
-@TARGET_FEDORA_TRUE@   $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-@TARGET_FEDORA_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-@TARGET_FEDORA_TRUE@           rm -f halt-local.service && \
-@TARGET_FEDORA_TRUE@           $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-@TARGET_FEDORA_TRUE@   ( cd $(DESTDIR)$(systemunitdir) && \
-@TARGET_FEDORA_TRUE@           rm -f display-manager.service single.service && \
-@TARGET_FEDORA_TRUE@           $(LN_S) prefdm.service display-manager.service && \
-@TARGET_FEDORA_TRUE@           $(LN_S) rescue.service single.service )
-@TARGET_FEDORA_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-@TARGET_FEDORA_TRUE@           rm -f display-manager.service && \
-@TARGET_FEDORA_TRUE@           $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-
-@TARGET_MANDRIVA_TRUE@ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-@TARGET_MANDRIVA_TRUE@ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-@TARGET_MANDRIVA_TRUE@         rm -f halt-local.service && \
-@TARGET_MANDRIVA_TRUE@         $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-@TARGET_MANDRIVA_TRUE@ ( cd $(DESTDIR)$(systemunitdir) && \
-@TARGET_MANDRIVA_TRUE@         rm -f display-manager.service dm.service single.service && \
-@TARGET_MANDRIVA_TRUE@         $(LN_S) prefdm.service display-manager.service && \
-@TARGET_MANDRIVA_TRUE@         $(LN_S) prefdm.service dm.service && \
-@TARGET_MANDRIVA_TRUE@         $(LN_S) rescue.service single.service )
-@TARGET_MANDRIVA_TRUE@ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-@TARGET_MANDRIVA_TRUE@         rm -f display-manager.service && \
-@TARGET_MANDRIVA_TRUE@         $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-
-@TARGET_DEBIAN_OR_UBUNTU_TRUE@ ( cd $(DESTDIR)$(systemunitdir) && \
-@TARGET_DEBIAN_OR_UBUNTU_TRUE@         rm -f runlevel5.target && \
-@TARGET_DEBIAN_OR_UBUNTU_TRUE@         $(LN_S) multi-user.target runlevel5.target )
-
-@TARGET_SUSE_TRUE@     $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-@TARGET_SUSE_TRUE@     ( cd $(DESTDIR)$(systemunitdir) && \
-@TARGET_SUSE_TRUE@             rm -f local.service && \
-@TARGET_SUSE_TRUE@             $(LN_S) rc-local.service local.service )
-@TARGET_SUSE_TRUE@     ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-@TARGET_SUSE_TRUE@             rm -f halt-local.service && \
-@TARGET_SUSE_TRUE@             $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-
-@TARGET_MAGEIA_TRUE@   $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-@TARGET_MAGEIA_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
-@TARGET_MAGEIA_TRUE@           rm -f halt-local.service && \
-@TARGET_MAGEIA_TRUE@           $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-@TARGET_MAGEIA_TRUE@   ( cd $(DESTDIR)$(systemunitdir) && \
-@TARGET_MAGEIA_TRUE@           rm -f display-manager.service && \
-@TARGET_MAGEIA_TRUE@           $(LN_S) prefdm.service display-manager.service && \
-@TARGET_MAGEIA_TRUE@           $(LN_S) prefdm.service dm.service )
-@TARGET_MAGEIA_TRUE@   ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-@TARGET_MAGEIA_TRUE@           rm -f display-manager.service && \
-@TARGET_MAGEIA_TRUE@           $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
-
-@HAVE_SYSV_COMPAT_TRUE@        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-@HAVE_SYSV_COMPAT_TRUE@                rm -f var-lock.mount && \
-@HAVE_SYSV_COMPAT_TRUE@                $(LN_S) ../var-lock.mount var-lock.mount )
-
-install-exec-hook: $(INSTALL_EXEC_HOOKS)
-
-uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
-
-install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
-
-upload: all distcheck
-       cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
-       scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
-       scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
-       scp man/*.html tango:public/systemd-man/
-
-git-tag:
-       git tag "v$(VERSION)" -m "systemd $(VERSION)"
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/NEWS b/NEWS
deleted file mode 100644 (file)
index 53ef982..0000000
--- a/NEWS
+++ /dev/null
@@ -1,225 +0,0 @@
-systemd System and Service Manager
-
-CHANGES WITH 43:
-        * This is mostly a bugfix release
-
-        * systems lacking /etc/os-release  are no longer supported.
-
-        * Various functionality updates to libsystemd-login.so
-
-        * Track class of PAM logins to distuingish greeters from
-          normal user logins.
-
-        Contributions from: Kay Sievers, Lennart Poettering, Michael
-        Biebl
-
-CHANGES WITH 42:
-        * This is an important bugfix release for v41.
-
-        * Building man pages is now optional which should be useful
-          for those building systemd from git but unwilling to install
-          xsltproc.
-
-        * Watchdog support for supervising services is now usable. In
-          a future release support for hardware watchdogs
-          (i.e. /dev/watchdog) will be added building on this.
-
-        * Service start rate limiting is now configurable and can be
-          turned off per service. When a start rate limit is hit a
-          reboot can automatically be triggered.
-
-        * New CanReboot(), CanPowerOff() bus calls in systemd-logind.
-
-        Contributions from: Benjamin Franzke, Bill Nottingham,
-        Frederic Crozat, Lennart Poettering, Michael Olbrich, Michal
-        Schmidt, MichaÅ‚ Górny, Piotr DrÄ…g
-
-CHANGES WITH 41:
-        * The systemd binary is installed /usr/lib/systemd/systemd now;
-          An existing /sbin/init symlink needs to be adapted with the
-          package update.
-
-        * The code that loads kernel modules has been ported to invoke
-          libkmod directly, instead of modprobe. This means we do not
-          support systems with module-init-tools anymore.
-
-        * Watchdog support is now already useful, but still not
-          complete.
-
-        * A new kernel command line option systemd.setenv= is
-          understood to set system wide environment variables
-          dynamically at boot.
-
-       * We now limit the set of capabilities of systemd-journald.
-
-        * We now set SIGPIPE to ignore by default, since it only is
-          useful in shell pipelines, and has little use in general
-          code. This can be disabled with IgnoreSIPIPE=no in unit
-          files.
-
-        Contributions from: Benjamin Franzke, Kay Sievers, Lennart
-        Poettering, Michael Olbrich, Michal Schmidt, Tom Gundersen,
-        William Douglas
-
-CHANGES WITH 40:
-        * This is mostly a bugfix release
-
-        * We now expose the reason why a service failed in the
-          "Result" D-Bus property.
-
-        * Rudimentary service watchdog support (will be completed over
-          the next few releases.)
-
-        * When systemd forks off in order execute some service we will
-          now immediately changes its argv[0] to reflect which process
-          it will execute. This is useful to minimize the time window
-          with a generic argv[0], which makes bootcharts more useful
-
-        Contributions from: Alvaro Soliverez, Chris Paulson-Ellis, Kay
-        Sievers, Lennart Poettering, Michael Olbrich, Michal Schmidt,
-        Mike Kazantsev, Ray Strode
-
-CHANGES WITH 39:
-        * This is mostly a test release, but incorporates many
-          bugfixes.
-
-        * New systemd-cgtop tool to show control groups by their
-          resource usage.
-
-        * Linking against libacl for ACLs is optional again. If
-          disabled, support tracking device access for active logins
-          goes becomes unavailable, and so does access to the user
-          journals by the respective users.
-
-        * If a group "adm" exists, journal files are automatically
-          owned by them, thus allow members of this group full access
-          to the system journal as well as all user journals.
-
-        * The journal now stores the SELinux context of the logging
-          client for all entries.
-
-        * Add C++ inclusion guards to all public headers
-
-        * New output mode "cat" in the journal to print only text
-          messages, without any meta data like date or time.
-
-        * Include tiny X server wrapper as a temporary stop-gap to
-          teach XOrg udev display enumeration. This is used by display
-          managers such as gdm, and will go away as soon as XOrg
-          learned native udev hotplugging for display devices.
-
-        * Add new systemd-cat tool for executing arbitrary programs
-          with STDERR/STDOUT connected to the journal. Can also act as
-          BSD logger replacement, and does so by default.
-
-        * Optionally store all locally generated coredumps in the
-          journal along with meta data.
-
-        * systemd-tmpfiles learnt four new commands: n, L, c, b, for
-          writing short strings to files (for usage for /sys), and for
-          creating symlinks, character and block device nodes.
-
-        * New unit file option ControlGroupPersistent= to make cgroups
-          persistent, following the mechanisms outlined in
-          http://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups
-
-        * Support multiple local RTCs in a sane way
-
-        * No longer monopolize IO when replaying readahead data on
-          rotating disks, since we might starve non-file-system IO to
-          death, since fanotify() will not see accesses done by blkid,
-          or fsck.
-
-        * Don't show kernel threads in systemd-cgls anymore, unless
-          requested with new -k switch.
-
-        Contributions from: Dan Horák, Kay Sievers, Lennart
-        Poettering, Michal Schmidt
-
-CHANGES WITH 38:
-        * This is mostly a test release, but incorporates many
-          bugfixes.
-
-        * The git repository moved to:
-          git://anongit.freedesktop.org/systemd/systemd
-          ssh://git.freedesktop.org/git/systemd/systemd
-
-        * First release with the journal
-          http://0pointer.de/blog/projects/the-journal.html
-
-        * The journal replaces both systemd-kmsg-syslogd and
-          systemd-stdout-bridge.
-
-        * New sd_pid_get_unit() API call in libsystemd-logind
-
-        * Many systemadm clean-ups
-
-        * Introduce remote-fs-pre.target which is ordered before all
-          remote mounts and may be used to start services before all
-          remote mounts.
-
-        * Added Mageia support
-
-        * Add bash completion for systemd-loginctl
-
-        * Actively monitor PID file creation for daemons which exit in
-          the parent process before having finished writing the PID
-          file in the daemon process. Daemons which do this need to be
-          fixed (i.e. PID file creation must have finished before the
-          parent exits), but we now react a bit more gracefully to them.
-
-        * Add colourful boot output, mimicking the well-known output
-          of existing distributions.
-
-        * New option PassCredentials= for socket units, for
-          compatibility with a recent kernel ABI breakage.
-
-        * /etc/rc.local is now hooked in via a generator binary, and
-          thus will no longer act as synchronization point during
-          boot.
-
-        * systemctl list-unit-files now supports --root=.
-
-        * systemd-tmpfiles now understands two new commands: z, Z for
-          relabelling files according to the SELinux database. This is
-          useful to apply SELinux labels to specific files in /sys,
-          among other things.
-
-        * Output of SysV services is now forwarded to both the console
-          and the journal by default, not only just the console.
-
-        * New man pages for all APIs from libsystemd-login.
-
-        * The build tree got reorganized and a the build system is a
-          lot more modular allowing embedded setups to specifically
-          select the components of systemd they are interested in.
-
-        * Support for Linux systems lacking the kernel VT subsystem is
-          restored.
-
-        * configure's --with-rootdir= got renamed to
-          --with-rootprefix= to follow the naming used by udev and
-          kmod
-
-        * Unless specified otherwise we'll now install to /usr instead
-          of /usr/local by default.
-
-        * Processes with '@' in argv[0][0] are now excluded from the
-          final shut-down killing spree, following the logic explained
-          in:
-          http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons
-
-        * All processes remaining in a service cgroup when we enter
-          the START or START_PRE states are now killed with
-          SIGKILL. That means it is no longer possible to spawn
-          background processes from ExecStart= lines (which was never
-          supported anyway, and bad style).
-
-        * New PropagateReloadTo=/PropagateReloadFrom= options to bind
-          reloading of units together.
-
-        Contributions from: Bill Nottingham, Daniel Walsh, Dave
-        Reisner, Dexter Morgan, Gregs Gregs, Jonathan Nieder, Kay
-        Sievers, Lennart Poettering, Michael Biebl, Michal Schmidt,
-        MichaÅ‚ Górny, Ran Benita, Thomas Jarosch, Tim Waugh, Tollef
-        Fog Heen, Tom Gundersen, Zbigniew JÄ™drzejewski-Szmek
diff --git a/README b/README
index 10cbc56..15afb2c 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-systemd System and Service Manager
+systemd System and Session Manager
 
 DETAILS:
         http://0pointer.de/blog/projects/systemd.html
@@ -7,11 +7,11 @@ WEB SITE:
         http://www.freedesktop.org/wiki/Software/systemd
 
 GIT:
-        git://anongit.freedesktop.org/systemd/systemd
-        ssh://git.freedesktop.org/git/systemd/systemd
+        git://anongit.freedesktop.org/systemd
+        ssh://git.freedesktop.org/git/systemd
 
 GITWEB:
-        http://cgit.freedesktop.org/systemd/systemd
+        http://cgit.freedesktop.org/systemd/
 
 MAILING LIST:
         http://lists.freedesktop.org/mailman/listinfo/systemd-devel
@@ -27,14 +27,10 @@ AUTHOR:
         Lennart Poettering with major support from Kay Sievers
 
 LICENSE:
-        GPLv2+ for all code, except sd-daemon.[ch] and
-        sd-readahead.[ch] which are MIT
+        GPLv2+ for all code, except sd-daemon.[ch] which is MIT
 
 REQUIREMENTS:
-        Linux kernel >= 2.6.39
-                with devtmpfs
-                with cgroups (but it's OK to disable all controllers)
-                optional but strongly recommended: autofs4, ipv6
+        Linux kernel >= 2.6.39 (with devtmpfs, cgroups; optional but strongly recommended: autofs4, ipv6)
         libudev >= 172
         dbus >= 1.4.0
         libcap
diff --git a/TODO b/TODO
index cba2c8c..9149018 100644 (file)
--- a/TODO
+++ b/TODO
@@ -17,96 +17,10 @@ Bugfixes:
 
 * make polkit checks async
 
-* properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
-
 Features:
 
-* systemctl reboot -ff should trigger an immediate reboot
-
-* support units generated by a generator and placed in /run/systemd/system/; the directory is
-  currently ignored because it is empty before the generatores are executed
-
-* let 'systemctl reboot' called as non-root talk to logind instead of systemd, to get polkit
-  system policy in the loop of privilege checking, so normal users can possibly use /sbin/reboot
-
-* Possibly, detect whether SysV init scripts can do reloading by looking for "echo Usage:" lines
-
-* figure out whether we should leave dbus around during shutdown
-
-* support closing all fds via RLIMIT_NOFILE instead of /proc, in order to make chroot stuff work.
-
-* add interface to allow immediate rotation of the journal, and even flushing.
-
-* don't log coredumps of PID 1 into the journal
-
-* if a journal file is corrupt, rotate it and create a new one
-
-* dbus: in fedora, make the machine a symlink to /etc/machine-id
-
-* journald: reuse XZ context
-
-* logind: add equivalent to sd_pid_get_owner_uid() to the D-Bus API
-
-* write RPM spec macros for presets
-
-* write man pages for systemd-cat
-
-* journal: write man pages for API
-
-* journal: OR matches are borked
-
-* journal: extend hash tables as we go
-
-* journal: API for looking for retrieving "all values of this field"
-
-* journal: deal nicely with byte-by-byte copied files, especially regards header
-
-* journal: local deserializer of export mode, http server
-
-* journal: message catalog
-
-* journal: forward-secure signatures
-
-* document the exit codes when services fail before they are exec()ed
-
-* rework namespace support, don't use pivot_root, and mount things after creating the namespace, not before
-
-* systemctl journal command
-
-* journalctl: --cursor support, priority filtering
-
-* systemctl status: show coredumps
-
-* systemctl status: show whether journal was rotated since service started
-
-* save coredump in Windows/Mozilla minidump format
-
-* support crash reporting operation modes (https://live.gnome.org/GnomeOS/Design/Whiteboards/ProblemReporting)
-
-* allow per-entry control on /var vs. /run (think incognito browser mode)
-
-* clean up session cgroups that remain after logout (think sshd), but eventually run empty
-
-* support "systemctl stop foobar@.service" to stop all units matching a certain template
-
-* move to LGPL2+
-
-* logind: allow showing logout dialog from system
-
-* document that %% can be used to write % in a string that is specifier extended
-
-* check utf8 everywhere
-
-* when an instanced service exits, remove its parent cgroup too if possible.
-
-* Make libselinux, libattr, libcap, libdl dependencies only of the tools which actually need them.
-
-* as Tom Gundersen pointed out there's a always a dep loop if people use crypto file systems with random keys
-
 * unset container= in PID1?
 
-* automatically escape unit names passed on the service (i.e. think "systemctl start serial-getty.service@serial/by-path/jshdfjsdfhkjh" being automatically escaped as necessary.
-
 * if we can not get user quota for tmpfs, mount a separate tmpfs instance
   for every user in /run/user/$USER with a configured maximum size
 
@@ -123,6 +37,8 @@ Features:
 
 * Something is wrong with symlink handling of "autovt@.service" in "systemctl list-unit-files"
 
+* introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
+
 * when a bus name of a service disappears from the bus make sure to queue further activation requests
 
 * something like ConditionExec= or ExecStartPre= without failure state
@@ -130,9 +46,14 @@ Features:
 * service restart retry configuration
 
 * tmpfiles: apply "x" on "D" too (see patch from William Douglas)
+* tmpfiles: support generation of char/block devices, symlinks and one-line files (think sysfs)
+
+* Introduce ControlGroupPersistant=yes to set +t on the tasks file when creating the cgroup
 
 * don't set $HOME in services unless requested
 
+* remove hacks in vala code and require libnotify 0.7
+
 * hide PAM/TCPWrap options in fragment parser when compile time disabled
 
 * when we automatically restart a service, ensure we retsart its rdeps, too.
@@ -151,13 +72,15 @@ Features:
 * implement Register= switch in .socket units to enable registration
   in Avahi, RPC and other socket registration services.
 
+* make sure people don't leave processes around after ExecStartPre=
+
 * make sure systemd-ask-password-wall does not shutdown systemd-ask-password-console too early
 
 * readahead: use BTRFS_IOC_DEFRAG_RANGE instead of BTRFS_IOC_DEFRAG ioctl, with START_IO
 
 * readahead: check whether a btrfs volume includes ssd by checking mount flag "ssd"
 
-* support sd_notify() style notification when reload begins (RELOADING=1), reload is finished (READY=1), and add ReloadSignal= then to use in combination
+* support sd_notify() style notification when reload begins (RELOADING=1), reload is finished (READY=1)
 
 * support sd_notify() style notification when shutting down, to make auto-exit bus services work (STOPPING=1)
 
@@ -172,6 +95,8 @@ Features:
 
 * and a dbus call to generate target from current state
 
+* detect LXC with $container=lxc
+
 * drop /.readahead on bigger upgrades with yum
 
 * add inode nr check to readahead to suppress preloading changed files
@@ -180,6 +105,8 @@ Features:
 
 * GC unreferenced jobs (such as .device jobs)
 
+* cgroup_notify_empty(): recursively check groups up the tree, too
+
 * when failing to start a service due to ratelimiting, try again later, if restart=always is set
 
 * write blog stories about:
@@ -187,9 +114,12 @@ Features:
   - status update
   - how to make changes to sysctl and sysfs attributes
   - remote access
+  - cgroup best pratices to avoid stepping on each others toes
   - how to pass throw-away units to systemd, or dynamically change properties of existing units
   - how to integrate cgconfig and suchlike with systemd
-  - resource control in systemd
+  - security properties
+  - xinetd conversion
+  - details of instantiated @.service setups
 
 * allow port=0 in .socket units
 
@@ -217,6 +147,10 @@ Features:
 
 * timer events on calendar time
 
+* Support ProcessNeededForShutdown=true to allow stuff like mdmon to
+  be killed very late after the rootfs is read only? If implement pass
+  this to shutdown binary via command line argument.
+
 * dot output for --test showing the 'initial transaction'
 
 * calendar time support in timer, iCalendar semantics for the timer stuff (RFC2445)
@@ -245,6 +179,8 @@ Features:
 
 * if a service fails too often, make the service enter failed mode, and the socket, too.
 
+* new deps "Triggers" and "TriggeredBy"
+
 * systemctl list-jobs - show dependencies
 
 * add systemctl switch to dump transaction without executing it
@@ -278,17 +214,11 @@ External:
 
 * patch kernel for xattr support in /dev, /proc/, /sys and /sys/fs/cgroup?
 
-* NTP: the kernel's 11-minutes-mode syncs the system time to the RTC, but only
-  in an ~30 minutes window. It does not adjust larger differences. Find a way
-  to tell the kernel, to always do a full time sync when the RTC is in UTC and
-  we are in 11-minutes-mode. When we trust the system time to NTP we also want
-  the RTC to sync up.
-
 * patch kernel for cpu feature modalias for autoloading aes/kvm/...
-    (patches in linux-next, on the way to the next kernel)
+    http://git.kernel.org/?p=linux/kernel/git/ak/linux-misc-2.6.git;a=shortlog;h=refs/heads/cpuid-match
+  (Rafael J. Wysocki's sysdev rework is on the way. After that CPUs can be exported a proper bus.)
 
 * kernel: add /proc/sys file exposing CAP_LAST_CAP? sysconf?
-    merged: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=73efc0394e148d0e15583e13712637831f926720
 
 * kernel: add device_type = "fb", "fbcon" to class "graphics"
 
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644 (file)
index 476d532..0000000
+++ /dev/null
@@ -1,1311 +0,0 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright Â© 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-       AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-       _pkg_min_version=m4_default([$1], [0.9.0])
-       AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-               AC_MSG_RESULT([yes])
-       else
-               AC_MSG_RESULT([no])
-               PKG_CONFIG=""
-       fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-                    [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-       AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-               $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-               $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-       m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])
-        ])
-elif test $pkg_failed = untried; then
-       AC_MSG_RESULT([no])
-       m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-        ])
-else
-       $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-       $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-       $3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-       continue
-      else
-       break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 5
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 16
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-             [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-                            [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                 [_AM_DEPENDENCIES(CC)],
-                 [define([AC_PROG_CC],
-                         defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                 [_AM_DEPENDENCIES(CXX)],
-                 [define([AC_PROG_CXX],
-                         defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                 [_AM_DEPENDENCIES(OBJC)],
-                 [define([AC_PROG_OBJC],
-                         defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.                 -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-       @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 6
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_RUN_LOG(COMMAND)
-# -------------------
-# Run COMMAND, save the exit status in ac_status, and log it.
-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
-AC_DEFUN([AM_RUN_LOG],
-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   (exit $ac_status); }])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \   ]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-       @$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-# Autoconf support for the Vala compiler
-
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# Check whether the Vala compiler exists in `PATH'. If it is found, the
-# variable VALAC is set. Optionally a minimum release number of the
-# compiler can be requested.
-#
-# AM_PROG_VALAC([MINIMUM-VERSION])
-# --------------------------------
-AC_DEFUN([AM_PROG_VALAC],
-[AC_PATH_PROG([VALAC], [valac], [])
- AS_IF([test -z "$VALAC"],
-   [AC_MSG_WARN([No Vala compiler found.  You will not be able to compile .vala source files.])],
-   [AS_IF([test -n "$1"],
-      [AC_MSG_CHECKING([$VALAC is at least version $1])
-       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       AS_VERSION_COMPARE([$1], ["$am__vala_version"],
-         [AC_MSG_RESULT([yes])],
-         [AC_MSG_RESULT([yes])],
-         [AC_MSG_RESULT([no])
-          AC_MSG_ERROR([Vala $1 not found.])])])])
-])
-
-m4_include([m4/acx_libwrap.m4])
-m4_include([m4/attributes.m4])
-m4_include([m4/intltool.m4])
-m4_include([m4/libtool.m4])
-m4_include([m4/ltoptions.m4])
-m4_include([m4/ltsugar.m4])
-m4_include([m4/ltversion.m4])
-m4_include([m4/lt~obsolete.m4])
diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..b2b680a
--- /dev/null
@@ -0,0 +1,83 @@
+#!/bin/bash
+
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+AM_VERSION=1.11
+AC_VERSION=2.63
+
+run_versioned() {
+    local P
+    local V
+
+    V=$(echo "$2" | sed -e 's,\.,,g')
+
+    if [ -e "`which $1$V 2> /dev/null`" ] ; then
+        P="$1$V"
+    else
+        if [ -e "`which $1-$2 2> /dev/null`" ] ; then
+            P="$1-$2"
+        else
+            P="$1"
+        fi
+    fi
+
+    shift 2
+    "$P" "$@"
+}
+
+set -ex
+
+if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+    cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
+    chmod +x .git/hooks/pre-commit && \
+    echo "Activated pre-commit hook."
+fi
+
+if type -p colorgcc > /dev/null ; then
+   export CC=colorgcc
+fi
+
+libdir() {
+    echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+}
+
+if [ "x$1" = "xam" ] ; then
+    run_versioned automake "$AM_VERSION" -a -c --foreign
+    ./config.status
+else
+    rm -rf autom4te.cache
+    rm -f config.cache
+
+    libtoolize -c --force
+    intltoolize -c -f
+    run_versioned aclocal "$AM_VERSION" -I m4
+    run_versioned autoconf "$AC_VERSION" -Wall
+    run_versioned autoheader "$AC_VERSION"
+    run_versioned automake "$AM_VERSION" --copy --foreign --add-missing
+
+    if [ "x$1" != "xac" ]; then
+        CFLAGS="$CFLAGS -g -O0" ./configure \
+          --sysconfdir=/etc \
+          --localstatedir=/var \
+          --libexecdir=/usr/lib \
+          --libdir=$(libdir /usr/local/lib) \
+          --with-rootdir= \
+          "$@"
+        make clean
+    fi
+fi
diff --git a/compile b/compile
deleted file mode 100755 (executable)
index b1f4749..0000000
--- a/compile
+++ /dev/null
@@ -1,310 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-01-04.17; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""       $nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-       # lazily determine how to convert abs files
-       case `uname -s` in
-         MINGW*)
-           file_conv=mingw
-           ;;
-         CYGWIN*)
-           file_conv=cygwin
-           ;;
-         *)
-           file_conv=wine
-           ;;
-       esac
-      fi
-      case $file_conv/,$2, in
-       *,$file_conv,*)
-         ;;
-       mingw/*)
-         file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-         ;;
-       cygwin/*)
-         file=`cygpath -m "$file" || echo "$file"`
-         ;;
-       wine/*)
-         file=`winepath -w "$file" || echo "$file"`
-         ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-       -o)
-         # configure might choose to run compile as 'compile cc -o foo foo.c'.
-         eat=1
-         case $2 in
-           *.o | *.[oO][bB][jJ])
-             func_file_conv "$2"
-             set x "$@" -Fo"$file"
-             shift
-             ;;
-           *)
-             func_file_conv "$2"
-             set x "$@" -Fe"$file"
-             shift
-             ;;
-         esac
-         ;;
-       -I*)
-         func_file_conv "${1#-I}" mingw
-         set x "$@" -I"$file"
-         shift
-         ;;
-       -l*)
-         lib=${1#-l}
-         found=no
-         save_IFS=$IFS
-         IFS=';'
-         for dir in $lib_path $LIB
-         do
-           IFS=$save_IFS
-           if $shared && test -f "$dir/$lib.dll.lib"; then
-             found=yes
-             set x "$@" "$dir/$lib.dll.lib"
-             break
-           fi
-           if test -f "$dir/$lib.lib"; then
-             found=yes
-             set x "$@" "$dir/$lib.lib"
-             break
-           fi
-         done
-         IFS=$save_IFS
-
-         test "$found" != yes && set x "$@" "$lib.lib"
-         shift
-         ;;
-       -L*)
-         func_file_conv "${1#-L}"
-         if test -z "$lib_path"; then
-           lib_path=$file
-         else
-           lib_path="$lib_path;$file"
-         fi
-         linker_opts="$linker_opts -LIBPATH:$file"
-         ;;
-       -static)
-         shared=false
-         ;;
-       -Wl,*)
-         arg=${1#-Wl,}
-         save_ifs="$IFS"; IFS=','
-         for flag in $arg; do
-           IFS="$save_ifs"
-           linker_opts="$linker_opts $flag"
-         done
-         IFS="$save_ifs"
-         ;;
-       -Xlinker)
-         eat=1
-         linker_opts="$linker_opts $2"
-         ;;
-       -*)
-         set x "$@" "$1"
-         shift
-         ;;
-       *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-         func_file_conv "$1"
-         set x "$@" -Tp"$file"
-         shift
-         ;;
-       *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-         func_file_conv "$1" mingw
-         set x "$@" "$file"
-         shift
-         ;;
-       *)
-         set x "$@" "$1"
-         shift
-         ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-       # configure might choose to run compile as 'compile cc -o foo foo.c'.
-       # So we strip '-o arg' only if arg is an object.
-       eat=1
-       case $2 in
-         *.o | *.obj)
-           ofile=$2
-           ;;
-         *)
-           set x "$@" -o "$2"
-           shift
-           ;;
-       esac
-       ;;
-      *.c)
-       cfile=$1
-       set x "$@" "$1"
-       shift
-       ;;
-      *)
-       set x "$@" "$1"
-       shift
-       ;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/config.guess b/config.guess
deleted file mode 100755 (executable)
index 49ba16f..0000000
+++ /dev/null
@@ -1,1522 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-01-01'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-       for c in cc gcc c89 c99 ; do
-         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-            CC_FOR_BUILD="$c"; break ;
-         fi ;
-       done ;
-       if test x"$CC_FOR_BUILD" = x ; then
-         CC_FOR_BUILD=no_compiler_found ;
-       fi
-       ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-       PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-       # NetBSD (nbsd) targets should (where applicable) match one or
-       # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-       # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-       # switched to ELF, *-*-netbsd* would select the old
-       # object file format.  This provides both forward
-       # compatibility and a consistent mechanism for selecting the
-       # object file format.
-       #
-       # Note: NetBSD doesn't particularly care about the vendor
-       # portion of the name.  We always set it to "unknown".
-       sysctl="sysctl -n hw.machine_arch"
-       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-           /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-       case "${UNAME_MACHINE_ARCH}" in
-           armeb) machine=armeb-unknown ;;
-           arm*) machine=arm-unknown ;;
-           sh3el) machine=shl-unknown ;;
-           sh3eb) machine=sh-unknown ;;
-           sh5el) machine=sh5le-unknown ;;
-           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-       esac
-       # The Operating System including object format, if it has switched
-       # to ELF recently, or will in the future.
-       case "${UNAME_MACHINE_ARCH}" in
-           arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-               eval $set_cc_for_build
-               if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-                       | grep -q __ELF__
-               then
-                   # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-                   # Return netbsd for either.  FIX?
-                   os=netbsd
-               else
-                   os=netbsdelf
-               fi
-               ;;
-           *)
-               os=netbsd
-               ;;
-       esac
-       # The OS release
-       # Debian GNU/NetBSD machines have a different userland, and
-       # thus, need a distinct triplet. However, they do not need
-       # kernel version information, so it can be replaced with a
-       # suitable tag, in the style of linux-gnu.
-       case "${UNAME_VERSION}" in
-           Debian*)
-               release='-gnu'
-               ;;
-           *)
-               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-               ;;
-       esac
-       # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-       # contains redundant information, the shorter form:
-       # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-       echo "${machine}-${os}${release}"
-       exit ;;
-    *:OpenBSD:*:*)
-       UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-       echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-       exit ;;
-    *:ekkoBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-       exit ;;
-    *:SolidBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-       exit ;;
-    macppc:MirBSD:*:*)
-       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
-    *:MirBSD:*:*)
-       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-       exit ;;
-    alpha:OSF1:*:*)
-       case $UNAME_RELEASE in
-       *4.0)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-               ;;
-       *5.*)
-               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-               ;;
-       esac
-       # According to Compaq, /usr/sbin/psrinfo has been available on
-       # OSF/1 and Tru64 systems produced since 1995.  I hope that
-       # covers most systems running today.  This code pipes the CPU
-       # types through head -n 1, so we only detect the type of CPU 0.
-       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-       case "$ALPHA_CPU_TYPE" in
-           "EV4 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "EV4.5 (21064)")
-               UNAME_MACHINE="alpha" ;;
-           "LCA4 (21066/21068)")
-               UNAME_MACHINE="alpha" ;;
-           "EV5 (21164)")
-               UNAME_MACHINE="alphaev5" ;;
-           "EV5.6 (21164A)")
-               UNAME_MACHINE="alphaev56" ;;
-           "EV5.6 (21164PC)")
-               UNAME_MACHINE="alphapca56" ;;
-           "EV5.7 (21164PC)")
-               UNAME_MACHINE="alphapca57" ;;
-           "EV6 (21264)")
-               UNAME_MACHINE="alphaev6" ;;
-           "EV6.7 (21264A)")
-               UNAME_MACHINE="alphaev67" ;;
-           "EV6.8CB (21264C)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8AL (21264B)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.8CX (21264D)")
-               UNAME_MACHINE="alphaev68" ;;
-           "EV6.9A (21264/EV69A)")
-               UNAME_MACHINE="alphaev69" ;;
-           "EV7 (21364)")
-               UNAME_MACHINE="alphaev7" ;;
-           "EV7.9 (21364A)")
-               UNAME_MACHINE="alphaev79" ;;
-       esac
-       # A Pn.n version is a patched version.
-       # A Vn.n version is a released version.
-       # A Tn.n version is a released field test version.
-       # A Xn.n version is an unreleased experimental baselevel.
-       # 1.2 uses "1.2" for uname -r.
-       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-       exitcode=$?
-       trap '' 0
-       exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # Should we change UNAME_MACHINE based on the output of uname instead
-       # of the specific Alpha model?
-       echo alpha-pc-interix
-       exit ;;
-    21064:Windows_NT:50:3)
-       echo alpha-dec-winnt3.5
-       exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-       echo m68k-unknown-sysv4
-       exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-amigaos
-       exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-       echo ${UNAME_MACHINE}-unknown-morphos
-       exit ;;
-    *:OS/390:*:*)
-       echo i370-ibm-openedition
-       exit ;;
-    *:z/VM:*:*)
-       echo s390-ibm-zvmoe
-       exit ;;
-    *:OS400:*:*)
-       echo powerpc-ibm-os400
-       exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-       echo arm-acorn-riscix${UNAME_RELEASE}
-       exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-       echo arm-unknown-riscos
-       exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-       echo hppa1.1-hitachi-hiuxmpp
-       exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-       # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-       if test "`(/bin/universe) 2>/dev/null`" = att ; then
-               echo pyramid-pyramid-sysv3
-       else
-               echo pyramid-pyramid-bsd
-       fi
-       exit ;;
-    NILE*:*:*:dcosx)
-       echo pyramid-pyramid-svr4
-       exit ;;
-    DRS?6000:unix:4.0:6*)
-       echo sparc-icl-nx6
-       exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-       case `/usr/bin/uname -p` in
-           sparc) echo sparc-icl-nx7; exit ;;
-       esac ;;
-    s390x:SunOS:*:*)
-       echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4H:SunOS:5.*:*)
-       echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-       echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-       echo i386-pc-auroraux${UNAME_RELEASE}
-       exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-       eval $set_cc_for_build
-       SUN_ARCH="i386"
-       # If there is a compiler, see if it is configured for 64-bit objects.
-       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-       # This test works for both compilers.
-       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-               grep IS_64BIT_ARCH >/dev/null
-           then
-               SUN_ARCH="x86_64"
-           fi
-       fi
-       echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:6*:*)
-       # According to config.sub, this is the proper way to canonicalize
-       # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-       # it's likely to be more like Solaris than SunOS4.
-       echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    sun4*:SunOS:*:*)
-       case "`/usr/bin/arch -k`" in
-           Series*|S4*)
-               UNAME_RELEASE=`uname -v`
-               ;;
-       esac
-       # Japanese Language versions have a version number like `4.1.3-JL'.
-       echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-       exit ;;
-    sun3*:SunOS:*:*)
-       echo m68k-sun-sunos${UNAME_RELEASE}
-       exit ;;
-    sun*:*:4.2BSD:*)
-       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-       test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-       case "`/bin/arch`" in
-           sun3)
-               echo m68k-sun-sunos${UNAME_RELEASE}
-               ;;
-           sun4)
-               echo sparc-sun-sunos${UNAME_RELEASE}
-               ;;
-       esac
-       exit ;;
-    aushp:SunOS:*:*)
-       echo sparc-auspex-sunos${UNAME_RELEASE}
-       exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-       echo m68k-atari-mint${UNAME_RELEASE}
-       exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-       echo m68k-milan-mint${UNAME_RELEASE}
-       exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-       echo m68k-hades-mint${UNAME_RELEASE}
-       exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-       echo m68k-unknown-mint${UNAME_RELEASE}
-       exit ;;
-    m68k:machten:*:*)
-       echo m68k-apple-machten${UNAME_RELEASE}
-       exit ;;
-    powerpc:machten:*:*)
-       echo powerpc-apple-machten${UNAME_RELEASE}
-       exit ;;
-    RISC*:Mach:*:*)
-       echo mips-dec-mach_bsd4.3
-       exit ;;
-    RISC*:ULTRIX:*:*)
-       echo mips-dec-ultrix${UNAME_RELEASE}
-       exit ;;
-    VAX*:ULTRIX*:*:*)
-       echo vax-dec-ultrix${UNAME_RELEASE}
-       exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-       echo clipper-intergraph-clix${UNAME_RELEASE}
-       exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-       int main (int argc, char *argv[]) {
-#else
-       int main (argc, argv) int argc; char *argv[]; {
-#endif
-       #if defined (host_mips) && defined (MIPSEB)
-       #if defined (SYSTYPE_SYSV)
-         printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_SVR4)
-         printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-       #endif
-       #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-         printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-       #endif
-       #endif
-         exit (-1);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c &&
-         dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-         SYSTEM_NAME=`$dummy $dummyarg` &&
-           { echo "$SYSTEM_NAME"; exit; }
-       echo mips-mips-riscos${UNAME_RELEASE}
-       exit ;;
-    Motorola:PowerMAX_OS:*:*)
-       echo powerpc-motorola-powermax
-       exit ;;
-    Motorola:*:4.3:PL8-*)
-       echo powerpc-harris-powermax
-       exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-       echo powerpc-harris-powermax
-       exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-       echo powerpc-harris-powerunix
-       exit ;;
-    m88k:CX/UX:7*:*)
-       echo m88k-harris-cxux7
-       exit ;;
-    m88k:*:4*:R4*)
-       echo m88k-motorola-sysv4
-       exit ;;
-    m88k:*:3*:R3*)
-       echo m88k-motorola-sysv3
-       exit ;;
-    AViiON:dgux:*:*)
-       # DG/UX returns AViiON for all architectures
-       UNAME_PROCESSOR=`/usr/bin/uname -p`
-       if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-       then
-           if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-              [ ${TARGET_BINARY_INTERFACE}x = x ]
-           then
-               echo m88k-dg-dgux${UNAME_RELEASE}
-           else
-               echo m88k-dg-dguxbcs${UNAME_RELEASE}
-           fi
-       else
-           echo i586-dg-dgux${UNAME_RELEASE}
-       fi
-       exit ;;
-    M88*:DolphinOS:*:*)        # DolphinOS (SVR3)
-       echo m88k-dolphin-sysv3
-       exit ;;
-    M88*:*:R3*:*)
-       # Delta 88k system running SVR3
-       echo m88k-motorola-sysv3
-       exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-       echo m88k-tektronix-sysv3
-       exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-       echo m68k-tektronix-bsd
-       exit ;;
-    *:IRIX*:*:*)
-       echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-       exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-       echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-       exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-       echo i386-ibm-aix
-       exit ;;
-    ia64:AIX:*:*)
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-       exit ;;
-    *:AIX:2:3)
-       if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-               eval $set_cc_for_build
-               sed 's/^                //' << EOF >$dummy.c
-               #include <sys/systemcfg.h>
-
-               main()
-                       {
-                       if (!__power_pc())
-                               exit(1);
-                       puts("powerpc-ibm-aix3.2.5");
-                       exit(0);
-                       }
-EOF
-               if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-               then
-                       echo "$SYSTEM_NAME"
-               else
-                       echo rs6000-ibm-aix3.2.5
-               fi
-       elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-               echo rs6000-ibm-aix3.2.4
-       else
-               echo rs6000-ibm-aix3.2
-       fi
-       exit ;;
-    *:AIX:*:[4567])
-       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-               IBM_ARCH=rs6000
-       else
-               IBM_ARCH=powerpc
-       fi
-       if [ -x /usr/bin/oslevel ] ; then
-               IBM_REV=`/usr/bin/oslevel`
-       else
-               IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-       fi
-       echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-       exit ;;
-    *:AIX:*:*)
-       echo rs6000-ibm-aix
-       exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-       echo romp-ibm-bsd4.4
-       exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-       echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-       exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-       echo rs6000-bull-bosx
-       exit ;;
-    DPX/2?00:B.O.S.:*:*)
-       echo m68k-bull-sysv3
-       exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-       echo m68k-hp-bsd
-       exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-       echo m68k-hp-bsd4.4
-       exit ;;
-    9000/[34678]??:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       case "${UNAME_MACHINE}" in
-           9000/31? )            HP_ARCH=m68000 ;;
-           9000/[34]?? )         HP_ARCH=m68k ;;
-           9000/[678][0-9][0-9])
-               if [ -x /usr/bin/getconf ]; then
-                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                   sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                   case "${sc_cpu_version}" in
-                     523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                     528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                     532)                      # CPU_PA_RISC2_0
-                       case "${sc_kernel_bits}" in
-                         32) HP_ARCH="hppa2.0n" ;;
-                         64) HP_ARCH="hppa2.0w" ;;
-                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                       esac ;;
-                   esac
-               fi
-               if [ "${HP_ARCH}" = "" ]; then
-                   eval $set_cc_for_build
-                   sed 's/^            //' << EOF >$dummy.c
-
-               #define _HPUX_SOURCE
-               #include <stdlib.h>
-               #include <unistd.h>
-
-               int main ()
-               {
-               #if defined(_SC_KERNEL_BITS)
-                   long bits = sysconf(_SC_KERNEL_BITS);
-               #endif
-                   long cpu  = sysconf (_SC_CPU_VERSION);
-
-                   switch (cpu)
-                       {
-                       case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-                       case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-                       case CPU_PA_RISC2_0:
-               #if defined(_SC_KERNEL_BITS)
-                           switch (bits)
-                               {
-                               case 64: puts ("hppa2.0w"); break;
-                               case 32: puts ("hppa2.0n"); break;
-                               default: puts ("hppa2.0"); break;
-                               } break;
-               #else  /* !defined(_SC_KERNEL_BITS) */
-                           puts ("hppa2.0"); break;
-               #endif
-                       default: puts ("hppa1.0"); break;
-                       }
-                   exit (0);
-               }
-EOF
-                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-                   test -z "$HP_ARCH" && HP_ARCH=hppa
-               fi ;;
-       esac
-       if [ ${HP_ARCH} = "hppa2.0w" ]
-       then
-           eval $set_cc_for_build
-
-           # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-           # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-           # generating 64-bit code.  GNU and HP use different nomenclature:
-           #
-           # $ CC_FOR_BUILD=cc ./config.guess
-           # => hppa2.0w-hp-hpux11.23
-           # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-           # => hppa64-hp-hpux11.23
-
-           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-               grep -q __LP64__
-           then
-               HP_ARCH="hppa2.0w"
-           else
-               HP_ARCH="hppa64"
-           fi
-       fi
-       echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-       exit ;;
-    ia64:HP-UX:*:*)
-       HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-       echo ia64-hp-hpux${HPUX_REV}
-       exit ;;
-    3050*:HI-UX:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #include <unistd.h>
-       int
-       main ()
-       {
-         long cpu = sysconf (_SC_CPU_VERSION);
-         /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-            true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-            results, however.  */
-         if (CPU_IS_PA_RISC (cpu))
-           {
-             switch (cpu)
-               {
-                 case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-                 case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-                 default: puts ("hppa-hitachi-hiuxwe2"); break;
-               }
-           }
-         else if (CPU_IS_HP_MC68K (cpu))
-           puts ("m68k-hitachi-hiuxwe2");
-         else puts ("unknown-hitachi-hiuxwe2");
-         exit (0);
-       }
-EOF
-       $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-               { echo "$SYSTEM_NAME"; exit; }
-       echo unknown-hitachi-hiuxwe2
-       exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-       echo hppa1.1-hp-bsd
-       exit ;;
-    9000/8??:4.3bsd:*:*)
-       echo hppa1.0-hp-bsd
-       exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-       echo hppa1.0-hp-mpeix
-       exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-       echo hppa1.1-hp-osf
-       exit ;;
-    hp8??:OSF1:*:*)
-       echo hppa1.0-hp-osf
-       exit ;;
-    i*86:OSF1:*:*)
-       if [ -x /usr/sbin/sysversion ] ; then
-           echo ${UNAME_MACHINE}-unknown-osf1mk
-       else
-           echo ${UNAME_MACHINE}-unknown-osf1
-       fi
-       exit ;;
-    parisc*:Lites*:*:*)
-       echo hppa1.1-hp-lites
-       exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-       echo c1-convex-bsd
-       exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-       exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-       echo c34-convex-bsd
-       exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-       echo c38-convex-bsd
-       exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-       echo c4-convex-bsd
-       exit ;;
-    CRAY*Y-MP:*:*:*)
-       echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*[A-Z]90:*:*:*)
-       echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-       | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-             -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-             -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*TS:*:*:*)
-       echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*T3E:*:*:*)
-       echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    CRAY*SV1:*:*:*)
-       echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    *:UNICOS/mp:*:*)
-       echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-       exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-       FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-       FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-       echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit ;;
-    5000:UNIX_System_V:4.*:*)
-       FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-       FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-       echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-       exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-       echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-       exit ;;
-    sparc*:BSD/OS:*:*)
-       echo sparc-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
-    *:BSD/OS:*:*)
-       echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-       exit ;;
-    *:FreeBSD:*:*)
-       UNAME_PROCESSOR=`/usr/bin/uname -p`
-       case ${UNAME_PROCESSOR} in
-           amd64)
-               echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-           *)
-               echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-       esac
-       exit ;;
-    i*:CYGWIN*:*)
-       echo ${UNAME_MACHINE}-pc-cygwin
-       exit ;;
-    *:MINGW*:*)
-       echo ${UNAME_MACHINE}-pc-mingw32
-       exit ;;
-    i*:MSYS*:*)
-       echo ${UNAME_MACHINE}-pc-msys
-       exit ;;
-    i*:windows32*:*)
-       # uname -m includes "-pc" on this system.
-       echo ${UNAME_MACHINE}-mingw32
-       exit ;;
-    i*:PW*:*)
-       echo ${UNAME_MACHINE}-pc-pw32
-       exit ;;
-    *:Interix*:*)
-       case ${UNAME_MACHINE} in
-           x86)
-               echo i586-pc-interix${UNAME_RELEASE}
-               exit ;;
-           authenticamd | genuineintel | EM64T)
-               echo x86_64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-           IA64)
-               echo ia64-unknown-interix${UNAME_RELEASE}
-               exit ;;
-       esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-       echo i${UNAME_MACHINE}-pc-mks
-       exit ;;
-    8664:Windows_NT:*)
-       echo x86_64-pc-mks
-       exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-       # How do we know it's Interix rather than the generic POSIX subsystem?
-       # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-       # UNAME_MACHINE based on the output of uname instead of i386?
-       echo i586-pc-interix
-       exit ;;
-    i*:UWIN*:*)
-       echo ${UNAME_MACHINE}-pc-uwin
-       exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-       echo x86_64-unknown-cygwin
-       exit ;;
-    p*:CYGWIN*:*)
-       echo powerpcle-unknown-cygwin
-       exit ;;
-    prep*:SunOS:5.*:*)
-       echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-       exit ;;
-    *:GNU:*:*)
-       # the GNU system
-       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-       exit ;;
-    *:GNU/*:*:*)
-       # other systems with GNU libc and userland
-       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-       exit ;;
-    i*86:Minix:*:*)
-       echo ${UNAME_MACHINE}-pc-minix
-       exit ;;
-    alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-         EV5)   UNAME_MACHINE=alphaev5 ;;
-         EV56)  UNAME_MACHINE=alphaev56 ;;
-         PCA56) UNAME_MACHINE=alphapca56 ;;
-         PCA57) UNAME_MACHINE=alphapca56 ;;
-         EV6)   UNAME_MACHINE=alphaev6 ;;
-         EV67)  UNAME_MACHINE=alphaev67 ;;
-         EV68*) UNAME_MACHINE=alphaev68 ;;
-       esac
-       objdump --private-headers /bin/sh | grep -q ld.so.1
-       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-       exit ;;
-    arm*:Linux:*:*)
-       eval $set_cc_for_build
-       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-           | grep -q __ARM_EABI__
-       then
-           echo ${UNAME_MACHINE}-unknown-linux-gnu
-       else
-           if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-               | grep -q __ARM_PCS_VFP
-           then
-               echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-           else
-               echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-           fi
-       fi
-       exit ;;
-    avr32*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    cris:Linux:*:*)
-       echo ${UNAME_MACHINE}-axis-linux-gnu
-       exit ;;
-    crisv32:Linux:*:*)
-       echo ${UNAME_MACHINE}-axis-linux-gnu
-       exit ;;
-    frv:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    hexagon:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    i*86:Linux:*:*)
-       LIBC=gnu
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #ifdef __dietlibc__
-       LIBC=dietlibc
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-       echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-       exit ;;
-    ia64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    m32r*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    m68*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-       eval $set_cc_for_build
-       sed 's/^        //' << EOF >$dummy.c
-       #undef CPU
-       #undef ${UNAME_MACHINE}
-       #undef ${UNAME_MACHINE}el
-       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-       CPU=${UNAME_MACHINE}el
-       #else
-       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-       CPU=${UNAME_MACHINE}
-       #else
-       CPU=
-       #endif
-       #endif
-EOF
-       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-       test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-       ;;
-    or32:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    padre:Linux:*:*)
-       echo sparc-unknown-linux-gnu
-       exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-       echo hppa64-unknown-linux-gnu
-       exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-       # Look for CPU level
-       case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-         PA7*) echo hppa1.1-unknown-linux-gnu ;;
-         PA8*) echo hppa2.0-unknown-linux-gnu ;;
-         *)    echo hppa-unknown-linux-gnu ;;
-       esac
-       exit ;;
-    ppc64:Linux:*:*)
-       echo powerpc64-unknown-linux-gnu
-       exit ;;
-    ppc:Linux:*:*)
-       echo powerpc-unknown-linux-gnu
-       exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-       echo ${UNAME_MACHINE}-ibm-linux
-       exit ;;
-    sh64*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    sh*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    tile*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    vax:Linux:*:*)
-       echo ${UNAME_MACHINE}-dec-linux-gnu
-       exit ;;
-    x86_64:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    xtensa*:Linux:*:*)
-       echo ${UNAME_MACHINE}-unknown-linux-gnu
-       exit ;;
-    i*86:DYNIX/ptx:4*:*)
-       # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-       # earlier versions are messed up and put the nodename in both
-       # sysname and nodename.
-       echo i386-sequent-sysv4
-       exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-       # Unixware is an offshoot of SVR4, but it has its own version
-       # number series starting with 2...
-       # I am not positive that other SVR4 systems won't match this,
-       # I just have to hope.  -- rms.
-       # Use sysv4.2uw... so that sysv4* matches it.
-       echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-       exit ;;
-    i*86:OS/2:*:*)
-       # If we were able to find `uname', then EMX Unix compatibility
-       # is probably installed.
-       echo ${UNAME_MACHINE}-pc-os2-emx
-       exit ;;
-    i*86:XTS-300:*:STOP)
-       echo ${UNAME_MACHINE}-unknown-stop
-       exit ;;
-    i*86:atheos:*:*)
-       echo ${UNAME_MACHINE}-unknown-atheos
-       exit ;;
-    i*86:syllable:*:*)
-       echo ${UNAME_MACHINE}-pc-syllable
-       exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-       echo i386-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    i*86:*DOS:*:*)
-       echo ${UNAME_MACHINE}-pc-msdosdjgpp
-       exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-       UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-       if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-               echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-       else
-               echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-       fi
-       exit ;;
-    i*86:*:5:[678]*)
-       # UnixWare 7.x, OpenUNIX and OpenServer 6.
-       case `/bin/uname -X | grep "^Machine"` in
-           *486*)           UNAME_MACHINE=i486 ;;
-           *Pentium)        UNAME_MACHINE=i586 ;;
-           *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-       esac
-       echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-       exit ;;
-    i*86:*:3.2:*)
-       if test -f /usr/options/cb.name; then
-               UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-               echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-       elif /bin/uname -X 2>/dev/null >/dev/null ; then
-               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-                       && UNAME_MACHINE=i586
-               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-                       && UNAME_MACHINE=i686
-               echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-       else
-               echo ${UNAME_MACHINE}-pc-sysv32
-       fi
-       exit ;;
-    pc:*:*:*)
-       # Left here for compatibility:
-       # uname -m prints for DJGPP always 'pc', but it prints nothing about
-       # the processor, so we play safe by assuming i586.
-       # Note: whatever this is, it MUST be the same as what config.sub
-       # prints for the "djgpp" host, or else GDB configury will decide that
-       # this is a cross-build.
-       echo i586-pc-msdosdjgpp
-       exit ;;
-    Intel:Mach:3*:*)
-       echo i386-pc-mach3
-       exit ;;
-    paragon:*:*:*)
-       echo i860-intel-osf1
-       exit ;;
-    i860:*:4.*:*) # i860-SVR4
-       if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-         echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-       else # Add other i860-SVR4 vendors below as they are discovered.
-         echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-       fi
-       exit ;;
-    mini*:CTIX:SYS*5:*)
-       # "miniframe"
-       echo m68010-convergent-sysv
-       exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-       echo m68k-convergent-sysv
-       exit ;;
-    M680?0:D-NIX:5.3:*)
-       echo m68k-diab-dnix
-       exit ;;
-    M68*:*:R3V[5678]*:*)
-       test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-       OS_REL=''
-       test -r /etc/.relid \
-       && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-         && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-         && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-       OS_REL='.3'
-       test -r /etc/.relid \
-           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-           && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-           && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-       echo m68k-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-       echo m68k-atari-sysv4
-       exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-       echo sparc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    rs6000:LynxOS:2.*:*)
-       echo rs6000-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-       echo powerpc-unknown-lynxos${UNAME_RELEASE}
-       exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-       echo mips-dde-sysv${UNAME_RELEASE}
-       exit ;;
-    RM*:ReliantUNIX-*:*:*)
-       echo mips-sni-sysv4
-       exit ;;
-    RM*:SINIX-*:*:*)
-       echo mips-sni-sysv4
-       exit ;;
-    *:SINIX-*:*:*)
-       if uname -p 2>/dev/null >/dev/null ; then
-               UNAME_MACHINE=`(uname -p) 2>/dev/null`
-               echo ${UNAME_MACHINE}-sni-sysv4
-       else
-               echo ns32k-sni-sysv
-       fi
-       exit ;;
-    PENTIUM:*:4.0*:*)  # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                       # says <Richard.M.Bartel@ccMail.Census.GOV>
-       echo i586-unisys-sysv4
-       exit ;;
-    *:UNIX_System_V:4*:FTX*)
-       # From Gerald Hewes <hewes@openmarket.com>.
-       # How about differentiating between stratus architectures? -djm
-       echo hppa1.1-stratus-sysv4
-       exit ;;
-    *:*:*:FTX*)
-       # From seanf@swdc.stratus.com.
-       echo i860-stratus-sysv4
-       exit ;;
-    i*86:VOS:*:*)
-       # From Paul.Green@stratus.com.
-       echo ${UNAME_MACHINE}-stratus-vos
-       exit ;;
-    *:VOS:*:*)
-       # From Paul.Green@stratus.com.
-       echo hppa1.1-stratus-vos
-       exit ;;
-    mc68*:A/UX:*:*)
-       echo m68k-apple-aux${UNAME_RELEASE}
-       exit ;;
-    news*:NEWS-OS:6*:*)
-       echo mips-sony-newsos6
-       exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-       if [ -d /usr/nec ]; then
-               echo mips-nec-sysv${UNAME_RELEASE}
-       else
-               echo mips-unknown-sysv${UNAME_RELEASE}
-       fi
-       exit ;;
-    BeBox:BeOS:*:*)    # BeOS running on hardware made by Be, PPC only.
-       echo powerpc-be-beos
-       exit ;;
-    BeMac:BeOS:*:*)    # BeOS running on Mac or Mac clone, PPC only.
-       echo powerpc-apple-beos
-       exit ;;
-    BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
-       echo i586-pc-beos
-       exit ;;
-    BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
-       echo i586-pc-haiku
-       exit ;;
-    SX-4:SUPER-UX:*:*)
-       echo sx4-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-5:SUPER-UX:*:*)
-       echo sx5-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-6:SUPER-UX:*:*)
-       echo sx6-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-7:SUPER-UX:*:*)
-       echo sx7-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8:SUPER-UX:*:*)
-       echo sx8-nec-superux${UNAME_RELEASE}
-       exit ;;
-    SX-8R:SUPER-UX:*:*)
-       echo sx8r-nec-superux${UNAME_RELEASE}
-       exit ;;
-    Power*:Rhapsody:*:*)
-       echo powerpc-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
-    *:Rhapsody:*:*)
-       echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-       exit ;;
-    *:Darwin:*:*)
-       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       case $UNAME_PROCESSOR in
-           i386)
-               eval $set_cc_for_build
-               if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-                 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-                     grep IS_64BIT_ARCH >/dev/null
-                 then
-                     UNAME_PROCESSOR="x86_64"
-                 fi
-               fi ;;
-           unknown) UNAME_PROCESSOR=powerpc ;;
-       esac
-       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-       exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-       UNAME_PROCESSOR=`uname -p`
-       if test "$UNAME_PROCESSOR" = "x86"; then
-               UNAME_PROCESSOR=i386
-               UNAME_MACHINE=pc
-       fi
-       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-       exit ;;
-    *:QNX:*:4*)
-       echo i386-pc-qnx
-       exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-       echo neo-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-       echo nse-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-       echo nsr-tandem-nsk${UNAME_RELEASE}
-       exit ;;
-    *:NonStop-UX:*:*)
-       echo mips-compaq-nonstopux
-       exit ;;
-    BS2000:POSIX*:*:*)
-       echo bs2000-siemens-sysv
-       exit ;;
-    DS/*:UNIX_System_V:*:*)
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-       exit ;;
-    *:Plan9:*:*)
-       # "uname -m" is not consistent, so use $cputype instead. 386
-       # is converted to i386 for consistency with other x86
-       # operating systems.
-       if test "$cputype" = "386"; then
-           UNAME_MACHINE=i386
-       else
-           UNAME_MACHINE="$cputype"
-       fi
-       echo ${UNAME_MACHINE}-unknown-plan9
-       exit ;;
-    *:TOPS-10:*:*)
-       echo pdp10-unknown-tops10
-       exit ;;
-    *:TENEX:*:*)
-       echo pdp10-unknown-tenex
-       exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-       echo pdp10-dec-tops20
-       exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-       echo pdp10-xkl-tops20
-       exit ;;
-    *:TOPS-20:*:*)
-       echo pdp10-unknown-tops20
-       exit ;;
-    *:ITS:*:*)
-       echo pdp10-unknown-its
-       exit ;;
-    SEI:*:*:SEIUX)
-       echo mips-sei-seiux${UNAME_RELEASE}
-       exit ;;
-    *:DragonFly:*:*)
-       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-       exit ;;
-    *:*VMS:*:*)
-       UNAME_MACHINE=`(uname -p) 2>/dev/null`
-       case "${UNAME_MACHINE}" in
-           A*) echo alpha-dec-vms ; exit ;;
-           I*) echo ia64-dec-vms ; exit ;;
-           V*) echo vax-dec-vms ; exit ;;
-       esac ;;
-    *:XENIX:*:SysV)
-       echo i386-pc-xenix
-       exit ;;
-    i*86:skyos:*:*)
-       echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-       exit ;;
-    i*86:rdos:*:*)
-       echo ${UNAME_MACHINE}-pc-rdos
-       exit ;;
-    i*86:AROS:*:*)
-       echo ${UNAME_MACHINE}-pc-aros
-       exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-       "4"
-#else
-       ""
-#endif
-       ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-       printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-       printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-       { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-       echo c1-convex-bsd
-       exit ;;
-    c2*)
-       if getsysinfo -f scalar_acc
-       then echo c32-convex-bsd
-       else echo c2-convex-bsd
-       fi
-       exit ;;
-    c34*)
-       echo c34-convex-bsd
-       exit ;;
-    c38*)
-       echo c38-convex-bsd
-       exit ;;
-    c4*)
-       echo c4-convex-bsd
-       exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.h.in b/config.h.in
deleted file mode 100644 (file)
index e2fd99c..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Whether on mips arch */
-#undef ARCH_MIPS
-
-/* Canonical host string. */
-#undef CANONICAL_HOST
-
-/* Target Distribution */
-#undef DISTRIBUTION
-
-/* ACL available */
-#undef HAVE_ACL
-
-/* Define to 1 if you have the <acl/libacl.h> header file. */
-#undef HAVE_ACL_LIBACL_H
-
-/* AUDIT available */
-#undef HAVE_AUDIT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define if GTK is available */
-#undef HAVE_GTK
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <libaudit.h> header file. */
-#undef HAVE_LIBAUDIT_H
-
-/* Define if libcryptsetup is available */
-#undef HAVE_LIBCRYPTSETUP
-
-/* Have tcpwrap? */
-#undef HAVE_LIBWRAP
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* PAM available */
-#undef HAVE_PAM
-
-/* Define to 1 if you have the <security/pam_ext.h> header file. */
-#undef HAVE_SECURITY_PAM_EXT_H
-
-/* Define to 1 if you have the <security/pam_modules.h> header file. */
-#undef HAVE_SECURITY_PAM_MODULES_H
-
-/* Define to 1 if you have the <security/pam_modutil.h> header file. */
-#undef HAVE_SECURITY_PAM_MODUTIL_H
-
-/* Define if SELinux is available */
-#undef HAVE_SELINUX
-
-/* Define if /bin, /sbin aren't symlinks into /usr */
-#undef HAVE_SPLIT_USR
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* SysV init scripts and rcN.d links are supported. */
-#undef HAVE_SYSV_COMPAT
-
-/* Define to 1 if you have the <sys/acl.h> header file. */
-#undef HAVE_SYS_ACL_H
-
-/* Define to 1 if you have the <sys/capability.h> header file. */
-#undef HAVE_SYS_CAPABILITY_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define if XZ is available */
-#undef HAVE_XZ
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Target is ALTLinux */
-#undef TARGET_ALTLINUX
-
-/* Target is Ã…ngström */
-#undef TARGET_ANGSTROM
-
-/* Target is ArchLinux */
-#undef TARGET_ARCH
-
-/* Target is Debian */
-#undef TARGET_DEBIAN
-
-/* Target is Fedora/RHEL */
-#undef TARGET_FEDORA
-
-/* Target is Frugalware */
-#undef TARGET_FRUGALWARE
-
-/* Target is Gentoo */
-#undef TARGET_GENTOO
-
-/* Target is Mageia */
-#undef TARGET_MAGEIA
-
-/* Target is Mandriva */
-#undef TARGET_MANDRIVA
-
-/* Target is MeeGo */
-#undef TARGET_MEEGO
-
-/* Target is Slackware */
-#undef TARGET_SLACKWARE
-
-/* Target is openSUSE/SLE */
-#undef TARGET_SUSE
-
-/* Target is Ubuntu */
-#undef TARGET_UBUNTU
-
-/* GID of the 'tty' group */
-#undef TTY_GID
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
-/* Version number of package */
-#undef VERSION
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
diff --git a/config.sub b/config.sub
deleted file mode 100755 (executable)
index d6b6b3c..0000000
+++ /dev/null
@@ -1,1766 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-01-01'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#      CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )        # Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-       -sun*os*)
-               # Prevent following clause from handling this invalid input.
-               ;;
-       -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-       -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-       -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-       -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-       -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-       -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-       -apple | -axis | -knuth | -cray | -microblaze)
-               os=
-               basic_machine=$1
-               ;;
-       -bluegene*)
-               os=-cnk
-               ;;
-       -sim | -cisco | -oki | -wec | -winbond)
-               os=
-               basic_machine=$1
-               ;;
-       -scout)
-               ;;
-       -wrs)
-               os=-vxworks
-               basic_machine=$1
-               ;;
-       -chorusos*)
-               os=-chorusos
-               basic_machine=$1
-               ;;
-       -chorusrdb)
-               os=-chorusrdb
-               basic_machine=$1
-               ;;
-       -hiux*)
-               os=-hiuxwe2
-               ;;
-       -sco6)
-               os=-sco5v6
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco5)
-               os=-sco3.2v5
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco4)
-               os=-sco3.2v4
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2.[4-9]*)
-               os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco3.2v[4-9]*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco5v6*)
-               # Don't forget version if it is 3.2v4 or newer.
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -sco*)
-               os=-sco3.2v2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -udk*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -isc)
-               os=-isc2.2
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -clix*)
-               basic_machine=clipper-intergraph
-               ;;
-       -isc*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-               ;;
-       -lynx*)
-               os=-lynxos
-               ;;
-       -ptx*)
-               basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-               ;;
-       -windowsnt*)
-               os=`echo $os | sed -e 's/windowsnt/winnt/'`
-               ;;
-       -psos*)
-               os=-psos
-               ;;
-       -mint | -mint[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-       # Recognize the basic CPU types without company name.
-       # Some are omitted here because they have special meanings below.
-       1750a | 580 \
-       | a29k \
-       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-       | am33_2.0 \
-       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
-       | bfin \
-       | c4x | clipper \
-       | d10v | d30v | dlx | dsp16xx \
-       | epiphany \
-       | fido | fr30 | frv \
-       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-       | hexagon \
-       | i370 | i860 | i960 | ia64 \
-       | ip2k | iq2000 \
-       | le32 | le64 \
-       | lm32 \
-       | m32c | m32r | m32rle | m68000 | m68k | m88k \
-       | maxq | mb | microblaze | mcore | mep | metag \
-       | mips | mipsbe | mipseb | mipsel | mipsle \
-       | mips16 \
-       | mips64 | mips64el \
-       | mips64octeon | mips64octeonel \
-       | mips64orion | mips64orionel \
-       | mips64r5900 | mips64r5900el \
-       | mips64vr | mips64vrel \
-       | mips64vr4100 | mips64vr4100el \
-       | mips64vr4300 | mips64vr4300el \
-       | mips64vr5000 | mips64vr5000el \
-       | mips64vr5900 | mips64vr5900el \
-       | mipsisa32 | mipsisa32el \
-       | mipsisa32r2 | mipsisa32r2el \
-       | mipsisa64 | mipsisa64el \
-       | mipsisa64r2 | mipsisa64r2el \
-       | mipsisa64sb1 | mipsisa64sb1el \
-       | mipsisa64sr71k | mipsisa64sr71kel \
-       | mipstx39 | mipstx39el \
-       | mn10200 | mn10300 \
-       | moxie \
-       | mt \
-       | msp430 \
-       | nds32 | nds32le | nds32be \
-       | nios | nios2 \
-       | ns16k | ns32k \
-       | open8 \
-       | or32 \
-       | pdp10 | pdp11 | pj | pjl \
-       | powerpc | powerpc64 | powerpc64le | powerpcle \
-       | pyramid \
-       | rl78 | rx \
-       | score \
-       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-       | sh64 | sh64le \
-       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-       | spu \
-       | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-       | ubicom32 \
-       | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-       | we32k \
-       | x86 | xc16x | xstormy16 | xtensa \
-       | z8k | z80)
-               basic_machine=$basic_machine-unknown
-               ;;
-       c54x)
-               basic_machine=tic54x-unknown
-               ;;
-       c55x)
-               basic_machine=tic55x-unknown
-               ;;
-       c6x)
-               basic_machine=tic6x-unknown
-               ;;
-       m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-               basic_machine=$basic_machine-unknown
-               os=-none
-               ;;
-       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-               ;;
-       ms1)
-               basic_machine=mt-unknown
-               ;;
-
-       strongarm | thumb | xscale)
-               basic_machine=arm-unknown
-               ;;
-
-       xscaleeb)
-               basic_machine=armeb-unknown
-               ;;
-
-       xscaleel)
-               basic_machine=armel-unknown
-               ;;
-
-       # We use `pc' rather than `unknown'
-       # because (1) that's what they normally are, and
-       # (2) the word "unknown" tends to confuse beginning users.
-       i*86 | x86_64)
-         basic_machine=$basic_machine-pc
-         ;;
-       # Object if more than one company name word.
-       *-*-*)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-               exit 1
-               ;;
-       # Recognize the basic CPU types with company name.
-       580-* \
-       | a29k-* \
-       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-       | avr-* | avr32-* \
-       | be32-* | be64-* \
-       | bfin-* | bs2000-* \
-       | c[123]* | c30-* | [cjt]90-* | c4x-* \
-       | clipper-* | craynv-* | cydra-* \
-       | d10v-* | d30v-* | dlx-* \
-       | elxsi-* \
-       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-       | h8300-* | h8500-* \
-       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-       | hexagon-* \
-       | i*86-* | i860-* | i960-* | ia64-* \
-       | ip2k-* | iq2000-* \
-       | le32-* | le64-* \
-       | lm32-* \
-       | m32c-* | m32r-* | m32rle-* \
-       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-       | mips16-* \
-       | mips64-* | mips64el-* \
-       | mips64octeon-* | mips64octeonel-* \
-       | mips64orion-* | mips64orionel-* \
-       | mips64r5900-* | mips64r5900el-* \
-       | mips64vr-* | mips64vrel-* \
-       | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* \
-       | mips64vr5000-* | mips64vr5000el-* \
-       | mips64vr5900-* | mips64vr5900el-* \
-       | mipsisa32-* | mipsisa32el-* \
-       | mipsisa32r2-* | mipsisa32r2el-* \
-       | mipsisa64-* | mipsisa64el-* \
-       | mipsisa64r2-* | mipsisa64r2el-* \
-       | mipsisa64sb1-* | mipsisa64sb1el-* \
-       | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-       | mipstx39-* | mipstx39el-* \
-       | mmix-* \
-       | mt-* \
-       | msp430-* \
-       | nds32-* | nds32le-* | nds32be-* \
-       | nios-* | nios2-* \
-       | none-* | np1-* | ns16k-* | ns32k-* \
-       | open8-* \
-       | orion-* \
-       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-       | pyramid-* \
-       | rl78-* | romp-* | rs6000-* | rx-* \
-       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-       | sparclite-* \
-       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-       | tahoe-* \
-       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-       | tile*-* \
-       | tron-* \
-       | ubicom32-* \
-       | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-       | vax-* \
-       | we32k-* \
-       | x86-* | x86_64-* | xc16x-* | xps100-* \
-       | xstormy16-* | xtensa*-* \
-       | ymp-* \
-       | z8k-* | z80-*)
-               ;;
-       # Recognize the basic CPU types without company name, with glob match.
-       xtensa*)
-               basic_machine=$basic_machine-unknown
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.
-       386bsd)
-               basic_machine=i386-unknown
-               os=-bsd
-               ;;
-       3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-               basic_machine=m68000-att
-               ;;
-       3b*)
-               basic_machine=we32k-att
-               ;;
-       a29khif)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       abacus)
-               basic_machine=abacus-unknown
-               ;;
-       adobe68k)
-               basic_machine=m68010-adobe
-               os=-scout
-               ;;
-       alliant | fx80)
-               basic_machine=fx80-alliant
-               ;;
-       altos | altos3068)
-               basic_machine=m68k-altos
-               ;;
-       am29k)
-               basic_machine=a29k-none
-               os=-bsd
-               ;;
-       amd64)
-               basic_machine=x86_64-pc
-               ;;
-       amd64-*)
-               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       amdahl)
-               basic_machine=580-amdahl
-               os=-sysv
-               ;;
-       amiga | amiga-*)
-               basic_machine=m68k-unknown
-               ;;
-       amigaos | amigados)
-               basic_machine=m68k-unknown
-               os=-amigaos
-               ;;
-       amigaunix | amix)
-               basic_machine=m68k-unknown
-               os=-sysv4
-               ;;
-       apollo68)
-               basic_machine=m68k-apollo
-               os=-sysv
-               ;;
-       apollo68bsd)
-               basic_machine=m68k-apollo
-               os=-bsd
-               ;;
-       aros)
-               basic_machine=i386-pc
-               os=-aros
-               ;;
-       aux)
-               basic_machine=m68k-apple
-               os=-aux
-               ;;
-       balance)
-               basic_machine=ns32k-sequent
-               os=-dynix
-               ;;
-       blackfin)
-               basic_machine=bfin-unknown
-               os=-linux
-               ;;
-       blackfin-*)
-               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       bluegene*)
-               basic_machine=powerpc-ibm
-               os=-cnk
-               ;;
-       c54x-*)
-               basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       c55x-*)
-               basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       c6x-*)
-               basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       c90)
-               basic_machine=c90-cray
-               os=-unicos
-               ;;
-       cegcc)
-               basic_machine=arm-unknown
-               os=-cegcc
-               ;;
-       convex-c1)
-               basic_machine=c1-convex
-               os=-bsd
-               ;;
-       convex-c2)
-               basic_machine=c2-convex
-               os=-bsd
-               ;;
-       convex-c32)
-               basic_machine=c32-convex
-               os=-bsd
-               ;;
-       convex-c34)
-               basic_machine=c34-convex
-               os=-bsd
-               ;;
-       convex-c38)
-               basic_machine=c38-convex
-               os=-bsd
-               ;;
-       cray | j90)
-               basic_machine=j90-cray
-               os=-unicos
-               ;;
-       craynv)
-               basic_machine=craynv-cray
-               os=-unicosmp
-               ;;
-       cr16 | cr16-*)
-               basic_machine=cr16-unknown
-               os=-elf
-               ;;
-       crds | unos)
-               basic_machine=m68k-crds
-               ;;
-       crisv32 | crisv32-* | etraxfs*)
-               basic_machine=crisv32-axis
-               ;;
-       cris | cris-* | etrax*)
-               basic_machine=cris-axis
-               ;;
-       crx)
-               basic_machine=crx-unknown
-               os=-elf
-               ;;
-       da30 | da30-*)
-               basic_machine=m68k-da30
-               ;;
-       decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-               basic_machine=mips-dec
-               ;;
-       decsystem10* | dec10*)
-               basic_machine=pdp10-dec
-               os=-tops10
-               ;;
-       decsystem20* | dec20*)
-               basic_machine=pdp10-dec
-               os=-tops20
-               ;;
-       delta | 3300 | motorola-3300 | motorola-delta \
-             | 3300-motorola | delta-motorola)
-               basic_machine=m68k-motorola
-               ;;
-       delta88)
-               basic_machine=m88k-motorola
-               os=-sysv3
-               ;;
-       dicos)
-               basic_machine=i686-pc
-               os=-dicos
-               ;;
-       djgpp)
-               basic_machine=i586-pc
-               os=-msdosdjgpp
-               ;;
-       dpx20 | dpx20-*)
-               basic_machine=rs6000-bull
-               os=-bosx
-               ;;
-       dpx2* | dpx2*-bull)
-               basic_machine=m68k-bull
-               os=-sysv3
-               ;;
-       ebmon29k)
-               basic_machine=a29k-amd
-               os=-ebmon
-               ;;
-       elxsi)
-               basic_machine=elxsi-elxsi
-               os=-bsd
-               ;;
-       encore | umax | mmax)
-               basic_machine=ns32k-encore
-               ;;
-       es1800 | OSE68k | ose68k | ose | OSE)
-               basic_machine=m68k-ericsson
-               os=-ose
-               ;;
-       fx2800)
-               basic_machine=i860-alliant
-               ;;
-       genix)
-               basic_machine=ns32k-ns
-               ;;
-       gmicro)
-               basic_machine=tron-gmicro
-               os=-sysv
-               ;;
-       go32)
-               basic_machine=i386-pc
-               os=-go32
-               ;;
-       h3050r* | hiux*)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       h8300hms)
-               basic_machine=h8300-hitachi
-               os=-hms
-               ;;
-       h8300xray)
-               basic_machine=h8300-hitachi
-               os=-xray
-               ;;
-       h8500hms)
-               basic_machine=h8500-hitachi
-               os=-hms
-               ;;
-       harris)
-               basic_machine=m88k-harris
-               os=-sysv3
-               ;;
-       hp300-*)
-               basic_machine=m68k-hp
-               ;;
-       hp300bsd)
-               basic_machine=m68k-hp
-               os=-bsd
-               ;;
-       hp300hpux)
-               basic_machine=m68k-hp
-               os=-hpux
-               ;;
-       hp3k9[0-9][0-9] | hp9[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k2[0-9][0-9] | hp9k31[0-9])
-               basic_machine=m68000-hp
-               ;;
-       hp9k3[2-9][0-9])
-               basic_machine=m68k-hp
-               ;;
-       hp9k6[0-9][0-9] | hp6[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hp9k7[0-79][0-9] | hp7[0-79][0-9])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k78[0-9] | hp78[0-9])
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-               # FIXME: really hppa2.0-hp
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][13679] | hp8[0-9][13679])
-               basic_machine=hppa1.1-hp
-               ;;
-       hp9k8[0-9][0-9] | hp8[0-9][0-9])
-               basic_machine=hppa1.0-hp
-               ;;
-       hppa-next)
-               os=-nextstep3
-               ;;
-       hppaosf)
-               basic_machine=hppa1.1-hp
-               os=-osf
-               ;;
-       hppro)
-               basic_machine=hppa1.1-hp
-               os=-proelf
-               ;;
-       i370-ibm* | ibm*)
-               basic_machine=i370-ibm
-               ;;
-       i*86v32)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv32
-               ;;
-       i*86v4*)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv4
-               ;;
-       i*86v)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-sysv
-               ;;
-       i*86sol2)
-               basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-               os=-solaris2
-               ;;
-       i386mach)
-               basic_machine=i386-mach
-               os=-mach
-               ;;
-       i386-vsta | vsta)
-               basic_machine=i386-unknown
-               os=-vsta
-               ;;
-       iris | iris4d)
-               basic_machine=mips-sgi
-               case $os in
-                   -irix*)
-                       ;;
-                   *)
-                       os=-irix4
-                       ;;
-               esac
-               ;;
-       isi68 | isi)
-               basic_machine=m68k-isi
-               os=-sysv
-               ;;
-       m68knommu)
-               basic_machine=m68k-unknown
-               os=-linux
-               ;;
-       m68knommu-*)
-               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       m88k-omron*)
-               basic_machine=m88k-omron
-               ;;
-       magnum | m3230)
-               basic_machine=mips-mips
-               os=-sysv
-               ;;
-       merlin)
-               basic_machine=ns32k-utek
-               os=-sysv
-               ;;
-       microblaze)
-               basic_machine=microblaze-xilinx
-               ;;
-       mingw32)
-               basic_machine=i386-pc
-               os=-mingw32
-               ;;
-       mingw32ce)
-               basic_machine=arm-unknown
-               os=-mingw32ce
-               ;;
-       miniframe)
-               basic_machine=m68000-convergent
-               ;;
-       *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-               basic_machine=m68k-atari
-               os=-mint
-               ;;
-       mips3*-*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-               ;;
-       mips3*)
-               basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-               ;;
-       monitor)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       morphos)
-               basic_machine=powerpc-unknown
-               os=-morphos
-               ;;
-       msdos)
-               basic_machine=i386-pc
-               os=-msdos
-               ;;
-       ms1-*)
-               basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-               ;;
-       msys)
-               basic_machine=i386-pc
-               os=-msys
-               ;;
-       mvs)
-               basic_machine=i370-ibm
-               os=-mvs
-               ;;
-       nacl)
-               basic_machine=le32-unknown
-               os=-nacl
-               ;;
-       ncr3000)
-               basic_machine=i486-ncr
-               os=-sysv4
-               ;;
-       netbsd386)
-               basic_machine=i386-unknown
-               os=-netbsd
-               ;;
-       netwinder)
-               basic_machine=armv4l-rebel
-               os=-linux
-               ;;
-       news | news700 | news800 | news900)
-               basic_machine=m68k-sony
-               os=-newsos
-               ;;
-       news1000)
-               basic_machine=m68030-sony
-               os=-newsos
-               ;;
-       news-3600 | risc-news)
-               basic_machine=mips-sony
-               os=-newsos
-               ;;
-       necv70)
-               basic_machine=v70-nec
-               os=-sysv
-               ;;
-       next | m*-next )
-               basic_machine=m68k-next
-               case $os in
-                   -nextstep* )
-                       ;;
-                   -ns2*)
-                     os=-nextstep2
-                       ;;
-                   *)
-                     os=-nextstep3
-                       ;;
-               esac
-               ;;
-       nh3000)
-               basic_machine=m68k-harris
-               os=-cxux
-               ;;
-       nh[45]000)
-               basic_machine=m88k-harris
-               os=-cxux
-               ;;
-       nindy960)
-               basic_machine=i960-intel
-               os=-nindy
-               ;;
-       mon960)
-               basic_machine=i960-intel
-               os=-mon960
-               ;;
-       nonstopux)
-               basic_machine=mips-compaq
-               os=-nonstopux
-               ;;
-       np1)
-               basic_machine=np1-gould
-               ;;
-       neo-tandem)
-               basic_machine=neo-tandem
-               ;;
-       nse-tandem)
-               basic_machine=nse-tandem
-               ;;
-       nsr-tandem)
-               basic_machine=nsr-tandem
-               ;;
-       op50n-* | op60c-*)
-               basic_machine=hppa1.1-oki
-               os=-proelf
-               ;;
-       openrisc | openrisc-*)
-               basic_machine=or32-unknown
-               ;;
-       os400)
-               basic_machine=powerpc-ibm
-               os=-os400
-               ;;
-       OSE68000 | ose68000)
-               basic_machine=m68000-ericsson
-               os=-ose
-               ;;
-       os68k)
-               basic_machine=m68k-none
-               os=-os68k
-               ;;
-       pa-hitachi)
-               basic_machine=hppa1.1-hitachi
-               os=-hiuxwe2
-               ;;
-       paragon)
-               basic_machine=i860-intel
-               os=-osf
-               ;;
-       parisc)
-               basic_machine=hppa-unknown
-               os=-linux
-               ;;
-       parisc-*)
-               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-               os=-linux
-               ;;
-       pbd)
-               basic_machine=sparc-tti
-               ;;
-       pbb)
-               basic_machine=m68k-tti
-               ;;
-       pc532 | pc532-*)
-               basic_machine=ns32k-pc532
-               ;;
-       pc98)
-               basic_machine=i386-pc
-               ;;
-       pc98-*)
-               basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentium | p5 | k5 | k6 | nexgen | viac3)
-               basic_machine=i586-pc
-               ;;
-       pentiumpro | p6 | 6x86 | athlon | athlon_*)
-               basic_machine=i686-pc
-               ;;
-       pentiumii | pentium2 | pentiumiii | pentium3)
-               basic_machine=i686-pc
-               ;;
-       pentium4)
-               basic_machine=i786-pc
-               ;;
-       pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-               basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumpro-* | p6-* | 6x86-* | athlon-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pentium4-*)
-               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       pn)
-               basic_machine=pn-gould
-               ;;
-       power)  basic_machine=power-ibm
-               ;;
-       ppc | ppcbe)    basic_machine=powerpc-unknown
-               ;;
-       ppc-* | ppcbe-*)
-               basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppcle | powerpclittle | ppc-le | powerpc-little)
-               basic_machine=powerpcle-unknown
-               ;;
-       ppcle-* | powerpclittle-*)
-               basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppc64)  basic_machine=powerpc64-unknown
-               ;;
-       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-               basic_machine=powerpc64le-unknown
-               ;;
-       ppc64le-* | powerpc64little-*)
-               basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       ps2)
-               basic_machine=i386-ibm
-               ;;
-       pw32)
-               basic_machine=i586-unknown
-               os=-pw32
-               ;;
-       rdos)
-               basic_machine=i386-pc
-               os=-rdos
-               ;;
-       rom68k)
-               basic_machine=m68k-rom68k
-               os=-coff
-               ;;
-       rm[46]00)
-               basic_machine=mips-siemens
-               ;;
-       rtpc | rtpc-*)
-               basic_machine=romp-ibm
-               ;;
-       s390 | s390-*)
-               basic_machine=s390-ibm
-               ;;
-       s390x | s390x-*)
-               basic_machine=s390x-ibm
-               ;;
-       sa29200)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       sb1)
-               basic_machine=mipsisa64sb1-unknown
-               ;;
-       sb1el)
-               basic_machine=mipsisa64sb1el-unknown
-               ;;
-       sde)
-               basic_machine=mipsisa32-sde
-               os=-elf
-               ;;
-       sei)
-               basic_machine=mips-sei
-               os=-seiux
-               ;;
-       sequent)
-               basic_machine=i386-sequent
-               ;;
-       sh)
-               basic_machine=sh-hitachi
-               os=-hms
-               ;;
-       sh5el)
-               basic_machine=sh5le-unknown
-               ;;
-       sh64)
-               basic_machine=sh64-unknown
-               ;;
-       sparclite-wrs | simso-wrs)
-               basic_machine=sparclite-wrs
-               os=-vxworks
-               ;;
-       sps7)
-               basic_machine=m68k-bull
-               os=-sysv2
-               ;;
-       spur)
-               basic_machine=spur-unknown
-               ;;
-       st2000)
-               basic_machine=m68k-tandem
-               ;;
-       stratus)
-               basic_machine=i860-stratus
-               os=-sysv4
-               ;;
-       strongarm-* | thumb-*)
-               basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-               ;;
-       sun2)
-               basic_machine=m68000-sun
-               ;;
-       sun2os3)
-               basic_machine=m68000-sun
-               os=-sunos3
-               ;;
-       sun2os4)
-               basic_machine=m68000-sun
-               os=-sunos4
-               ;;
-       sun3os3)
-               basic_machine=m68k-sun
-               os=-sunos3
-               ;;
-       sun3os4)
-               basic_machine=m68k-sun
-               os=-sunos4
-               ;;
-       sun4os3)
-               basic_machine=sparc-sun
-               os=-sunos3
-               ;;
-       sun4os4)
-               basic_machine=sparc-sun
-               os=-sunos4
-               ;;
-       sun4sol2)
-               basic_machine=sparc-sun
-               os=-solaris2
-               ;;
-       sun3 | sun3-*)
-               basic_machine=m68k-sun
-               ;;
-       sun4)
-               basic_machine=sparc-sun
-               ;;
-       sun386 | sun386i | roadrunner)
-               basic_machine=i386-sun
-               ;;
-       sv1)
-               basic_machine=sv1-cray
-               os=-unicos
-               ;;
-       symmetry)
-               basic_machine=i386-sequent
-               os=-dynix
-               ;;
-       t3e)
-               basic_machine=alphaev5-cray
-               os=-unicos
-               ;;
-       t90)
-               basic_machine=t90-cray
-               os=-unicos
-               ;;
-       tile*)
-               basic_machine=$basic_machine-unknown
-               os=-linux-gnu
-               ;;
-       tx39)
-               basic_machine=mipstx39-unknown
-               ;;
-       tx39el)
-               basic_machine=mipstx39el-unknown
-               ;;
-       toad1)
-               basic_machine=pdp10-xkl
-               os=-tops20
-               ;;
-       tower | tower-32)
-               basic_machine=m68k-ncr
-               ;;
-       tpf)
-               basic_machine=s390x-ibm
-               os=-tpf
-               ;;
-       udi29k)
-               basic_machine=a29k-amd
-               os=-udi
-               ;;
-       ultra3)
-               basic_machine=a29k-nyu
-               os=-sym1
-               ;;
-       v810 | necv810)
-               basic_machine=v810-nec
-               os=-none
-               ;;
-       vaxv)
-               basic_machine=vax-dec
-               os=-sysv
-               ;;
-       vms)
-               basic_machine=vax-dec
-               os=-vms
-               ;;
-       vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
-       vxworks960)
-               basic_machine=i960-wrs
-               os=-vxworks
-               ;;
-       vxworks68)
-               basic_machine=m68k-wrs
-               os=-vxworks
-               ;;
-       vxworks29k)
-               basic_machine=a29k-wrs
-               os=-vxworks
-               ;;
-       w65*)
-               basic_machine=w65-wdc
-               os=-none
-               ;;
-       w89k-*)
-               basic_machine=hppa1.1-winbond
-               os=-proelf
-               ;;
-       xbox)
-               basic_machine=i686-pc
-               os=-mingw32
-               ;;
-       xps | xps100)
-               basic_machine=xps100-honeywell
-               ;;
-       xscale-* | xscalee[bl]-*)
-               basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-               ;;
-       ymp)
-               basic_machine=ymp-cray
-               os=-unicos
-               ;;
-       z8k-*-coff)
-               basic_machine=z8k-unknown
-               os=-sim
-               ;;
-       z80-*-coff)
-               basic_machine=z80-unknown
-               os=-sim
-               ;;
-       none)
-               basic_machine=none-none
-               os=-none
-               ;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-       w89k)
-               basic_machine=hppa1.1-winbond
-               ;;
-       op50n)
-               basic_machine=hppa1.1-oki
-               ;;
-       op60c)
-               basic_machine=hppa1.1-oki
-               ;;
-       romp)
-               basic_machine=romp-ibm
-               ;;
-       mmix)
-               basic_machine=mmix-knuth
-               ;;
-       rs6000)
-               basic_machine=rs6000-ibm
-               ;;
-       vax)
-               basic_machine=vax-dec
-               ;;
-       pdp10)
-               # there are many clones, so DEC is not a safe bet
-               basic_machine=pdp10-unknown
-               ;;
-       pdp11)
-               basic_machine=pdp11-dec
-               ;;
-       we32k)
-               basic_machine=we32k-att
-               ;;
-       sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-               basic_machine=sh-unknown
-               ;;
-       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-               basic_machine=sparc-sun
-               ;;
-       cydra)
-               basic_machine=cydra-cydrome
-               ;;
-       orion)
-               basic_machine=orion-highlevel
-               ;;
-       orion105)
-               basic_machine=clipper-highlevel
-               ;;
-       mac | mpw | mac-mpw)
-               basic_machine=m68k-apple
-               ;;
-       pmac | pmac-mpw)
-               basic_machine=powerpc-apple
-               ;;
-       *-unknown)
-               # Make sure to match an already-canonicalized machine name.
-               ;;
-       *)
-               echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-               exit 1
-               ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-       *-digital*)
-               basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-               ;;
-       *-commodore*)
-               basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-               ;;
-       *)
-               ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-       # First match some system type aliases
-       # that might get confused with valid system types.
-       # -solaris* is a basic system type, with this one exception.
-       -auroraux)
-               os=-auroraux
-               ;;
-       -solaris1 | -solaris1.*)
-               os=`echo $os | sed -e 's|solaris1|sunos4|'`
-               ;;
-       -solaris)
-               os=-solaris2
-               ;;
-       -svr4*)
-               os=-sysv4
-               ;;
-       -unixware*)
-               os=-sysv4.2uw
-               ;;
-       -gnu/linux*)
-               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-               ;;
-       # First accept the basic system types.
-       # The portable systems comes first.
-       # Each alternative MUST END IN A *, to match a version number.
-       # -sysv* is not here because it comes later, after sysvr4.
-       -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-             | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-             | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-             | -sym* | -kopensolaris* \
-             | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-             | -aos* | -aros* \
-             | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-             | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-             | -openbsd* | -solidbsd* \
-             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-             | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-             | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-             | -chorusos* | -chorusrdb* | -cegcc* \
-             | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -linux-gnu* | -linux-android* \
-             | -linux-newlib* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
-             | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-             | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-       # Remember, each alternative MUST END IN *, to match a version number.
-               ;;
-       -qnx*)
-               case $basic_machine in
-                   x86-* | i*86-*)
-                       ;;
-                   *)
-                       os=-nto$os
-                       ;;
-               esac
-               ;;
-       -nto-qnx*)
-               ;;
-       -nto*)
-               os=`echo $os | sed -e 's|nto|nto-qnx|'`
-               ;;
-       -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-             | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-               ;;
-       -mac*)
-               os=`echo $os | sed -e 's|mac|macos|'`
-               ;;
-       -linux-dietlibc)
-               os=-linux-dietlibc
-               ;;
-       -linux*)
-               os=`echo $os | sed -e 's|linux|linux-gnu|'`
-               ;;
-       -sunos5*)
-               os=`echo $os | sed -e 's|sunos5|solaris2|'`
-               ;;
-       -sunos6*)
-               os=`echo $os | sed -e 's|sunos6|solaris3|'`
-               ;;
-       -opened*)
-               os=-openedition
-               ;;
-       -os400*)
-               os=-os400
-               ;;
-       -wince*)
-               os=-wince
-               ;;
-       -osfrose*)
-               os=-osfrose
-               ;;
-       -osf*)
-               os=-osf
-               ;;
-       -utek*)
-               os=-bsd
-               ;;
-       -dynix*)
-               os=-bsd
-               ;;
-       -acis*)
-               os=-aos
-               ;;
-       -atheos*)
-               os=-atheos
-               ;;
-       -syllable*)
-               os=-syllable
-               ;;
-       -386bsd)
-               os=-bsd
-               ;;
-       -ctix* | -uts*)
-               os=-sysv
-               ;;
-       -nova*)
-               os=-rtmk-nova
-               ;;
-       -ns2 )
-               os=-nextstep2
-               ;;
-       -nsk*)
-               os=-nsk
-               ;;
-       # Preserve the version number of sinix5.
-       -sinix5.*)
-               os=`echo $os | sed -e 's|sinix|sysv|'`
-               ;;
-       -sinix*)
-               os=-sysv4
-               ;;
-       -tpf*)
-               os=-tpf
-               ;;
-       -triton*)
-               os=-sysv3
-               ;;
-       -oss*)
-               os=-sysv3
-               ;;
-       -svr4)
-               os=-sysv4
-               ;;
-       -svr3)
-               os=-sysv3
-               ;;
-       -sysvr4)
-               os=-sysv4
-               ;;
-       # This must come after -sysvr4.
-       -sysv*)
-               ;;
-       -ose*)
-               os=-ose
-               ;;
-       -es1800*)
-               os=-ose
-               ;;
-       -xenix)
-               os=-xenix
-               ;;
-       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-               os=-mint
-               ;;
-       -aros*)
-               os=-aros
-               ;;
-       -kaos*)
-               os=-kaos
-               ;;
-       -zvmoe)
-               os=-zvmoe
-               ;;
-       -dicos*)
-               os=-dicos
-               ;;
-       -nacl*)
-               ;;
-       -none)
-               ;;
-       *)
-               # Get rid of the `-' at the beginning of $os.
-               os=`echo $os | sed 's/[^-]*-//'`
-               echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-               exit 1
-               ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-       score-*)
-               os=-elf
-               ;;
-       spu-*)
-               os=-elf
-               ;;
-       *-acorn)
-               os=-riscix1.2
-               ;;
-       arm*-rebel)
-               os=-linux
-               ;;
-       arm*-semi)
-               os=-aout
-               ;;
-       c4x-* | tic4x-*)
-               os=-coff
-               ;;
-       tic54x-*)
-               os=-coff
-               ;;
-       tic55x-*)
-               os=-coff
-               ;;
-       tic6x-*)
-               os=-coff
-               ;;
-       # This must come before the *-dec entry.
-       pdp10-*)
-               os=-tops20
-               ;;
-       pdp11-*)
-               os=-none
-               ;;
-       *-dec | vax-*)
-               os=-ultrix4.2
-               ;;
-       m68*-apollo)
-               os=-domain
-               ;;
-       i386-sun)
-               os=-sunos4.0.2
-               ;;
-       m68000-sun)
-               os=-sunos3
-               ;;
-       m68*-cisco)
-               os=-aout
-               ;;
-       mep-*)
-               os=-elf
-               ;;
-       mips*-cisco)
-               os=-elf
-               ;;
-       mips*-*)
-               os=-elf
-               ;;
-       or32-*)
-               os=-coff
-               ;;
-       *-tti)  # must be before sparc entry or we get the wrong os.
-               os=-sysv3
-               ;;
-       sparc-* | *-sun)
-               os=-sunos4.1.1
-               ;;
-       *-be)
-               os=-beos
-               ;;
-       *-haiku)
-               os=-haiku
-               ;;
-       *-ibm)
-               os=-aix
-               ;;
-       *-knuth)
-               os=-mmixware
-               ;;
-       *-wec)
-               os=-proelf
-               ;;
-       *-winbond)
-               os=-proelf
-               ;;
-       *-oki)
-               os=-proelf
-               ;;
-       *-hp)
-               os=-hpux
-               ;;
-       *-hitachi)
-               os=-hiux
-               ;;
-       i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-               os=-sysv
-               ;;
-       *-cbm)
-               os=-amigaos
-               ;;
-       *-dg)
-               os=-dgux
-               ;;
-       *-dolphin)
-               os=-sysv3
-               ;;
-       m68k-ccur)
-               os=-rtu
-               ;;
-       m88k-omron*)
-               os=-luna
-               ;;
-       *-next )
-               os=-nextstep
-               ;;
-       *-sequent)
-               os=-ptx
-               ;;
-       *-crds)
-               os=-unos
-               ;;
-       *-ns)
-               os=-genix
-               ;;
-       i370-*)
-               os=-mvs
-               ;;
-       *-next)
-               os=-nextstep3
-               ;;
-       *-gould)
-               os=-sysv
-               ;;
-       *-highlevel)
-               os=-bsd
-               ;;
-       *-encore)
-               os=-bsd
-               ;;
-       *-sgi)
-               os=-irix
-               ;;
-       *-siemens)
-               os=-sysv4
-               ;;
-       *-masscomp)
-               os=-rtu
-               ;;
-       f30[01]-fujitsu | f700-fujitsu)
-               os=-uxpv
-               ;;
-       *-rom68k)
-               os=-coff
-               ;;
-       *-*bug)
-               os=-coff
-               ;;
-       *-apple)
-               os=-macos
-               ;;
-       *-atari*)
-               os=-mint
-               ;;
-       *)
-               os=-none
-               ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-       *-unknown)
-               case $os in
-                       -riscix*)
-                               vendor=acorn
-                               ;;
-                       -sunos*)
-                               vendor=sun
-                               ;;
-                       -cnk*|-aix*)
-                               vendor=ibm
-                               ;;
-                       -beos*)
-                               vendor=be
-                               ;;
-                       -hpux*)
-                               vendor=hp
-                               ;;
-                       -mpeix*)
-                               vendor=hp
-                               ;;
-                       -hiux*)
-                               vendor=hitachi
-                               ;;
-                       -unos*)
-                               vendor=crds
-                               ;;
-                       -dgux*)
-                               vendor=dg
-                               ;;
-                       -luna*)
-                               vendor=omron
-                               ;;
-                       -genix*)
-                               vendor=ns
-                               ;;
-                       -mvs* | -opened*)
-                               vendor=ibm
-                               ;;
-                       -os400*)
-                               vendor=ibm
-                               ;;
-                       -ptx*)
-                               vendor=sequent
-                               ;;
-                       -tpf*)
-                               vendor=ibm
-                               ;;
-                       -vxsim* | -vxworks* | -windiss*)
-                               vendor=wrs
-                               ;;
-                       -aux*)
-                               vendor=apple
-                               ;;
-                       -hms*)
-                               vendor=hitachi
-                               ;;
-                       -mpw* | -macos*)
-                               vendor=apple
-                               ;;
-                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-                               vendor=atari
-                               ;;
-                       -vos*)
-                               vendor=stratus
-                               ;;
-               esac
-               basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-               ;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure b/configure
deleted file mode 100755 (executable)
index 70ce3da..0000000
--- a/configure
+++ /dev/null
@@ -1,18833 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for systemd 43.
-#
-# Report bugs to <systemd-devel@lists.freedesktop.org>.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-       expr "X$arg" : "X\\(.*\\)$as_nl";
-       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-        /*)
-          for as_base in sh bash ksh sh5; do
-            # Try only shells that exist, to save several forks.
-            as_shell=$as_dir/$as_base
-            if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-                   { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-                  if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-          done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-             { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-       # neutralization value for shells without unset; and this also
-       # works around shells that cannot unset nonexistent variables.
-       # Preserve -v and -x to the replacement shell.
-       BASH_ENV=/dev/null
-       ENV=/dev/null
-       (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-       export CONFIG_SHELL
-       case $- in # ((((
-         *v*x* | *x*v* ) as_opts=-vx ;;
-         *v* ) as_opts=-v ;;
-         *x* ) as_opts=-x ;;
-         * ) as_opts= ;;
-       esac
-       exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: systemd-devel@lists.freedesktop.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='        ';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-       test -d "$1/.";
-      else
-       case $1 in #(
-       -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-as_awk_strverscmp='
-  # Use only awk features that work with 7th edition Unix awk (1978).
-  # My, what an old awk you have, Mr. Solaris!
-  END {
-    while (length(v1) && length(v2)) {
-      # Set d1 to be the next thing to compare from v1, and likewise for d2.
-      # Normally this is a single character, but if v1 and v2 contain digits,
-      # compare them as integers and fractions as strverscmp does.
-      if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) {
-       # Split v1 and v2 into their leading digit string components d1 and d2,
-       # and advance v1 and v2 past the leading digit strings.
-       for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue
-       for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue
-       d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1)
-       d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1)
-       if (d1 ~ /^0/) {
-         if (d2 ~ /^0/) {
-           # Compare two fractions.
-           while (d1 ~ /^0/ && d2 ~ /^0/) {
-             d1 = substr(d1, 2); len1--
-             d2 = substr(d2, 2); len2--
-           }
-           if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) {
-             # The two components differ in length, and the common prefix
-             # contains only leading zeros.  Consider the longer to be less.
-             d1 = -len1
-             d2 = -len2
-           } else {
-             # Otherwise, compare as strings.
-             d1 = "x" d1
-             d2 = "x" d2
-           }
-         } else {
-           # A fraction is less than an integer.
-           exit 1
-         }
-       } else {
-         if (d2 ~ /^0/) {
-           # An integer is greater than a fraction.
-           exit 2
-         } else {
-           # Compare two integers.
-           d1 += 0
-           d2 += 0
-         }
-       }
-      } else {
-       # The normal case, without worrying about digits.
-       d1 = substr(v1, 1, 1); v1 = substr(v1, 2)
-       d2 = substr(v2, 1, 1); v2 = substr(v2, 2)
-      }
-      if (d1 < d2) exit 1
-      if (d1 > d2) exit 2
-    }
-    # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10),
-    # which mishandles some comparisons of empty strings to integers.
-    if (length(v2)) exit 1
-    if (length(v1)) exit 2
-  }
-'
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='systemd'
-PACKAGE_TARNAME='systemd'
-PACKAGE_VERSION='43'
-PACKAGE_STRING='systemd 43'
-PACKAGE_BUGREPORT='systemd-devel@lists.freedesktop.org'
-PACKAGE_URL=''
-
-ac_unique_file="src/main.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_default_prefix=/usr
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-rootlibdir
-rootprefix
-pamlibdir
-udevrulesdir
-dbusinterfacedir
-dbussystemservicedir
-dbussessionservicedir
-dbuspolicydir
-HAVE_SYSV_COMPAT_FALSE
-HAVE_SYSV_COMPAT_TRUE
-HAVE_PLYMOUTH_FALSE
-HAVE_PLYMOUTH_TRUE
-TARGET_MAGEIA_FALSE
-TARGET_MAGEIA_TRUE
-TARGET_ANGSTROM_FALSE
-TARGET_ANGSTROM_TRUE
-TARGET_MEEGO_FALSE
-TARGET_MEEGO_TRUE
-TARGET_MANDRIVA_FALSE
-TARGET_MANDRIVA_TRUE
-TARGET_ALTLINUX_FALSE
-TARGET_ALTLINUX_TRUE
-TARGET_FRUGALWARE_FALSE
-TARGET_FRUGALWARE_TRUE
-TARGET_SLACKWARE_FALSE
-TARGET_SLACKWARE_TRUE
-TARGET_GENTOO_FALSE
-TARGET_GENTOO_TRUE
-TARGET_ARCH_FALSE
-TARGET_ARCH_TRUE
-TARGET_DEBIAN_OR_UBUNTU_FALSE
-TARGET_DEBIAN_OR_UBUNTU_TRUE
-TARGET_UBUNTU_FALSE
-TARGET_UBUNTU_TRUE
-TARGET_DEBIAN_FALSE
-TARGET_DEBIAN_TRUE
-TARGET_SUSE_FALSE
-TARGET_SUSE_TRUE
-TARGET_FEDORA_FALSE
-TARGET_FEDORA_TRUE
-M4_DEFINES
-SYSTEM_SYSVRCND_PATH
-SYSTEM_SYSVINIT_PATH
-M4
-HAVE_XSLTPROC_FALSE
-HAVE_XSLTPROC_TRUE
-XSLTPROC
-HAVE_VALAC_FALSE
-HAVE_VALAC_TRUE
-VAPIDIR
-VALAC
-LIBNOTIFY_LIBS
-LIBNOTIFY_CFLAGS
-HAVE_GTK_FALSE
-HAVE_GTK_TRUE
-GTK_LIBS
-GTK_CFLAGS
-ENABLE_MANPAGES_FALSE
-ENABLE_MANPAGES_TRUE
-ENABLE_COREDUMP_FALSE
-ENABLE_COREDUMP_TRUE
-ENABLE_LOCALED_FALSE
-ENABLE_LOCALED_TRUE
-ENABLE_TIMEDATED_FALSE
-ENABLE_TIMEDATED_TRUE
-ENABLE_HOSTNAMED_FALSE
-ENABLE_HOSTNAMED_TRUE
-ENABLE_LOGIND_FALSE
-ENABLE_LOGIND_TRUE
-ENABLE_RANDOMSEED_FALSE
-ENABLE_RANDOMSEED_TRUE
-ENABLE_QUOTACHECK_FALSE
-ENABLE_QUOTACHECK_TRUE
-ENABLE_READAHEAD_FALSE
-ENABLE_READAHEAD_TRUE
-ENABLE_VCONSOLE_FALSE
-ENABLE_VCONSOLE_TRUE
-ENABLE_BINFMT_FALSE
-ENABLE_BINFMT_TRUE
-HAVE_LIBCRYPTSETUP_FALSE
-HAVE_LIBCRYPTSETUP_TRUE
-LIBCRYPTSETUP_LIBS
-LIBCRYPTSETUP_CFLAGS
-AUDIT_LIBS
-HAVE_ACL_FALSE
-HAVE_ACL_TRUE
-ACL_LIBS
-HAVE_PAM_FALSE
-HAVE_PAM_TRUE
-PAM_LIBS
-LIBWRAP_LIBS
-HAVE_XZ_FALSE
-HAVE_XZ_TRUE
-XZ_LIBS
-XZ_CFLAGS
-HAVE_SELINUX_FALSE
-HAVE_SELINUX_TRUE
-SELINUX_LIBS
-SELINUX_CFLAGS
-KMOD_LIBS
-KMOD_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-UDEV_LIBS
-UDEV_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
-CAP_LIBS
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-LIBTOOL
-GPERF
-STRINGS
-OBJCOPY
-SED
-LN_S
-GETTEXT_PACKAGE
-DATADIRNAME
-ALL_LINGUAS
-INTLTOOL_PERL
-GMSGFMT
-MSGFMT
-MSGMERGE
-XGETTEXT
-INTLTOOL_POLICY_RULE
-INTLTOOL_SERVICE_RULE
-INTLTOOL_THEME_RULE
-INTLTOOL_SCHEMAS_RULE
-INTLTOOL_CAVES_RULE
-INTLTOOL_XML_NOMERGE_RULE
-INTLTOOL_XML_RULE
-INTLTOOL_KBD_RULE
-INTLTOOL_XAM_RULE
-INTLTOOL_UI_RULE
-INTLTOOL_SOUNDLIST_RULE
-INTLTOOL_SHEET_RULE
-INTLTOOL_SERVER_RULE
-INTLTOOL_PONG_RULE
-INTLTOOL_OAF_RULE
-INTLTOOL_PROP_RULE
-INTLTOOL_KEYS_RULE
-INTLTOOL_DIRECTORY_RULE
-INTLTOOL_DESKTOP_RULE
-INTLTOOL_EXTRACT
-INTLTOOL_MERGE
-INTLTOOL_UPDATE
-USE_NLS
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-EGREP
-GREP
-CPP
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_largefile
-enable_dependency_tracking
-enable_silent_rules
-enable_nls
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-enable_selinux
-enable_xz
-enable_tcpwrap
-enable_pam
-enable_acl
-enable_audit
-enable_libcryptsetup
-enable_binfmt
-enable_vconsole
-enable_readahead
-enable_quotacheck
-enable_randomseed
-enable_logind
-enable_hostnamed
-enable_timedated
-enable_localed
-enable_coredump
-enable_manpages
-enable_gtk
-with_distro
-with_sysvinit_path
-with_sysvrcd_path
-with_tty_gid
-enable_plymouth
-with_dbuspolicydir
-with_dbussessionservicedir
-with_dbussystemservicedir
-with_dbusinterfacedir
-with_udevrulesdir
-with_rootprefix
-with_rootlibdir
-with_pamlibdir
-enable_split_usr
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
-UDEV_CFLAGS
-UDEV_LIBS
-DBUS_CFLAGS
-DBUS_LIBS
-KMOD_CFLAGS
-KMOD_LIBS
-SELINUX_CFLAGS
-SELINUX_LIBS
-XZ_CFLAGS
-XZ_LIBS
-LIBCRYPTSETUP_CFLAGS
-LIBCRYPTSETUP_LIBS
-GTK_CFLAGS
-GTK_LIBS
-LIBNOTIFY_CFLAGS
-LIBNOTIFY_LIBS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-        ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
-               datadir sysconfdir sharedstatedir localstatedir includedir \
-               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-               libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_myself" : 'X\(//\)[^/]' \| \
-        X"$as_myself" : 'X\(//\)$' \| \
-        X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-       cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-       pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures systemd 43 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/systemd]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of systemd 43:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-largefile     omit support for large files
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-nls           do not use Native Language Support
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --disable-selinux       Disable optional SELINUX support
-  --disable-xz            Disable optional XZ support
-  --disable-tcpwrap       Disable optional TCP wrappers support
-  --disable-pam           Disable optional PAM support
-  --disable-acl           Disable optional ACL support
-  --disable-audit         Disable optional AUDIT support
-  --disable-libcryptsetup disable libcryptsetup tools
-  --disable-binfmt        disable binfmt tool
-  --disable-vconsole      disable vconsole tool
-  --disable-readahead     disable readahead tools
-  --disable-quotacheck    disable quotacheck tools
-  --disable-randomseed    disable randomseed tools
-  --disable-logind        disable login daemon
-  --disable-hostnamed     disable hostname daemon
-  --disable-timedated     disable timedate daemon
-  --disable-localed       disable locale daemon
-  --disable-coredump      disable coredump hook
-  --disable-manpages      disable manpages
-  --disable-gtk           disable GTK tools
-  --enable-plymouth       enable plymouth support
-  --enable-split-usr      Assume that /bin, /sbin aren\'t symlinks into /usr
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-  --with-distro=DISTRO    Specify the distribution to target: One of fedora,
-                          suse, debian, ubuntu, arch, gentoo, slackware,
-                          altlinuxi, mandriva, meego, mageia, angstrom or
-                          other
-  --with-sysvinit-path=PATH
-                          Specify the path to where the SysV init scripts are
-                          located [default=based on distro]
-  --with-sysvrcd-path=PATH
-                          Specify the path to the base directory for the SysV
-                          rcN.d directories [default=based on distro]
-  --with-tty-gid=GID      Specify the numeric GID of the 'tty' group
-  --with-dbuspolicydir=DIR
-                          D-Bus policy directory
-  --with-dbussessionservicedir=DIR
-                          D-Bus session service directory
-  --with-dbussystemservicedir=DIR
-                          D-Bus system service directory
-  --with-dbusinterfacedir=DIR
-                          D-Bus interface directory
-  --with-udevrulesdir=DIR Directory for udev rules
-  --with-rootprefix=DIR   rootfs directory prefix for config files and kernel
-                          modules
-  --with-rootlibdir=DIR   Root directory for libraries necessary for boot
-  --with-pamlibdir=DIR    Directory for PAM modules
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
-  UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
-  UDEV_LIBS   linker flags for UDEV, overriding pkg-config
-  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
-  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
-  KMOD_CFLAGS C compiler flags for KMOD, overriding pkg-config
-  KMOD_LIBS   linker flags for KMOD, overriding pkg-config
-  SELINUX_CFLAGS
-              C compiler flags for SELINUX, overriding pkg-config
-  SELINUX_LIBS
-              linker flags for SELINUX, overriding pkg-config
-  XZ_CFLAGS   C compiler flags for XZ, overriding pkg-config
-  XZ_LIBS     linker flags for XZ, overriding pkg-config
-  LIBCRYPTSETUP_CFLAGS
-              C compiler flags for LIBCRYPTSETUP, overriding pkg-config
-  LIBCRYPTSETUP_LIBS
-              linker flags for LIBCRYPTSETUP, overriding pkg-config
-  GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
-  GTK_LIBS    linker flags for GTK, overriding pkg-config
-  LIBNOTIFY_CFLAGS
-              C compiler flags for LIBNOTIFY, overriding pkg-config
-  LIBNOTIFY_LIBS
-              linker flags for LIBNOTIFY, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <systemd-devel@lists.freedesktop.org>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-systemd configure 43
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-        test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------------------- ##
-## Report this to systemd-devel@lists.freedesktop.org ##
-## -------------------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_mongrel
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-        test -z "$ac_c_werror_flag" ||
-        test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by systemd $as_me 43, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-       ac_must_keep_next=false # Got value, back to normal.
-      else
-       case $ac_arg in
-         *=* | --config-cache | -C | -disable-* | --disable-* \
-         | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-         | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-         | -with-* | --with-* | -without-* | --without-* | --x)
-           case "$ac_configure_args0 " in
-             "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-           esac
-           ;;
-         -* ) ac_must_keep_next=true ;;
-       esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-       "s/'\''/'\''\\\\'\'''\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-       eval ac_val=\$$ac_var
-       case $ac_val in
-       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
-       $as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-       # differences in whitespace do not lead to failure.
-       ac_old_val_w=`echo x $ac_old_val`
-       ac_new_val_w=`echo x $ac_new_val`
-       if test "$ac_old_val_w" != "$ac_new_val_w"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-         ac_cache_corrupted=:
-       else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-         eval $ac_var=\$ac_old_val
-       fi
-       { $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-       { $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-       ;;
-    [ab].out )
-       # We found the default executable, but exeext='' is most
-       # certainly right.
-       break;;
-    *.* )
-       if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-       then :; else
-          ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-       fi
-       # We set ac_cv_exeext here because the later test for it is not
-       # safe: cross compilers may not add the suffix if given an `-o'
-       # argument, so we may need to know it at that point already.
-       # Even if this section looks crufty: it has the advantage of
-       # actually working.
-       break;;
-    * )
-       break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-         break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-       cross_compiling=yes
-    else
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-                  (('a' <= (c) && (c) <= 'i') \
-                    || ('j' <= (c) && (c) <= 'r') \
-                    || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-       || toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                 inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
-  MINIX=yes
-else
-  MINIX=
-fi
-
-
-  if test "$MINIX" = yes; then
-
-$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-
-
-$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-
-
-$as_echo "#define _MINIX 1" >>confdefs.h
-
-  fi
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#        define __EXTENSIONS__ 1
-         $ac_includes_default
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_safe_to_define___extensions__=yes
-else
-  ac_cv_safe_to_define___extensions__=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-  test $ac_cv_safe_to_define___extensions__ = yes &&
-    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-
-  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-
-  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-
-  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-
-
-# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
-  enableval=$enable_largefile;
-fi
-
-if test "$enable_largefile" != no; then
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_sys_largefile_CC=no
-     if test "$GCC" != yes; then
-       ac_save_CC=$CC
-       while :; do
-        # IRIX 6.2 and later do not support large files by default,
-        # so use the C compiler's -n32 option if that helps.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                      && LARGE_OFF_T % 2147483647 == 1)
-                     ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-        if ac_fn_c_try_compile "$LINENO"; then :
-  break
-fi
-rm -f core conftest.err conftest.$ac_objext
-        CC="$CC -n32"
-        if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_largefile_CC=' -n32'; break
-fi
-rm -f core conftest.err conftest.$ac_objext
-        break
-       done
-       CC=$ac_save_CC
-       rm -f conftest.$ac_ext
-    fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-  if test "$ac_cv_sys_largefile_CC" != no; then
-    CC=$CC$ac_cv_sys_largefile_CC
-  fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                      && LARGE_OFF_T % 2147483647 == 1)
-                     ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                      && LARGE_OFF_T % 2147483647 == 1)
-                     ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_file_offset_bits=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  if test $ac_cv_sys_file_offset_bits = unknown; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  while :; do
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                      && LARGE_OFF_T % 2147483647 == 1)
-                     ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=no; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-                      && LARGE_OFF_T % 2147483647 == 1)
-                     ? 1 : -1];
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_sys_large_files=1; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_cv_sys_large_files=unknown
-  break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
-  no | unknown) ;;
-  *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
-esac
-rm -rf conftest*
-  fi
-fi
-
-
-am__api_version='1.11'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-       if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-         if test $ac_prog = install &&
-           grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         elif test $ac_prog = install &&
-           grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-           # program-specific install script used by HP pwplus--don't use.
-           :
-         else
-           rm -rf conftest.one conftest.two conftest.dir
-           echo one > conftest.one
-           echo two > conftest.two
-           mkdir conftest.dir
-           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-             test -s conftest.one && test -s conftest.two &&
-             test -s conftest.dir/conftest.one &&
-             test -s conftest.dir/conftest.two
-           then
-             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-             break 3
-           fi
-         fi
-       fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \    ]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\    *)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-        for ac_exec_ext in '' $ac_executable_extensions; do
-          { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-          case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-            'mkdir (GNU coreutils) '* | \
-            'mkdir (coreutils) '* | \
-            'mkdir (fileutils) '4.1*)
-              ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-              break 3;;
-          esac
-        done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-       @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-       @echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-       @$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='systemd'
- VERSION='43'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
-$as_echo_n "checking how to create a pax tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-_am_tools=${am_cv_prog_tar_pax-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      { echo "$as_me:$LINENO: $_am_tar --version" >&5
-   ($_am_tar --version) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && break
-    done
-    am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x pax -w "$$tardir"'
-    am__tar_='pax -L -x pax -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H pax -L'
-    am__tar_='find "$tardir" -print | cpio -o -H pax -L'
-    am__untar='cpio -i -H pax -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_pax}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
-   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
-   ($am__untar <conftest.tar) >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-if ${am_cv_prog_tar_pax+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_prog_tar_pax=$_am_tool
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
-$as_echo "$am_cv_prog_tar_pax" >&6; }
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-       continue
-      else
-       break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-
-PACKAGE_URL=http://www.freedesktop.org/wiki/Software/systemd
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define CANONICAL_HOST "$host"
-_ACEOF
-
-if test "x$host_cpu" = "xmips" || test "x$host_cpu" = "xmipsel" ||
-       test "x$host_cpu" = "xmips64" || test "x$host_cpu" = "xmips64el"; then :
-
-$as_echo "#define ARCH_MIPS /**/" >>confdefs.h
-
-fi
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=0;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-       @$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-
-# i18n stuff for the PolicyKit policy files
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
-$as_echo_n "checking whether NLS is requested... " >&6; }
-    # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
-  enableval=$enable_nls; USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
-
-
-
-
-case "$am__api_version" in
-    1.01234)
-       as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "0.40.0"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
-$as_echo_n "checking for intltool >= 0.40.0... " >&6; }
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
-$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-       as_fn_error $? "Your intltool is too old.  You need intltool 0.40.0 or later." "$LINENO" 5
-fi
-
-# Extract the first word of "intltool-update", so it can be a program name with args.
-set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_UPDATE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
-if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
-$as_echo "$INTLTOOL_UPDATE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-merge", so it can be a program name with args.
-set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_MERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
-if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
-$as_echo "$INTLTOOL_MERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "intltool-extract", so it can be a program name with args.
-set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_EXTRACT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
-if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
-$as_echo "$INTLTOOL_EXTRACT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@'
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check the gettext tools to make sure they are GNU
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XGETTEXT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XGETTEXT=$ac_cv_path_XGETTEXT
-if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGMERGE in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGMERGE=$ac_cv_path_MSGMERGE
-if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-MSGFMT=$ac_cv_path_MSGFMT
-if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
-fi
-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $INTLTOOL_PERL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
-$as_echo "$INTLTOOL_PERL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test -z "$INTLTOOL_PERL"; then
-   as_fn_error $? "perl not found" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
-fi
-if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
-$as_echo_n "checking for XML::Parser... " >&6; }
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-   else
-       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  DATADIRNAME=share
-else
-  case $host in
-    *-*-solaris*)
-                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
-
-
-GETTEXT_PACKAGE=systemd
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-        CFLAGS="-g"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
-$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if ${ac_cv_prog_cc_c99+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <stdio.h>
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-#define debug(...) fprintf (stderr, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  your preprocessor is broken;
-#endif
-#if BIG_OK
-#else
-  your preprocessor is broken;
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // See if C++-style comments work.
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static void
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str;
-  int number;
-  float fnumber;
-
-  while (*format)
-    {
-      switch (*format++)
-       {
-       case 's': // string
-         str = va_arg (args_copy, const char *);
-         break;
-       case 'd': // int
-         number = va_arg (args_copy, int);
-         break;
-       case 'f': // float
-         fnumber = va_arg (args_copy, double);
-         break;
-       default:
-         break;
-       }
-    }
-  va_end (args_copy);
-  va_end (args);
-}
-
-int
-main ()
-{
-
-  // Check bool.
-  _Bool success = false;
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  test_varargs ("s, d' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = i * 1.234;
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[ni.number - 1] = 543;
-
-  // work around unused variable warnings
-  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
-         || dynamic_array[ni.number - 1] != 543);
-
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c99" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c99"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c99" != xno; then :
-
-fi
-
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-                     sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-        test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-       # cc works too.
-       :
-      else
-       # cc exists but doesn't like -o.
-       eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-if test $ac_cv_c_compiler_gnu = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if ${ac_cv_prog_gcc_traditional+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sgtty.h>
-Autoconf TIOCGETP
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-  ac_cv_prog_gcc_traditional=yes
-else
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <termio.h>
-Autoconf TCGETA
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objcopy", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objcopy; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJCOPY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJCOPY"; then
-  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJCOPY="${ac_tool_prefix}objcopy"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJCOPY=$ac_cv_prog_OBJCOPY
-if test -n "$OBJCOPY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
-$as_echo "$OBJCOPY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJCOPY"; then
-  ac_ct_OBJCOPY=$OBJCOPY
-  # Extract the first word of "objcopy", so it can be a program name with args.
-set dummy objcopy; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJCOPY"; then
-  ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJCOPY="objcopy"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
-if test -n "$ac_ct_OBJCOPY"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
-$as_echo "$ac_ct_OBJCOPY" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJCOPY" = x; then
-    OBJCOPY=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJCOPY=$ac_ct_OBJCOPY
-  fi
-else
-  OBJCOPY="$ac_cv_prog_OBJCOPY"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strings", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strings; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRINGS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRINGS"; then
-  ac_cv_prog_STRINGS="$STRINGS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRINGS="${ac_tool_prefix}strings"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRINGS=$ac_cv_prog_STRINGS
-if test -n "$STRINGS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRINGS" >&5
-$as_echo "$STRINGS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRINGS"; then
-  ac_ct_STRINGS=$STRINGS
-  # Extract the first word of "strings", so it can be a program name with args.
-set dummy strings; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRINGS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRINGS"; then
-  ac_cv_prog_ac_ct_STRINGS="$ac_ct_STRINGS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRINGS="strings"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRINGS=$ac_cv_prog_ac_ct_STRINGS
-if test -n "$ac_ct_STRINGS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRINGS" >&5
-$as_echo "$ac_ct_STRINGS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRINGS" = x; then
-    STRINGS=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRINGS=$ac_ct_STRINGS
-  fi
-else
-  STRINGS="$ac_cv_prog_STRINGS"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gperf", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gperf; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GPERF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GPERF"; then
-  ac_cv_prog_GPERF="$GPERF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GPERF="${ac_tool_prefix}gperf"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-GPERF=$ac_cv_prog_GPERF
-if test -n "$GPERF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5
-$as_echo "$GPERF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_GPERF"; then
-  ac_ct_GPERF=$GPERF
-  # Extract the first word of "gperf", so it can be a program name with args.
-set dummy gperf; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_GPERF+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_GPERF"; then
-  ac_cv_prog_ac_ct_GPERF="$ac_ct_GPERF" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_GPERF="gperf"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_GPERF=$ac_cv_prog_ac_ct_GPERF
-if test -n "$ac_ct_GPERF"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GPERF" >&5
-$as_echo "$ac_ct_GPERF" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_GPERF" = x; then
-    GPERF=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    GPERF=$ac_ct_GPERF
-  fi
-else
-  GPERF="$ac_cv_prog_GPERF"
-fi
-
-if test -z "$GPERF" ; then
-        as_fn_error $? "*** gperf not found" "$LINENO" 5
-fi
-
-
-  for flag in  \
-        -pipe \
-        -Wall \
-        -W \
-        -Wextra \
-        -Wno-inline \
-        -Wvla \
-        -Wundef \
-        -Wformat=2 \
-        -Wlogical-op \
-        -Wsign-compare \
-        -Wformat-security \
-        -Wmissing-include-dirs \
-        -Wformat-nonliteral \
-        -Wold-style-definition \
-        -Wpointer-arith \
-        -Winit-self \
-        -Wdeclaration-after-statement \
-        -Wfloat-equal \
-        -Wmissing-prototypes \
-        -Wstrict-prototypes \
-        -Wredundant-decls \
-        -Wmissing-declarations \
-        -Wmissing-noreturn \
-        -Wshadow \
-        -Wendif-labels \
-        -Wcast-align \
-        -Wstrict-aliasing=2 \
-        -Wwrite-strings \
-        -Wno-long-long \
-        -Wno-overlength-strings \
-        -Wno-unused-parameter \
-        -Wno-missing-field-initializers \
-        -Wno-unused-result \
-        -Werror=overflow \
-        -Wp,-D_FORTIFY_SOURCE=2 \
-        -ffast-math \
-        -fno-common \
-        -fdiagnostics-show-option \
-        -fno-strict-aliasing \
-        -fvisibility=hidden \
-        -ffunction-sections \
-        -fdata-sections \
-        -Wl,--as-needed \
-        -Wl,--gc-sections; do
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5
-$as_echo_n "checking if $CC supports $flag flag... " >&6; }
-if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
-  $as_echo_n "(cached) " >&6
-else
-
-  if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $flag"
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int a;
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'"
-else
-  eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     CFLAGS="$ac_save_CFLAGS"
-
-fi
-
-
-  if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
-
-fi
-
-fi
-eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`
-              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-  if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then :
-  CFLAGS="$CFLAGS $flag"; DEBUG_CFLAGS="$DEBUG_CFLAGS $flag";
-fi
-
-  done
-
-
-
-case `pwd` in
-  *\ * | *\    *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-       test "$with_gnu_ld" != no && break
-       ;;
-      *)
-       test "$with_gnu_ld" != yes && break
-       ;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-       # Check to see if the nm accepts a BSD-compat flag.
-       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-       #   nm: unknown option "B" ignored
-       # Tru64's nm complains that /dev/null is an invalid object file
-       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-       */dev/null* | *'Invalid file or object type'*)
-         lt_cv_path_NM="$tmp_nm -B"
-         break
-         ;;
-       *)
-         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-         */dev/null*)
-           lt_cv_path_NM="$tmp_nm -p"
-           break
-           ;;
-         *)
-           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-           continue # so that we can try to find one that supports BSD flags
-           ;;
-         esac
-         ;;
-       esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[         ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-                = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-             test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-       # Ensure the archiver fails upon bogus file names.
-       rm -f conftest.$ac_objext libconftest.a
-       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-       if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[     ]\($symcode$symcode*\)[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-       mv -f "$nlist"T "$nlist"
-      else
-       rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-       if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-         cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-         # Now generate the symbol file.
-         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-         cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-         cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-         # Now try linking the two files.
-         mv conftest.$ac_objext conftstm.$ac_objext
-         lt_globsym_save_LIBS=$LIBS
-         lt_globsym_save_CFLAGS=$CFLAGS
-         LIBS="conftstm.$ac_objext"
-         CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-           pipe_works=yes
-         fi
-         LIBS=$lt_globsym_save_LIBS
-         CFLAGS=$lt_globsym_save_CFLAGS
-       else
-         echo "cannot find nm_test_func in $nlist" >&5
-       fi
-      else
-       echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-       HPUX_IA64_MODE="32"
-       ;;
-      *ELF-64*)
-       HPUX_IA64_MODE="64"
-       ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-       *32-bit*)
-         LD="${LD-ld} -melf32bsmip"
-         ;;
-       *N32*)
-         LD="${LD-ld} -melf32bmipn32"
-         ;;
-       *64-bit*)
-         LD="${LD-ld} -melf64bmip"
-       ;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-       *32-bit*)
-         LD="${LD-ld} -32"
-         ;;
-       *N32*)
-         LD="${LD-ld} -n32"
-         ;;
-       *64-bit*)
-         LD="${LD-ld} -64"
-         ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_i386_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
-         ppc64-*linux*|powerpc64-*linux*)
-           LD="${LD-ld} -m elf32ppclinux"
-           ;;
-         s390x-*linux*)
-           LD="${LD-ld} -m elf_s390"
-           ;;
-         sparc64-*linux*)
-           LD="${LD-ld} -m elf32_sparc"
-           ;;
-       esac
-       ;;
-      *64-bit*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
-         ppc*-*linux*|powerpc*-*linux*)
-           LD="${LD-ld} -m elf64ppc"
-           ;;
-         s390*-*linux*|s390*-*tpf*)
-           LD="${LD-ld} -m elf64_s390"
-           ;;
-         sparc*-*linux*)
-           LD="${LD-ld} -m elf64_sparc"
-           ;;
-       esac
-       ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-         LD="${LD-ld} -64"
-       fi
-       ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-       # By default we will add the -single_module flag. You can override
-       # by either setting the environment variable LT_MULTI_MODULE
-       # non-empty at configure time, or by adding -multi_module to the
-       # link flags.
-       rm -rf libconftest.dylib*
-       echo "int foo(void){return 1;}" > conftest.c
-       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-       # If there is a non-empty error log, and "single_module"
-       # appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-         cat conftest.err >&5
-       # Otherwise, if the output was created with a 0 exit code from
-       # the compiler, it worked.
-       elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-         lt_cv_apple_cc_single_mod=yes
-       else
-         cat conftest.err >&5
-       fi
-       rm -rf libconftest.dylib*
-       rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-       LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-       cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-       lt_cv_ld_force_load=yes
-      else
-       cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-       10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-       10.[012]*)
-         _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-       10.*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_shared=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_static=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-       IFS="$lt_save_ifs"
-       if test "X$lt_pkg" = "X$lt_p"; then
-         pic_mode=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_fast_install=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-       case $deplibs_check_method in
-       "file_magic "*)
-         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-           $EGREP "$file_magic_regex" > /dev/null; then
-           :
-         else
-           cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-       case $deplibs_check_method in
-       "file_magic "*)
-         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-           $EGREP "$file_magic_regex" > /dev/null; then
-           :
-         else
-           cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic='-fPIC'
-       ;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       lt_prog_compiler_static='-Bstatic'
-      else
-       lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       lt_prog_compiler_pic='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-KPIC'
-       lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-fPIC'
-       lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='--shared'
-       lt_prog_compiler_static='--static'
-       ;;
-      nagfor*)
-       # NAG Fortran compiler
-       lt_prog_compiler_wl='-Wl,-Wl,,'
-       lt_prog_compiler_pic='-PIC'
-       lt_prog_compiler_static='-Bstatic'
-       ;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-fpic'
-       lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-       # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-       lt_prog_compiler_wl='-Wl,'
-       lt_prog_compiler_pic='-qpic'
-       lt_prog_compiler_static='-qstaticlink'
-       ;;
-      *)
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl=''
-         ;;
-       *Sun\ F* | *Sun*Fortran*)
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl='-Qoption ld '
-         ;;
-       *Sun\ C*)
-         # Sun C 5.9
-         lt_prog_compiler_pic='-KPIC'
-         lt_prog_compiler_static='-Bstatic'
-         lt_prog_compiler_wl='-Wl,'
-         ;;
-        *Intel*\ [CF]*Compiler*)
-         lt_prog_compiler_wl='-Wl,'
-         lt_prog_compiler_pic='-fPIC'
-         lt_prog_compiler_static='-static'
-         ;;
-       *Portland\ Group*)
-         lt_prog_compiler_wl='-Wl,'
-         lt_prog_compiler_pic='-fpic'
-         lt_prog_compiler_static='-Bstatic'
-         ;;
-       esac
-       ;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-       lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-       lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       lt_prog_compiler_pic='-Kconform_pic'
-       lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-       # The AIX port of GNU ld has always aspired to compatibility
-       # with the native linker.  However, as the warning in the GNU ld
-       # block says, versions before 2.19.5* couldn't really create working
-       # shared libraries, regardless of the interface used.
-       case `$LD -v 2>&1` in
-         *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-         *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-         *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-         *)
-           lt_use_gnu_ld_interface=yes
-           ;;
-       esac
-       ;;
-      *)
-       lt_use_gnu_ld_interface=yes
-       ;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       ld_shlibs=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       allow_undefined_flag=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname.def;
-       else
-         echo EXPORTS > $output_objdir/$soname.def;
-         cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
-       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-       case $cc_basename in
-         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
-       esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-        && test "$tmp_diet" = no
-      then
-       tmp_addflag=' $pic_flag'
-       tmp_sharedflag='-shared'
-       case $cc_basename,$host_cpu in
-        pgcc*)                         # Portland Group C compiler
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95* | pgfortran*)
-                                       # Portland Group f77 and f90 compilers
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       lf95*)                          # Lahey Fortran 8.1
-         whole_archive_flag_spec=
-         tmp_sharedflag='--shared' ;;
-       xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-         tmp_sharedflag='-qmkshrobj'
-         tmp_addflag= ;;
-       nvcc*)  # Cuda Compiler Driver 2.2
-         whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         compiler_needs_object=yes
-         ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         compiler_needs_object=yes
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       esac
-       archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-           cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-           echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-       case $cc_basename in
-       xlf* | bgf* | bgxlf* | mpixlf*)
-         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-         whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-         hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-         archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-         if test "x$supports_anon_versioning" = xyes; then
-           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-             echo "local: *; };" >> $output_objdir/$libname.ver~
-             $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-         fi
-         ;;
-       esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-       ld_shlibs=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-       ld_shlibs=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-       ;;
-       *)
-         # For security reasons, it is highly recommended that you always
-         # use absolute paths for naming shared libraries, and exclude the
-         # DT_RUNPATH tag from executables and libraries.  But doing so
-         # requires that you compile everything twice, which is a pain.
-         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-           hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-           archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         else
-           ld_shlibs=no
-         fi
-       ;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-       aix_use_runtimelinking=no
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-      else
-       # If we're using GNU nm, then we don't want the "-C" option.
-       # -C means demangle to AIX nm, but means don't demangle with GNU nm
-       # Also, AIX nm treats weak defined symbols like other global
-       # defined symbols, whereas GNU nm marks them as "W".
-       if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-         export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-       else
-         export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-       fi
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
-
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-       case $host_os in aix4.[012]|aix4.[012].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" &&
-          strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-         then
-         # We have reworked collect2
-         :
-         else
-         # We have old collect2
-         hardcode_direct=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         hardcode_minus_L=yes
-         hardcode_libdir_flag_spec='-L$libdir'
-         hardcode_libdir_separator=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-      else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-       else
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-       allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-         /^0/ {
-             s/^0  *\([^ ]*\) *$/\1/
-             p
-         }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-       if test "$host_cpu" = ia64; then
-         hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-         allow_undefined_flag="-z nodefs"
-         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-         /^0/ {
-             s/^0  *\([^ ]*\) *$/\1/
-             p
-         }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         no_undefined_flag=' ${wl}-bernotok'
-         allow_undefined_flag=' ${wl}-berok'
-         if test "$with_gnu_ld" = yes; then
-           # We only use this code for GNU lds that support --whole-archive.
-           whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-         else
-           # Exported symbols can be pulled into shared objects from archives
-           whole_archive_flag_spec='$convenience'
-         fi
-         archive_cmds_need_lc=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-       # Native MSVC
-       hardcode_libdir_flag_spec=' '
-       allow_undefined_flag=unsupported
-       always_export_symbols=yes
-       file_list_spec='@'
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
-       shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
-       archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-       archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-           sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-         else
-           sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-         fi~
-         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-         linknames='
-       # The linker will not automatically build a static lib if we build a DLL.
-       # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-       enable_shared_with_static_runtimes=yes
-       exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-       # Don't use ranlib
-       old_postinstall_cmds='chmod 644 $oldlib'
-       postlink_cmds='lt_outputfile="@OUTPUT@"~
-         lt_tool_outputfile="@TOOL_OUTPUT@"~
-         case $lt_outputfile in
-           *.exe|*.EXE) ;;
-           *)
-             lt_outputfile="$lt_outputfile.exe"
-             lt_tool_outputfile="$lt_tool_outputfile.exe"
-             ;;
-         esac~
-         if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-           $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-           $RM "$lt_outputfile.manifest";
-         fi'
-       ;;
-      *)
-       # Assume MSVC wrapper
-       hardcode_libdir_flag_spec=' '
-       allow_undefined_flag=unsupported
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
-       shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
-       archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       old_archive_from_new_cmds='true'
-       # FIXME: Should let the user specify the lib program.
-       old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-       enable_shared_with_static_runtimes=yes
-       ;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-       archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-       archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator=:
-       hardcode_direct=yes
-       hardcode_direct_absolute=yes
-       export_dynamic_flag_spec='${wl}-E'
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-
-         # Older versions of the 11.00 compiler do not understand -b yet
-         # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator=:
-
-       case $host_cpu in
-       hppa*64*|ia64*)
-         hardcode_direct=no
-         hardcode_shlibpath_var=no
-         ;;
-       *)
-         hardcode_direct=yes
-         hardcode_direct_absolute=yes
-         export_dynamic_flag_spec='${wl}-E'
-
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         hardcode_minus_L=yes
-         ;;
-       esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       # Try to use the -exported_symbol ld option, if it does not
-       # work, assume that -exports_file does not work either and
-       # implicitly export all symbols.
-       # This should be the same for all languages, so no per-tag cache variable.
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-       if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-       fi
-      else
-       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-       hardcode_direct_absolute=yes
-       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-         export_dynamic_flag_spec='${wl}-E'
-       else
-         case $host_os in
-          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-            archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            hardcode_libdir_flag_spec='-R$libdir'
-            ;;
-          *)
-            archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-            ;;
-         esac
-       fi
-      else
-       ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       allow_undefined_flag=' -expect_unresolved \*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-       allow_undefined_flag=' -expect_unresolved \*'
-       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-       archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-       $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-       # Both c and cxx compiler support -rpath directly
-       hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-       case `$CC -V 2>&1` in
-       *"Compilers 5.0"*)
-         wlarc=''
-         archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-         ;;
-       *)
-         wlarc='${wl}'
-         archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-         archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-         ;;
-       esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-       # Use $CC to link under sequent, because it throws in some extra .o
-       # files that make .init and .fini sections work.
-       archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-       sni)
-         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         reload_cmds='$CC -r -o $output$reload_objs'
-         hardcode_direct=no
-        ;;
-       motorola)
-         archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       hardcode_shlibpath_var=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-       export_dynamic_flag_spec='${wl}-Blargedynsym'
-       ;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-       if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-         deplibs=
-         wl=$lt_prog_compiler_wl
-         pic_flag=$lt_prog_compiler_pic
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-         output_objdir=.
-         libname=conftest
-         lt_save_allow_undefined_flag=$allow_undefined_flag
-         allow_undefined_flag=
-         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-         then
-           lt_cv_archive_cmds_need_lc=no
-         else
-           lt_cv_archive_cmds_need_lc=yes
-         fi
-         allow_undefined_flag=$lt_save_allow_undefined_flag
-       else
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-          echo ' yes '
-          echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-       :
-      else
-       can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-       if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux # correct to gnu/linux during the next big refactor
-       else
-               version_type=irix
-       fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[      ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-       shlibpath_overrides_runpath=no
-       ;;
-      *)
-       shlibpath_overrides_runpath=yes
-       ;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-         if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL          RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL                DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL                0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW         DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW       RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW     DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW     0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-       }
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-         if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL          RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL                DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL                0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW         DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW       RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW     DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW     0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-       }
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5
-$as_echo_n "checking for library containing clock_gettime... " >&6; }
-if ${ac_cv_search_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_clock_gettime=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_clock_gettime+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_clock_gettime+:} false; then :
-
-else
-  ac_cv_search_clock_gettime=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5
-$as_echo "$ac_cv_search_clock_gettime" >&6; }
-ac_res=$ac_cv_search_clock_gettime
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  as_fn_error $? "*** POSIX RT library not found" "$LINENO" 5
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
-$as_echo_n "checking for library containing dlsym... " >&6; }
-if ${ac_cv_search_dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlsym ();
-int
-main ()
-{
-return dlsym ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_dlsym=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_dlsym+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_dlsym+:} false; then :
-
-else
-  ac_cv_search_dlsym=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlsym" >&5
-$as_echo "$ac_cv_search_dlsym" >&6; }
-ac_res=$ac_cv_search_dlsym
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  as_fn_error $? "*** Dynamic linking loader library not found" "$LINENO" 5
-fi
-
-
-save_LIBS="$LIBS"
-LIBS=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cap_init" >&5
-$as_echo_n "checking for library containing cap_init... " >&6; }
-if ${ac_cv_search_cap_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cap_init ();
-int
-main ()
-{
-return cap_init ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cap; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_cap_init=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_cap_init+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_cap_init+:} false; then :
-
-else
-  ac_cv_search_cap_init=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cap_init" >&5
-$as_echo "$ac_cv_search_cap_init" >&6; }
-ac_res=$ac_cv_search_cap_init
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
-  as_fn_error $? "*** POSIX caps library not found" "$LINENO" 5
-fi
-
-for ac_header in sys/capability.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_capability_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_CAPABILITY_H 1
-_ACEOF
-
-else
-  as_fn_error $? "*** POSIX caps headers not found" "$LINENO" 5
-fi
-
-done
-
-CAP_LIBS="$LIBS"
-LIBS="$save_LIBS"
-
-
-# This makes sure pkg.m4 is available.
-
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-       if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-       _pkg_min_version=0.9.0
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-       else
-               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-               PKG_CONFIG=""
-       fi
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
-$as_echo_n "checking for UDEV... " >&6; }
-
-if test -n "$UDEV_CFLAGS"; then
-    pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libudev >= 172 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libudev >= 172 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags " libudev >= 172 " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$UDEV_LIBS"; then
-    pkg_cv_UDEV_LIBS="$UDEV_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libudev >= 172 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libudev >= 172 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs " libudev >= 172 " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libudev >= 172 " 2>&1`
-        else
-               UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors " libudev >= 172 " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$UDEV_PKG_ERRORS" >&5
-
-       as_fn_error $? "Package requirements ( libudev >= 172 ) were not met:
-
-$UDEV_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables UDEV_CFLAGS
-and UDEV_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables UDEV_CFLAGS
-and UDEV_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
-       UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
-       UDEV_LIBS=$pkg_cv_UDEV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
-$as_echo_n "checking for DBUS... " >&6; }
-
-if test -n "$DBUS_CFLAGS"; then
-    pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 >= 1.3.2 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " dbus-1 >= 1.3.2 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags " dbus-1 >= 1.3.2 " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$DBUS_LIBS"; then
-    pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" dbus-1 >= 1.3.2 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " dbus-1 >= 1.3.2 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs " dbus-1 >= 1.3.2 " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " dbus-1 >= 1.3.2 " 2>&1`
-        else
-               DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors " dbus-1 >= 1.3.2 " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$DBUS_PKG_ERRORS" >&5
-
-       as_fn_error $? "Package requirements ( dbus-1 >= 1.3.2 ) were not met:
-
-$DBUS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables DBUS_CFLAGS
-and DBUS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
-       DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
-       DBUS_LIBS=$pkg_cv_DBUS_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for KMOD" >&5
-$as_echo_n "checking for KMOD... " >&6; }
-
-if test -n "$KMOD_CFLAGS"; then
-    pkg_cv_KMOD_CFLAGS="$KMOD_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 5 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libkmod >= 5 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_KMOD_CFLAGS=`$PKG_CONFIG --cflags " libkmod >= 5 " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$KMOD_LIBS"; then
-    pkg_cv_KMOD_LIBS="$KMOD_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libkmod >= 5 \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libkmod >= 5 ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_KMOD_LIBS=`$PKG_CONFIG --libs " libkmod >= 5 " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               KMOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libkmod >= 5 " 2>&1`
-        else
-               KMOD_PKG_ERRORS=`$PKG_CONFIG --print-errors " libkmod >= 5 " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$KMOD_PKG_ERRORS" >&5
-
-       as_fn_error $? "Package requirements ( libkmod >= 5 ) were not met:
-
-$KMOD_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables KMOD_CFLAGS
-and KMOD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables KMOD_CFLAGS
-and KMOD_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
-       KMOD_CFLAGS=$pkg_cv_KMOD_CFLAGS
-       KMOD_LIBS=$pkg_cv_KMOD_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-have_selinux=no
-# Check whether --enable-selinux was given.
-if test "${enable_selinux+set}" = set; then :
-  enableval=$enable_selinux;
-fi
-
-if test "x$enable_selinux" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SELINUX" >&5
-$as_echo_n "checking for SELINUX... " >&6; }
-
-if test -n "$SELINUX_CFLAGS"; then
-    pkg_cv_SELINUX_CFLAGS="$SELINUX_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libselinux \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libselinux ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SELINUX_CFLAGS=`$PKG_CONFIG --cflags " libselinux " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$SELINUX_LIBS"; then
-    pkg_cv_SELINUX_LIBS="$SELINUX_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libselinux \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libselinux ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_SELINUX_LIBS=`$PKG_CONFIG --libs " libselinux " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               SELINUX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libselinux " 2>&1`
-        else
-               SELINUX_PKG_ERRORS=`$PKG_CONFIG --print-errors " libselinux " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$SELINUX_PKG_ERRORS" >&5
-
-       have_selinux=no
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       have_selinux=no
-else
-       SELINUX_CFLAGS=$pkg_cv_SELINUX_CFLAGS
-       SELINUX_LIBS=$pkg_cv_SELINUX_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
- have_selinux=yes
-fi
-        if test "x$have_selinux" = xno -a "x$enable_selinux" = xyes; then
-                as_fn_error $? "*** SELinux support requested but libraries not found" "$LINENO" 5
-        fi
-fi
- if test "$have_selinux" = "yes"; then
-  HAVE_SELINUX_TRUE=
-  HAVE_SELINUX_FALSE='#'
-else
-  HAVE_SELINUX_TRUE='#'
-  HAVE_SELINUX_FALSE=
-fi
-
-
-have_xz=no
-# Check whether --enable-xz was given.
-if test "${enable_xz+set}" = set; then :
-  enableval=$enable_xz;
-fi
-
-if test "x$enable_xz" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XZ" >&5
-$as_echo_n "checking for XZ... " >&6; }
-
-if test -n "$XZ_CFLAGS"; then
-    pkg_cv_XZ_CFLAGS="$XZ_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" liblzma \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " liblzma ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XZ_CFLAGS=`$PKG_CONFIG --cflags " liblzma " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$XZ_LIBS"; then
-    pkg_cv_XZ_LIBS="$XZ_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" liblzma \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " liblzma ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_XZ_LIBS=`$PKG_CONFIG --libs " liblzma " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               XZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " liblzma " 2>&1`
-        else
-               XZ_PKG_ERRORS=`$PKG_CONFIG --print-errors " liblzma " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$XZ_PKG_ERRORS" >&5
-
-       have_xz=no
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       have_xz=no
-else
-       XZ_CFLAGS=$pkg_cv_XZ_CFLAGS
-       XZ_LIBS=$pkg_cv_XZ_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_XZ 1" >>confdefs.h
- have_xz=yes
-fi
-        if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then
-                as_fn_error $? "*** Xz support requested but libraries not found" "$LINENO" 5
-        fi
-fi
- if test "$have_xz" = "yes"; then
-  HAVE_XZ_TRUE=
-  HAVE_XZ_FALSE='#'
-else
-  HAVE_XZ_TRUE='#'
-  HAVE_XZ_FALSE=
-fi
-
-
-# Check whether --enable-tcpwrap was given.
-if test "${enable_tcpwrap+set}" = set; then :
-  enableval=$enable_tcpwrap; case "${enableval}" in
-                        yes) have_tcpwrap=yes ;;
-                        no) have_tcpwrap=no ;;
-                        *) as_fn_error $? "bad value ${enableval} for --disable-tcpwrap" "$LINENO" 5 ;;
-                esac
-else
-  have_tcpwrap=auto
-fi
-
-
-if test "x${have_tcpwrap}" != xno ; then
-
-LIBWRAP_LIBS=
-saved_LIBS="$LIBS"
-LIBS="$LIBS -lwrap"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcpwrap library and headers" >&5
-$as_echo_n "checking for tcpwrap library and headers... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <tcpd.h>
-#include <syslog.h>
-int allow_severity = LOG_INFO;
-int deny_severity = LOG_WARNING;
-int
-main ()
-{
-struct request_info *req;
-return hosts_access (req);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-$as_echo "#define HAVE_LIBWRAP /**/" >>confdefs.h
-
-LIBWRAP_LIBS="-lwrap"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS="$saved_LIBS"
-
-        if test "x${LIBWRAP_LIBS}" = x ; then
-                if test "x$have_tcpwrap" = xyes ; then
-                        as_fn_error $? "*** TCP wrappers support not found." "$LINENO" 5
-                fi
-                have_tcpwrap=no
-        else
-                have_tcpwrap=yes
-        fi
-else
-        LIBWRAP_LIBS=
-fi
-
-
-# Check whether --enable-pam was given.
-if test "${enable_pam+set}" = set; then :
-  enableval=$enable_pam; case "${enableval}" in
-                        yes) have_pam=yes ;;
-                        no) have_pam=no ;;
-                        *) as_fn_error $? "bad value ${enableval} for --disable-pam" "$LINENO" 5 ;;
-                esac
-else
-  have_pam=auto
-fi
-
-
-if test "x${have_pam}" != xno ; then
-        for ac_header in security/pam_modules.h security/pam_modutil.h security/pam_ext.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- have_pam=yes
-else
-  if test "x$have_pam" = xyes ; then
-                        as_fn_error $? "*** PAM headers not found." "$LINENO" 5
-                fi
-fi
-
-done
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_syslog in -lpam" >&5
-$as_echo_n "checking for pam_syslog in -lpam... " >&6; }
-if ${ac_cv_lib_pam_pam_syslog+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpam  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pam_syslog ();
-int
-main ()
-{
-return pam_syslog ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pam_pam_syslog=yes
-else
-  ac_cv_lib_pam_pam_syslog=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_syslog" >&5
-$as_echo "$ac_cv_lib_pam_pam_syslog" >&6; }
-if test "x$ac_cv_lib_pam_pam_syslog" = xyes; then :
-  have_pam=yes
-else
-  if test "x$have_pam" = xyes ; then
-                        as_fn_error $? "*** libpam not found." "$LINENO" 5
-                fi
-fi
-
-
-        if test "x$have_pam" = xyes ; then
-                PAM_LIBS="-lpam -lpam_misc"
-
-$as_echo "#define HAVE_PAM 1" >>confdefs.h
-
-        else
-                have_pam=no
-        fi
-else
-        PAM_LIBS=
-fi
-
- if test "x$have_pam" != xno; then
-  HAVE_PAM_TRUE=
-  HAVE_PAM_FALSE='#'
-else
-  HAVE_PAM_TRUE='#'
-  HAVE_PAM_FALSE=
-fi
-
-
-# Check whether --enable-acl was given.
-if test "${enable_acl+set}" = set; then :
-  enableval=$enable_acl; case "${enableval}" in
-                        yes) have_acl=yes ;;
-                        no) have_acl=no ;;
-                        *) as_fn_error $? "bad value ${enableval} for --disable-acl" "$LINENO" 5 ;;
-                esac
-else
-  have_acl=auto
-fi
-
-
-if test "x${have_acl}" != xno ; then
-        for ac_header in sys/acl.h acl/libacl.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- have_acl=yes
-else
-  if test "x$have_acl" = xyes ; then
-                        as_fn_error $? "*** ACL headers not found." "$LINENO" 5
-                fi
-fi
-
-done
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
-$as_echo_n "checking for acl_get_file in -lacl... " >&6; }
-if ${ac_cv_lib_acl_acl_get_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lacl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char acl_get_file ();
-int
-main ()
-{
-return acl_get_file ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_acl_acl_get_file=yes
-else
-  ac_cv_lib_acl_acl_get_file=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
-$as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
-if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then :
-  have_acl=yes
-else
-  if test "x$have_acl" = xyes ; then
-                        as_fn_error $? "*** libacl not found." "$LINENO" 5
-                fi
-fi
-
-
-        if test "x$have_acl" = xyes ; then
-                ACL_LIBS="-lacl"
-
-$as_echo "#define HAVE_ACL 1" >>confdefs.h
-
-        else
-                have_acl=no
-        fi
-else
-        ACL_LIBS=
-fi
-
- if test "x$have_acl" != xno; then
-  HAVE_ACL_TRUE=
-  HAVE_ACL_FALSE='#'
-else
-  HAVE_ACL_TRUE='#'
-  HAVE_ACL_FALSE=
-fi
-
-
-# Check whether --enable-audit was given.
-if test "${enable_audit+set}" = set; then :
-  enableval=$enable_audit; case "${enableval}" in
-                        yes) have_audit=yes ;;
-                        no) have_audit=no ;;
-                        *) as_fn_error $? "bad value ${enableval} for --disable-audit" "$LINENO" 5 ;;
-                esac
-else
-  have_audit=auto
-fi
-
-
-if test "x${have_audit}" != xno ; then
-        for ac_header in libaudit.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "libaudit.h" "ac_cv_header_libaudit_h" "$ac_includes_default"
-if test "x$ac_cv_header_libaudit_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBAUDIT_H 1
-_ACEOF
- have_audit=yes
-else
-  if test "x$have_audit" = xyes ; then
-                        as_fn_error $? "*** AUDIT headers not found." "$LINENO" 5
-                fi
-fi
-
-done
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for audit_open in -laudit" >&5
-$as_echo_n "checking for audit_open in -laudit... " >&6; }
-if ${ac_cv_lib_audit_audit_open+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-laudit  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char audit_open ();
-int
-main ()
-{
-return audit_open ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_audit_audit_open=yes
-else
-  ac_cv_lib_audit_audit_open=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audit_audit_open" >&5
-$as_echo "$ac_cv_lib_audit_audit_open" >&6; }
-if test "x$ac_cv_lib_audit_audit_open" = xyes; then :
-  have_audit=yes
-else
-  if test "x$have_audit" = xyes ; then
-                        as_fn_error $? "*** libaudit not found." "$LINENO" 5
-                fi
-fi
-
-
-        if test "x$have_audit" = xyes ; then
-                AUDIT_LIBS="-laudit"
-
-$as_echo "#define HAVE_AUDIT 1" >>confdefs.h
-
-        else
-                have_audit=no
-        fi
-else
-        AUDIT_LIBS=
-fi
-
-
-have_libcryptsetup=no
-# Check whether --enable-libcryptsetup was given.
-if test "${enable_libcryptsetup+set}" = set; then :
-  enableval=$enable_libcryptsetup;
-fi
-
-if test "x$enable_libcryptsetup" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCRYPTSETUP" >&5
-$as_echo_n "checking for LIBCRYPTSETUP... " >&6; }
-
-if test -n "$LIBCRYPTSETUP_CFLAGS"; then
-    pkg_cv_LIBCRYPTSETUP_CFLAGS="$LIBCRYPTSETUP_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libcryptsetup \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libcryptsetup ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBCRYPTSETUP_CFLAGS=`$PKG_CONFIG --cflags " libcryptsetup " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBCRYPTSETUP_LIBS"; then
-    pkg_cv_LIBCRYPTSETUP_LIBS="$LIBCRYPTSETUP_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libcryptsetup \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libcryptsetup ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBCRYPTSETUP_LIBS=`$PKG_CONFIG --libs " libcryptsetup " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               LIBCRYPTSETUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libcryptsetup " 2>&1`
-        else
-               LIBCRYPTSETUP_PKG_ERRORS=`$PKG_CONFIG --print-errors " libcryptsetup " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$LIBCRYPTSETUP_PKG_ERRORS" >&5
-
-       have_libcryptsetup=no
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       have_libcryptsetup=no
-else
-       LIBCRYPTSETUP_CFLAGS=$pkg_cv_LIBCRYPTSETUP_CFLAGS
-       LIBCRYPTSETUP_LIBS=$pkg_cv_LIBCRYPTSETUP_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_LIBCRYPTSETUP 1" >>confdefs.h
- have_libcryptsetup=yes
-fi
-        if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
-                as_fn_error $? "*** libcryptsetup support requested but libraries not found" "$LINENO" 5
-        fi
-fi
- if test "$have_libcryptsetup" = "yes"; then
-  HAVE_LIBCRYPTSETUP_TRUE=
-  HAVE_LIBCRYPTSETUP_FALSE='#'
-else
-  HAVE_LIBCRYPTSETUP_TRUE='#'
-  HAVE_LIBCRYPTSETUP_FALSE=
-fi
-
-
-have_binfmt=no
-# Check whether --enable-binfmt was given.
-if test "${enable_binfmt+set}" = set; then :
-  enableval=$enable_binfmt;
-fi
-
-if test "x$enable_binfmt" != "xno"; then
-        have_binfmt=yes
-fi
- if test "$have_binfmt" = "yes"; then
-  ENABLE_BINFMT_TRUE=
-  ENABLE_BINFMT_FALSE='#'
-else
-  ENABLE_BINFMT_TRUE='#'
-  ENABLE_BINFMT_FALSE=
-fi
-
-
-have_vconsole=no
-# Check whether --enable-vconsole was given.
-if test "${enable_vconsole+set}" = set; then :
-  enableval=$enable_vconsole;
-fi
-
-if test "x$enable_vconsole" != "xno"; then
-        have_vconsole=yes
-fi
- if test "$have_vconsole" = "yes"; then
-  ENABLE_VCONSOLE_TRUE=
-  ENABLE_VCONSOLE_FALSE='#'
-else
-  ENABLE_VCONSOLE_TRUE='#'
-  ENABLE_VCONSOLE_FALSE=
-fi
-
-
-have_readahead=no
-# Check whether --enable-readahead was given.
-if test "${enable_readahead+set}" = set; then :
-  enableval=$enable_readahead;
-fi
-
-if test "x$enable_readahead" != "xno"; then
-        have_readahead=yes
-fi
- if test "$have_readahead" = "yes"; then
-  ENABLE_READAHEAD_TRUE=
-  ENABLE_READAHEAD_FALSE='#'
-else
-  ENABLE_READAHEAD_TRUE='#'
-  ENABLE_READAHEAD_FALSE=
-fi
-
-
-have_quotacheck=no
-# Check whether --enable-quotacheck was given.
-if test "${enable_quotacheck+set}" = set; then :
-  enableval=$enable_quotacheck;
-fi
-
-if test "x$enable_quotacheck" != "xno"; then
-        have_quotacheck=yes
-fi
- if test "$have_quotacheck" = "yes"; then
-  ENABLE_QUOTACHECK_TRUE=
-  ENABLE_QUOTACHECK_FALSE='#'
-else
-  ENABLE_QUOTACHECK_TRUE='#'
-  ENABLE_QUOTACHECK_FALSE=
-fi
-
-
-have_randomseed=no
-# Check whether --enable-randomseed was given.
-if test "${enable_randomseed+set}" = set; then :
-  enableval=$enable_randomseed;
-fi
-
-if test "x$enable_randomseed" != "xno"; then
-        have_randomseed=yes
-fi
- if test "$have_randomseed" = "yes"; then
-  ENABLE_RANDOMSEED_TRUE=
-  ENABLE_RANDOMSEED_FALSE='#'
-else
-  ENABLE_RANDOMSEED_TRUE='#'
-  ENABLE_RANDOMSEED_FALSE=
-fi
-
-
-have_logind=no
-# Check whether --enable-logind was given.
-if test "${enable_logind+set}" = set; then :
-  enableval=$enable_logind;
-fi
-
-if test "x$enable_logind" != "xno"; then
-        have_logind=yes
-fi
- if test "$have_logind" = "yes"; then
-  ENABLE_LOGIND_TRUE=
-  ENABLE_LOGIND_FALSE='#'
-else
-  ENABLE_LOGIND_TRUE='#'
-  ENABLE_LOGIND_FALSE=
-fi
-
-
-have_hostnamed=no
-# Check whether --enable-hostnamed was given.
-if test "${enable_hostnamed+set}" = set; then :
-  enableval=$enable_hostnamed;
-fi
-
-if test "x$enable_hostnamed" != "xno"; then
-        have_hostnamed=yes
-fi
- if test "$have_hostnamed" = "yes"; then
-  ENABLE_HOSTNAMED_TRUE=
-  ENABLE_HOSTNAMED_FALSE='#'
-else
-  ENABLE_HOSTNAMED_TRUE='#'
-  ENABLE_HOSTNAMED_FALSE=
-fi
-
-
-have_timedated=no
-# Check whether --enable-timedated was given.
-if test "${enable_timedated+set}" = set; then :
-  enableval=$enable_timedated;
-fi
-
-if test "x$enable_timedated" != "xno"; then
-        have_timedated=yes
-fi
- if test "$have_timedated" = "yes"; then
-  ENABLE_TIMEDATED_TRUE=
-  ENABLE_TIMEDATED_FALSE='#'
-else
-  ENABLE_TIMEDATED_TRUE='#'
-  ENABLE_TIMEDATED_FALSE=
-fi
-
-
-have_localed=no
-# Check whether --enable-localed was given.
-if test "${enable_localed+set}" = set; then :
-  enableval=$enable_localed;
-fi
-
-if test "x$enable_localed" != "xno"; then
-        have_localed=yes
-fi
- if test "$have_localed" = "yes"; then
-  ENABLE_LOCALED_TRUE=
-  ENABLE_LOCALED_FALSE='#'
-else
-  ENABLE_LOCALED_TRUE='#'
-  ENABLE_LOCALED_FALSE=
-fi
-
-
-have_coredump=no
-# Check whether --enable-coredump was given.
-if test "${enable_coredump+set}" = set; then :
-  enableval=$enable_coredump;
-fi
-
-if test "x$enable_coredump" != "xno"; then
-        have_coredump=yes
-fi
- if test "$have_coredump" = "yes"; then
-  ENABLE_COREDUMP_TRUE=
-  ENABLE_COREDUMP_FALSE='#'
-else
-  ENABLE_COREDUMP_TRUE='#'
-  ENABLE_COREDUMP_FALSE=
-fi
-
-
-have_manpages=no
-# Check whether --enable-manpages was given.
-if test "${enable_manpages+set}" = set; then :
-  enableval=$enable_manpages;
-fi
-
-if test "x$enable_manpages" != "xno"; then
-        have_manpages=yes
-fi
- if test "$have_manpages" = "yes"; then
-  ENABLE_MANPAGES_TRUE=
-  ENABLE_MANPAGES_FALSE='#'
-else
-  ENABLE_MANPAGES_TRUE='#'
-  ENABLE_MANPAGES_FALSE=
-fi
-
-
-have_gtk=no
-# Check whether --enable-gtk was given.
-if test "${enable_gtk+set}" = set; then :
-  enableval=$enable_gtk;
-fi
-
-if test "x$enable_gtk" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
-
-if test -n "$GTK_CFLAGS"; then
-    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors " gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags " gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GTK_LIBS"; then
-    pkg_cv_GTK_LIBS="$GTK_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors " gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs " gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0" 2>&1`
-        else
-               GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors " gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0" 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$GTK_PKG_ERRORS" >&5
-
-       have_gtk=no
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       have_gtk=no
-else
-       GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-       GTK_LIBS=$pkg_cv_GTK_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_GTK 1" >>confdefs.h
- have_gtk=yes
-fi
-        if test "x$have_gtk" = xno -a "x$enable_gtk" = xyes; then
-                as_fn_error $? "*** gtk support requested but libraries not found" "$LINENO" 5
-        fi
-fi
- if test "$have_gtk" = "yes"; then
-  HAVE_GTK_TRUE=
-  HAVE_GTK_FALSE='#'
-else
-  HAVE_GTK_TRUE='#'
-  HAVE_GTK_FALSE=
-fi
-
-
-if test "$have_gtk" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
-$as_echo_n "checking for LIBNOTIFY... " >&6; }
-
-if test -n "$LIBNOTIFY_CFLAGS"; then
-    pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libnotify \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libnotify ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags " libnotify " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBNOTIFY_LIBS"; then
-    pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" libnotify \""; } >&5
-  ($PKG_CONFIG --exists --print-errors " libnotify ") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs " libnotify " 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-               LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " libnotify " 2>&1`
-        else
-               LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors " libnotify " 2>&1`
-        fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$LIBNOTIFY_PKG_ERRORS" >&5
-
-       as_fn_error $? "Package requirements ( libnotify ) were not met:
-
-$LIBNOTIFY_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS
-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-
-elif test $pkg_failed = untried; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables LIBNOTIFY_CFLAGS
-and LIBNOTIFY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-
-else
-       LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
-       LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-fi
-
-# Extract the first word of "valac", so it can be a program name with args.
-set dummy valac; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_VALAC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $VALAC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_VALAC="$VALAC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_VALAC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-VALAC=$ac_cv_path_VALAC
-if test -n "$VALAC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALAC" >&5
-$as_echo "$VALAC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test -z "$VALAC"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found.  You will not be able to compile .vala source files." >&5
-$as_echo "$as_me: WARNING: No Vala compiler found.  You will not be able to compile .vala source files." >&2;}
-else
-  if test -n "0.10"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.10" >&5
-$as_echo_n "checking $VALAC is at least version 0.10... " >&6; }
-       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       as_arg_v1=0.10
-as_arg_v2="$am__vala_version"
-awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
-case $? in #(
-  1) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;; #(
-  0) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; } ;; #(
-  2) :
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-          as_fn_error $? "Vala 0.10 not found." "$LINENO" 5 ;; #(
-  *) :
-     ;;
-esac
-fi
-fi
-
-
- if test x"$VALAC" != x; then
-  HAVE_VALAC_TRUE=
-  HAVE_VALAC_FALSE='#'
-else
-  HAVE_VALAC_TRUE='#'
-  HAVE_VALAC_FALSE=
-fi
-
-
-# Extract the first word of "xsltproc", so it can be a program name with args.
-set dummy xsltproc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XSLTPROC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XSLTPROC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XSLTPROC=$ac_cv_path_XSLTPROC
-if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-$as_echo "$XSLTPROC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test x"$XSLTPROC" != x; then
-  HAVE_XSLTPROC_TRUE=
-  HAVE_XSLTPROC_FALSE='#'
-else
-  HAVE_XSLTPROC_TRUE='#'
-  HAVE_XSLTPROC_FALSE=
-fi
-
-
-# Extract the first word of "m4", so it can be a program name with args.
-set dummy m4; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_M4+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $M4 in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_M4="$M4" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_M4="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-M4=$ac_cv_path_M4
-if test -n "$M4"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $M4" >&5
-$as_echo "$M4" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-# Check whether --with-distro was given.
-if test "${with_distro+set}" = set; then :
-  withval=$with_distro;
-fi
-
-if test "z$with_distro" = "z"; then
-        if test "$cross_compiling" = yes; then
-                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)" >&5
-$as_echo "$as_me: WARNING: Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)" >&2;}
-        else
-                with_distro=$($GREP '^ID=' /etc/os-release | $SED 's/ID=//');
-        fi
-        if test "z$with_distro" = "z"; then
-                with_distro=other
-        fi
-fi
-with_distro=`echo ${with_distro} | tr '[:upper:]' '[:lower:]' `
-
-cat >>confdefs.h <<_ACEOF
-#define DISTRIBUTION "${with_distro}"
-_ACEOF
-
-
-# Location of the init scripts as mandated by LSB
-SYSTEM_SYSVINIT_PATH=/etc/init.d
-SYSTEM_SYSVRCND_PATH=/etc/rc.d
-
-M4_DEFINES=
-have_plymouth=no
-
-case $with_distro in
-        fedora)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-
-$as_echo "#define TARGET_FEDORA /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_FEDORA=1
-                have_plymouth=yes
-                ;;
-        opensuse|suse)
-                SYSTEM_SYSVRCND_PATH=/etc/init.d
-
-$as_echo "#define TARGET_SUSE /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_SUSE=1
-                have_plymouth=yes
-                ;;
-        debian)
-                SYSTEM_SYSVRCND_PATH=/etc
-
-$as_echo "#define TARGET_DEBIAN /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_DEBIAN=1
-                ;;
-        ubuntu)
-                SYSTEM_SYSVRCND_PATH=/etc
-
-$as_echo "#define TARGET_UBUNTU /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_UBUNTU=1
-                ;;
-        arch)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d
-                SYSTEM_SYSVRCND_PATH=/etc
-
-$as_echo "#define TARGET_ARCH /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_ARCH=1
-                ;;
-        gentoo)
-                SYSTEM_SYSVINIT_PATH=
-                SYSTEM_SYSVRCND_PATH=
-
-$as_echo "#define TARGET_GENTOO /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_GENTOO=1
-                ;;
-        slackware)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-
-$as_echo "#define TARGET_SLACKWARE /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_SLACKWARE=1
-                ;;
-        frugalware)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d
-
-$as_echo "#define TARGET_FRUGALWARE /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_FRUGALWARE=1
-                have_plymouth=yes
-                ;;
-        altlinux)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-
-$as_echo "#define TARGET_ALTLINUX /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_ALTLINUX=1
-                have_plymouth=yes
-                ;;
-        mandriva)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-
-$as_echo "#define TARGET_MANDRIVA /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_MANDRIVA=1
-                have_plymouth=yes
-                ;;
-        meego)
-                SYSTEM_SYSVINIT_PATH=
-                SYSTEM_SYSVRCND_PATH=
-
-$as_echo "#define TARGET_MEEGO /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_MEEGO=1
-                ;;
-        angstrom)
-                SYSTEM_SYSVRCND_PATH=/etc
-
-$as_echo "#define TARGET_ANGSTROM /**/" >>confdefs.h
-
-                M4_DEFINES=-DTARGET_ANGSTROM=1
-                ;;
-        mageia)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-
-$as_echo "#define TARGET_MAGEIA /**/" >>confdefs.h
-
-                M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
-                have_plymouth=yes
-                ;;
-        other)
-                ;;
-        *)
-                as_fn_error $? "Your distribution (${with_distro}) is not yet supported, SysV init scripts could not be found! (patches welcome); you can specify --with-distro=other to skip this check" "$LINENO" 5
-                ;;
-esac
-
-
-# Check whether --with-sysvinit-path was given.
-if test "${with_sysvinit_path+set}" = set; then :
-  withval=$with_sysvinit_path; SYSTEM_SYSVINIT_PATH="$withval"
-fi
-
-
-
-# Check whether --with-sysvrcd-path was given.
-if test "${with_sysvrcd_path+set}" = set; then :
-  withval=$with_sysvrcd_path; SYSTEM_SYSVRCND_PATH="$withval"
-fi
-
-
-
-
-
-
-if test "x${SYSTEM_SYSVINIT_PATH}" != "x" -a "x${SYSTEM_SYSVRCND_PATH}" != "x"; then
-
-$as_echo "#define HAVE_SYSV_COMPAT /**/" >>confdefs.h
-
-        SYSTEM_SYSV_COMPAT="yes"
-        M4_DEFINES="$M4_DEFINES -DHAVE_SYSV_COMPAT"
-elif test "x${SYSTEM_SYSVINIT_PATH}" != "x" -o "x${SYSTEM_SYSVRCND_PATH}" != "x"; then
-        as_fn_error $? "*** You need both --with-sysvinit-path=PATH and --with-sysvrcd-path=PATH to enable SysV compatibility support, or both empty to disable it." "$LINENO" 5
-else
-        SYSTEM_SYSV_COMPAT="no"
-fi
-
-
-# Check whether --with-tty-gid was given.
-if test "${with_tty_gid+set}" = set; then :
-  withval=$with_tty_gid;
-cat >>confdefs.h <<_ACEOF
-#define TTY_GID $withval
-_ACEOF
-
-fi
-
-
-# Check whether --enable-plymouth was given.
-if test "${enable_plymouth+set}" = set; then :
-  enableval=$enable_plymouth;
-fi
-
-if test -n "$enable_plymouth"; then
-        have_plymouth="$enable_plymouth"
-fi
-
- if test x"$with_distro" = xfedora; then
-  TARGET_FEDORA_TRUE=
-  TARGET_FEDORA_FALSE='#'
-else
-  TARGET_FEDORA_TRUE='#'
-  TARGET_FEDORA_FALSE=
-fi
-
- if test x"$with_distro" = xsuse; then
-  TARGET_SUSE_TRUE=
-  TARGET_SUSE_FALSE='#'
-else
-  TARGET_SUSE_TRUE='#'
-  TARGET_SUSE_FALSE=
-fi
-
- if test x"$with_distro" = xdebian; then
-  TARGET_DEBIAN_TRUE=
-  TARGET_DEBIAN_FALSE='#'
-else
-  TARGET_DEBIAN_TRUE='#'
-  TARGET_DEBIAN_FALSE=
-fi
-
- if test x"$with_distro" = xubuntu; then
-  TARGET_UBUNTU_TRUE=
-  TARGET_UBUNTU_FALSE='#'
-else
-  TARGET_UBUNTU_TRUE='#'
-  TARGET_UBUNTU_FALSE=
-fi
-
- if test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu; then
-  TARGET_DEBIAN_OR_UBUNTU_TRUE=
-  TARGET_DEBIAN_OR_UBUNTU_FALSE='#'
-else
-  TARGET_DEBIAN_OR_UBUNTU_TRUE='#'
-  TARGET_DEBIAN_OR_UBUNTU_FALSE=
-fi
-
- if test x"$with_distro" = xarch; then
-  TARGET_ARCH_TRUE=
-  TARGET_ARCH_FALSE='#'
-else
-  TARGET_ARCH_TRUE='#'
-  TARGET_ARCH_FALSE=
-fi
-
- if test x"$with_distro" = xgentoo; then
-  TARGET_GENTOO_TRUE=
-  TARGET_GENTOO_FALSE='#'
-else
-  TARGET_GENTOO_TRUE='#'
-  TARGET_GENTOO_FALSE=
-fi
-
- if test x"$with_distro" = xslackware; then
-  TARGET_SLACKWARE_TRUE=
-  TARGET_SLACKWARE_FALSE='#'
-else
-  TARGET_SLACKWARE_TRUE='#'
-  TARGET_SLACKWARE_FALSE=
-fi
-
- if test x"$with_distro" = xfrugalware; then
-  TARGET_FRUGALWARE_TRUE=
-  TARGET_FRUGALWARE_FALSE='#'
-else
-  TARGET_FRUGALWARE_TRUE='#'
-  TARGET_FRUGALWARE_FALSE=
-fi
-
- if test x"$with_distro" = xaltlinux; then
-  TARGET_ALTLINUX_TRUE=
-  TARGET_ALTLINUX_FALSE='#'
-else
-  TARGET_ALTLINUX_TRUE='#'
-  TARGET_ALTLINUX_FALSE=
-fi
-
- if test x"$with_distro" = xmandriva; then
-  TARGET_MANDRIVA_TRUE=
-  TARGET_MANDRIVA_FALSE='#'
-else
-  TARGET_MANDRIVA_TRUE='#'
-  TARGET_MANDRIVA_FALSE=
-fi
-
- if test x"$with_distro" = xmeego; then
-  TARGET_MEEGO_TRUE=
-  TARGET_MEEGO_FALSE='#'
-else
-  TARGET_MEEGO_TRUE='#'
-  TARGET_MEEGO_FALSE=
-fi
-
- if test x"$with_distro" = xangstrom; then
-  TARGET_ANGSTROM_TRUE=
-  TARGET_ANGSTROM_FALSE='#'
-else
-  TARGET_ANGSTROM_TRUE='#'
-  TARGET_ANGSTROM_FALSE=
-fi
-
- if test x"$with_distro" = xmageia; then
-  TARGET_MAGEIA_TRUE=
-  TARGET_MAGEIA_FALSE='#'
-else
-  TARGET_MAGEIA_TRUE='#'
-  TARGET_MAGEIA_FALSE=
-fi
-
-
- if test "$have_plymouth" = "yes"; then
-  HAVE_PLYMOUTH_TRUE=
-  HAVE_PLYMOUTH_FALSE='#'
-else
-  HAVE_PLYMOUTH_TRUE='#'
-  HAVE_PLYMOUTH_FALSE=
-fi
-
- if test "$SYSTEM_SYSV_COMPAT" = "yes"; then
-  HAVE_SYSV_COMPAT_TRUE=
-  HAVE_SYSV_COMPAT_FALSE='#'
-else
-  HAVE_SYSV_COMPAT_TRUE='#'
-  HAVE_SYSV_COMPAT_FALSE=
-fi
-
-
-
-# Check whether --with-dbuspolicydir was given.
-if test "${with_dbuspolicydir+set}" = set; then :
-  withval=$with_dbuspolicydir;
-else
-  with_dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d
-fi
-
-
-
-# Check whether --with-dbussessionservicedir was given.
-if test "${with_dbussessionservicedir+set}" = set; then :
-  withval=$with_dbussessionservicedir;
-else
-  with_dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`
-fi
-
-
-
-# Check whether --with-dbussystemservicedir was given.
-if test "${with_dbussystemservicedir+set}" = set; then :
-  withval=$with_dbussystemservicedir;
-else
-  with_dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services
-fi
-
-
-
-# Check whether --with-dbusinterfacedir was given.
-if test "${with_dbusinterfacedir+set}" = set; then :
-  withval=$with_dbusinterfacedir;
-else
-  with_dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces
-fi
-
-
-
-# Check whether --with-udevrulesdir was given.
-if test "${with_udevrulesdir+set}" = set; then :
-  withval=$with_udevrulesdir;
-else
-  with_udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d
-fi
-
-
-
-# Check whether --with-rootprefix was given.
-if test "${with_rootprefix+set}" = set; then :
-  withval=$with_rootprefix;
-else
-  with_rootprefix=${ac_default_prefix}
-fi
-
-
-
-# Check whether --with-rootlibdir was given.
-if test "${with_rootlibdir+set}" = set; then :
-  withval=$with_rootlibdir;
-else
-  with_rootlibdir=${libdir}
-fi
-
-
-
-# Check whether --with-pamlibdir was given.
-if test "${with_pamlibdir+set}" = set; then :
-  withval=$with_pamlibdir;
-else
-  with_pamlibdir=${with_rootlibdir}/security
-fi
-
-
-# Check whether --enable-split-usr was given.
-if test "${enable_split_usr+set}" = set; then :
-  enableval=$enable_split_usr;
-else
-  if test "x${ac_default_prefix}" != "x${with_rootprefix}"; then :
-
-                enable_split_usr=yes
-
-else
-
-                enable_split_usr=no
-
-fi
-fi
-
-
-if test "x${enable_split_usr}" = "xyes"; then :
-
-
-$as_echo "#define HAVE_SPLIT_USR 1" >>confdefs.h
-
-
-fi
-
-dbuspolicydir=$with_dbuspolicydir
-
-dbussessionservicedir=$with_dbussessionservicedir
-
-dbussystemservicedir=$with_dbussystemservicedir
-
-dbusinterfacedir=$with_dbusinterfacedir
-
-udevrulesdir=$with_udevrulesdir
-
-pamlibdir=$with_pamlibdir
-
-rootprefix=$with_rootprefix
-
-rootlibdir=$with_rootlibdir
-
-
-ac_config_files="$ac_config_files Makefile po/Makefile.in"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-       "s/'/'\\\\''/g;
-         s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-       cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-         mv -f confcache "$cache_file"$$ &&
-         mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-         mv -f confcache "$cache_file" ;;
-       esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-
-  ac_config_commands="$ac_config_commands po/stamp-it"
-
-
-if test -z "${HAVE_SELINUX_TRUE}" && test -z "${HAVE_SELINUX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SELINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_XZ_TRUE}" && test -z "${HAVE_XZ_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_XZ\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PAM_TRUE}" && test -z "${HAVE_PAM_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PAM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_ACL_TRUE}" && test -z "${HAVE_ACL_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_ACL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LIBCRYPTSETUP_TRUE}" && test -z "${HAVE_LIBCRYPTSETUP_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LIBCRYPTSETUP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_BINFMT_TRUE}" && test -z "${ENABLE_BINFMT_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_BINFMT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_VCONSOLE_TRUE}" && test -z "${ENABLE_VCONSOLE_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_VCONSOLE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_READAHEAD_TRUE}" && test -z "${ENABLE_READAHEAD_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_READAHEAD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_QUOTACHECK_TRUE}" && test -z "${ENABLE_QUOTACHECK_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_QUOTACHECK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_RANDOMSEED_TRUE}" && test -z "${ENABLE_RANDOMSEED_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_RANDOMSEED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_LOGIND_TRUE}" && test -z "${ENABLE_LOGIND_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_LOGIND\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_HOSTNAMED_TRUE}" && test -z "${ENABLE_HOSTNAMED_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_HOSTNAMED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_TIMEDATED_TRUE}" && test -z "${ENABLE_TIMEDATED_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_TIMEDATED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_LOCALED_TRUE}" && test -z "${ENABLE_LOCALED_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_LOCALED\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_COREDUMP_TRUE}" && test -z "${ENABLE_COREDUMP_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_COREDUMP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_MANPAGES_TRUE}" && test -z "${ENABLE_MANPAGES_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_MANPAGES\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_GTK_TRUE}" && test -z "${HAVE_GTK_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_VALAC_TRUE}" && test -z "${HAVE_VALAC_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_VALAC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_FEDORA_TRUE}" && test -z "${TARGET_FEDORA_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_FEDORA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_SUSE_TRUE}" && test -z "${TARGET_SUSE_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_SUSE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_DEBIAN_TRUE}" && test -z "${TARGET_DEBIAN_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_DEBIAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_UBUNTU_TRUE}" && test -z "${TARGET_UBUNTU_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_UBUNTU\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_DEBIAN_OR_UBUNTU_TRUE}" && test -z "${TARGET_DEBIAN_OR_UBUNTU_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_DEBIAN_OR_UBUNTU\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_ARCH_TRUE}" && test -z "${TARGET_ARCH_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_ARCH\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_GENTOO_TRUE}" && test -z "${TARGET_GENTOO_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_GENTOO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_SLACKWARE_TRUE}" && test -z "${TARGET_SLACKWARE_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_SLACKWARE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_FRUGALWARE_TRUE}" && test -z "${TARGET_FRUGALWARE_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_FRUGALWARE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_ALTLINUX_TRUE}" && test -z "${TARGET_ALTLINUX_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_ALTLINUX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_MANDRIVA_TRUE}" && test -z "${TARGET_MANDRIVA_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_MANDRIVA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_MEEGO_TRUE}" && test -z "${TARGET_MEEGO_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_MEEGO\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_ANGSTROM_TRUE}" && test -z "${TARGET_ANGSTROM_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_ANGSTROM\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${TARGET_MAGEIA_TRUE}" && test -z "${TARGET_MAGEIA_FALSE}"; then
-  as_fn_error $? "conditional \"TARGET_MAGEIA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_PLYMOUTH_TRUE}" && test -z "${HAVE_PLYMOUTH_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_PLYMOUTH\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SYSV_COMPAT_TRUE}" && test -z "${HAVE_SYSV_COMPAT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SYSV_COMPAT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-       expr "X$arg" : "X\\(.*\\)$as_nl";
-       arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""       $as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-        X"$0" : 'X\(//\)$' \| \
-        X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\/\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='        ';;     # ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='        ';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$as_dir" : 'X\(//\)[^/]' \| \
-        X"$as_dir" : 'X\(//\)$' \| \
-        X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-       test -d "$1/.";
-      else
-       case $1 in #(
-       -*)set "./$1";;
-       esac;
-       case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-       ???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by systemd $as_me 43, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <systemd-devel@lists.freedesktop.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-systemd config.status 43
-configured by $0, generated by GNU Autoconf 2.68,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = "\a"
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[         ]*VPATH[        ]*=[    ]*/{
-h
-s///
-s/^/:/
-s/[     ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[  ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[      ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[    ]*#[    ]*define[       ][      ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[    ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[        ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = "\a"
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-        # (if the path is not absolute).  The absolute path cannot be DOS-style,
-        # because $ac_f cannot contain `:'.
-        test -f "$ac_f" ||
-          case $ac_f in
-          [\\/$]*) false;;
-          *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-          esac ||
-          as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-         $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-       `' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$ac_file" : 'X\(//\)[^/]' \| \
-        X"$ac_file" : 'X\(//\)$' \| \
-        X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[         ]*datarootdir[  ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$_am_arg" : 'X\(//\)[^/]' \| \
-        X"$_am_arg" : 'X\(//\)$' \| \
-        X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$mf" : 'X\(//\)[^/]' \| \
-        X"$mf" : 'X\(//\)$' \| \
-        X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-        X"$file" : 'X\(//\)[^/]' \| \
-        X"$file" : 'X\(//\)$' \| \
-        X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)[^/].*/{
-           s//\1/
-           q
-         }
-         /^X\(\/\/\)$/{
-           s//\1/
-           q
-         }
-         /^X\(\/\).*/{
-           s//\1/
-           q
-         }
-         s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-    "po/stamp-it":C)
-    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
-    fi
-    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-    >"po/stamp-it.tmp"
-    sed '/^#/d
-        s/^[[].*] *//
-        /^[    ]*$/d
-       '"s|^|  $ac_top_srcdir/|" \
-      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
-
-    sed '/^POTFILES =/,/[^\\]$/ {
-               /^POTFILES =/!d
-               r po/POTFILES
-         }
-        ' "po/Makefile.in" >"po/Makefile"
-    rm -f "po/Makefile.tmp"
-    mv "po/stamp-it.tmp" "po/stamp-it"
-   ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
-        $PACKAGE_NAME $VERSION
-
-        Distribution:            ${with_distro}
-        SysV compatibility:      ${SYSTEM_SYSV_COMPAT}
-        SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
-        SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
-        Gtk:                     ${have_gtk}
-        libcryptsetup:           ${have_libcryptsetup}
-        tcpwrap:                 ${have_tcpwrap}
-        PAM:                     ${have_pam}
-        AUDIT:                   ${have_audit}
-        SELinux:                 ${have_selinux}
-        XZ:                      ${have_xz}
-        ACL:                     ${have_acl}
-        binfmt:                  ${have_binfmt}
-        vconsole:                ${have_vconsole}
-        readahead:               ${have_readahead}
-        quotacheck:              ${have_quotacheck}
-        randomseed:              ${have_randomseed}
-        logind:                  ${have_logind}
-        hostnamed:               ${have_hostnamed}
-        timedated:               ${have_timedated}
-        localed:                 ${have_localed}
-        coredump:                ${have_coredump}
-        plymouth:                ${have_plymouth}
-        prefix:                  ${prefix}
-        rootprefix:              ${with_rootprefix}
-        libexec dir:             ${libexecdir}
-        lib dir:                 ${libdir}
-        rootlib dir:             ${with_rootlibdir}
-        PAM modules dir:         ${with_pamlibdir}
-        udev rules dir:          ${with_udevrulesdir}
-        D-Bus policy dir:        ${with_dbuspolicydir}
-        D-Bus session dir:       ${with_dbussessionservicedir}
-        D-Bus system dir:        ${with_dbussystemservicedir}
-        D-Bus interfaces dir:    ${with_dbusinterfacedir}
-        Split /usr:              ${enable_split_usr}
-        Build man pages:         ${have_manpages}
-" >&5
-$as_echo "
-        $PACKAGE_NAME $VERSION
-
-        Distribution:            ${with_distro}
-        SysV compatibility:      ${SYSTEM_SYSV_COMPAT}
-        SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
-        SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
-        Gtk:                     ${have_gtk}
-        libcryptsetup:           ${have_libcryptsetup}
-        tcpwrap:                 ${have_tcpwrap}
-        PAM:                     ${have_pam}
-        AUDIT:                   ${have_audit}
-        SELinux:                 ${have_selinux}
-        XZ:                      ${have_xz}
-        ACL:                     ${have_acl}
-        binfmt:                  ${have_binfmt}
-        vconsole:                ${have_vconsole}
-        readahead:               ${have_readahead}
-        quotacheck:              ${have_quotacheck}
-        randomseed:              ${have_randomseed}
-        logind:                  ${have_logind}
-        hostnamed:               ${have_hostnamed}
-        timedated:               ${have_timedated}
-        localed:                 ${have_localed}
-        coredump:                ${have_coredump}
-        plymouth:                ${have_plymouth}
-        prefix:                  ${prefix}
-        rootprefix:              ${with_rootprefix}
-        libexec dir:             ${libexecdir}
-        lib dir:                 ${libdir}
-        rootlib dir:             ${with_rootlibdir}
-        PAM modules dir:         ${with_pamlibdir}
-        udev rules dir:          ${with_udevrulesdir}
-        D-Bus policy dir:        ${with_dbuspolicydir}
-        D-Bus session dir:       ${with_dbussessionservicedir}
-        D-Bus system dir:        ${with_dbussystemservicedir}
-        D-Bus interfaces dir:    ${with_dbusinterfacedir}
-        Split /usr:              ${enable_split_usr}
-        Build man pages:         ${have_manpages}
-" >&6; }
index 62e8cdf..5f60249 100644 (file)
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[43],[systemd-devel@lists.freedesktop.org])
+AC_INIT([systemd],[37],[systemd-devel@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
-AC_PREFIX_DEFAULT([/usr])
-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects check-news])
+
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects dist-bzip2])
 
 AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd])
 
@@ -36,6 +36,13 @@ AS_IF([test "x$host_cpu" = "xmips" || test "x$host_cpu" = "xmipsel" ||
 
 AM_SILENT_RULES([yes])
 
+AC_CHECK_PROG([STOW], [stow], [yes], [no])
+
+AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
+        AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
+        ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+])
+
 # i18n stuff for the PolicyKit policy files
 IT_PROG_INTLTOOL([0.40.0])
 
@@ -45,7 +52,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
 AC_PROG_SED
-AC_PROG_GREP
 AC_PROG_AWK
 
 AC_PROG_CC
@@ -94,7 +100,6 @@ CC_CHECK_CFLAGS_APPEND([ \
         -Wno-unused-parameter \
         -Wno-missing-field-initializers \
         -Wno-unused-result \
-        -Werror=overflow \
         -Wp,-D_FORTIFY_SOURCE=2 \
         -ffast-math \
         -fno-common \
@@ -123,32 +128,27 @@ AC_SUBST(CAP_LIBS)
 # This makes sure pkg.m4 is available.
 m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
 
-PKG_CHECK_MODULES(UDEV, [ libudev >= 172 ])
+PKG_CHECK_MODULES(UDEV, [ libudev >= 166 ])
+AC_SUBST(UDEV_CFLAGS)
+AC_SUBST(UDEV_LIBS)
+
 PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
-PKG_CHECK_MODULES(KMOD, [ libkmod >= 5 ])
+AC_SUBST(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
 
 have_selinux=no
 AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
 if test "x$enable_selinux" != "xno"; then
         PKG_CHECK_MODULES(SELINUX, [ libselinux ],
                 [AC_DEFINE(HAVE_SELINUX, 1, [Define if SELinux is available]) have_selinux=yes], have_selinux=no)
+        AC_SUBST(SELINUX_CFLAGS)
+        AC_SUBST(SELINUX_LIBS)
         if test "x$have_selinux" = xno -a "x$enable_selinux" = xyes; then
                 AC_MSG_ERROR([*** SELinux support requested but libraries not found])
         fi
 fi
 AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"])
 
-have_xz=no
-AC_ARG_ENABLE(xz, AS_HELP_STRING([--disable-xz], [Disable optional XZ support]))
-if test "x$enable_xz" != "xno"; then
-        PKG_CHECK_MODULES(XZ, [ liblzma ],
-                [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes], have_xz=no)
-        if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then
-                AC_MSG_ERROR([*** Xz support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_XZ, [test "$have_xz" = "yes"])
-
 AC_ARG_ENABLE([tcpwrap],
         AS_HELP_STRING([--disable-tcpwrap],[Disable optional TCP wrappers support]),
                 [case "${enableval}" in
@@ -288,6 +288,8 @@ AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable
 if test "x$enable_libcryptsetup" != "xno"; then
         PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup ],
                 [AC_DEFINE(HAVE_LIBCRYPTSETUP, 1, [Define if libcryptsetup is available]) have_libcryptsetup=yes], have_libcryptsetup=no)
+        AC_SUBST(LIBCRYPTSETUP_CFLAGS)
+        AC_SUBST(LIBCRYPTSETUP_LIBS)
         if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
                 AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
         fi
@@ -297,85 +299,38 @@ AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
 have_binfmt=no
 AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool]))
 if test "x$enable_binfmt" != "xno"; then
-        have_binfmt=yes
+       have_binfmt=yes
 fi
 AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"])
 
-have_vconsole=no
-AC_ARG_ENABLE(vconsole, AS_HELP_STRING([--disable-vconsole], [disable vconsole tool]))
-if test "x$enable_vconsole" != "xno"; then
-        have_vconsole=yes
-fi
-AM_CONDITIONAL(ENABLE_VCONSOLE, [test "$have_vconsole" = "yes"])
-
-have_readahead=no
-AC_ARG_ENABLE(readahead, AS_HELP_STRING([--disable-readahead], [disable readahead tools]))
-if test "x$enable_readahead" != "xno"; then
-        have_readahead=yes
-fi
-AM_CONDITIONAL(ENABLE_READAHEAD, [test "$have_readahead" = "yes"])
-
-have_quotacheck=no
-AC_ARG_ENABLE(quotacheck, AS_HELP_STRING([--disable-quotacheck], [disable quotacheck tools]))
-if test "x$enable_quotacheck" != "xno"; then
-        have_quotacheck=yes
-fi
-AM_CONDITIONAL(ENABLE_QUOTACHECK, [test "$have_quotacheck" = "yes"])
-
-have_randomseed=no
-AC_ARG_ENABLE(randomseed, AS_HELP_STRING([--disable-randomseed], [disable randomseed tools]))
-if test "x$enable_randomseed" != "xno"; then
-        have_randomseed=yes
-fi
-AM_CONDITIONAL(ENABLE_RANDOMSEED, [test "$have_randomseed" = "yes"])
-
-have_logind=no
-AC_ARG_ENABLE(logind, AS_HELP_STRING([--disable-logind], [disable login daemon]))
-if test "x$enable_logind" != "xno"; then
-        have_logind=yes
-fi
-AM_CONDITIONAL(ENABLE_LOGIND, [test "$have_logind" = "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
+       have_hostnamed=yes
 fi
 AM_CONDITIONAL(ENABLE_HOSTNAMED, [test "$have_hostnamed" = "yes"])
 
 have_timedated=no
 AC_ARG_ENABLE(timedated, AS_HELP_STRING([--disable-timedated], [disable timedate daemon]))
 if test "x$enable_timedated" != "xno"; then
-        have_timedated=yes
+       have_timedated=yes
 fi
 AM_CONDITIONAL(ENABLE_TIMEDATED, [test "$have_timedated" = "yes"])
 
 have_localed=no
 AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon]))
 if test "x$enable_localed" != "xno"; then
-        have_localed=yes
+       have_localed=yes
 fi
 AM_CONDITIONAL(ENABLE_LOCALED, [test "$have_localed" = "yes"])
 
-have_coredump=no
-AC_ARG_ENABLE(coredump, AS_HELP_STRING([--disable-coredump], [disable coredump hook]))
-if test "x$enable_coredump" != "xno"; then
-        have_coredump=yes
-fi
-AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"])
-
-have_manpages=no
-AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
-if test "x$enable_manpages" != "xno"; then
-        have_manpages=yes
-fi
-AM_CONDITIONAL(ENABLE_MANPAGES, [test "$have_manpages" = "yes"])
-
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then
-        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 gee-1.0],
+        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 glib-2.0 > 2.26 gio-unix-2.0 ],
                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
+        AC_SUBST(GTK_CFLAGS)
+        AC_SUBST(GTK_LIBS)
         if test "x$have_gtk" = xno -a "x$enable_gtk" = xyes; then
                 AC_MSG_ERROR([*** gtk support requested but libraries not found])
         fi
@@ -384,26 +339,48 @@ AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
 
 if test "$have_gtk" = "yes"; then
         PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
+        PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
+
+        AC_SUBST(LIBNOTIFY_CFLAGS)
+        AC_SUBST(LIBNOTIFY_LIBS)
 fi
+AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
 
 AM_PROG_VALAC([0.10])
 AC_SUBST(VAPIDIR)
 AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
 
-AC_PATH_PROG([XSLTPROC], [xsltproc])
+AC_ARG_ENABLE([docs],
+       [AS_HELP_STRING([--disable-docs],
+               [Disable documentation building])],
+       [XSLTPROC=],
+       [AC_PATH_PROG([XSLTPROC], [xsltproc])])
 AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
 
 AC_PATH_PROG([M4], [m4])
 
-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinuxi, mandriva, meego, mageia, angstrom or other]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux or other]))
 if test "z$with_distro" = "z"; then
         if test "$cross_compiling" = yes; then
                 AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)])
         else
-                with_distro=$($GREP '^ID=' /etc/os-release | $SED 's/ID=//');
+                test -f "/etc/redhat-release" && with_distro="fedora"
+                test -f "/etc/SuSE-release" && with_distro="suse"
+                test -f "/etc/debian_version" &&  with_distro="debian"
+                test -f "/etc/arch-release" && with_distro="arch"
+                test -f "/etc/gentoo-release" && with_distro="gentoo"
+                test -f "/etc/slackware-version" && with_distro="slackware"
+                test -f "/etc/frugalware-release" && with_distro="frugalware"
+                test -f "/etc/altlinux-release" && with_distro="altlinux"
+                test -f "/etc/mandriva-release" && with_distro="mandriva"
+                test -f "/etc/meego-release" && with_distro="meego"
+                test -f "/etc/angstrom-version" && with_distro="angstrom"
+                if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then
+                        with_distro="ubuntu"
+                fi
         fi
         if test "z$with_distro" = "z"; then
-                with_distro=other
+                with_distro=`uname -s`
         fi
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' `
@@ -423,7 +400,7 @@ case $with_distro in
                 M4_DEFINES=-DTARGET_FEDORA=1
                 have_plymouth=yes
                 ;;
-        opensuse|suse)
+        suse)
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
                 AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
                 M4_DEFINES=-DTARGET_SUSE=1
@@ -468,6 +445,14 @@ case $with_distro in
                 M4_DEFINES=-DTARGET_ALTLINUX=1
                 have_plymouth=yes
                 ;;
+        slp)
+                SYSTEM_SYSVINIT_PATH=
+                SYSTEM_SYSVRCND_PATH=
+                SPECIAL_SYSLOG_SERVICE=syslog.service
+                AC_DEFINE(TARGET_SLP, [], [Target is SLP])
+                M4_DEFINES=-DTARGET_SLP=1
+                ;;
+
         mandriva)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
                 AC_DEFINE(TARGET_MANDRIVA, [], [Target is Mandriva])
@@ -479,18 +464,12 @@ case $with_distro in
                 SYSTEM_SYSVRCND_PATH=
                 AC_DEFINE(TARGET_MEEGO, [], [Target is MeeGo])
                 M4_DEFINES=-DTARGET_MEEGO=1
-                ;;
+               ;;
         angstrom)
                 SYSTEM_SYSVRCND_PATH=/etc
                 AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ã…ngström])
                 M4_DEFINES=-DTARGET_ANGSTROM=1
                 ;;
-        mageia)
-                SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
-                AC_DEFINE(TARGET_MAGEIA, [], [Target is Mageia])
-                M4_DISTRO_FLAG=-DTARGET_MAGEIA=1
-                have_plymouth=yes
-                ;;
         other)
                 ;;
         *)
@@ -499,10 +478,10 @@ case $with_distro in
 esac
 
 AC_ARG_WITH([sysvinit-path],
-        [AS_HELP_STRING([--with-sysvinit-path=PATH],
-                [Specify the path to where the SysV init scripts are located @<:@default=based on distro@:>@])],
-        [SYSTEM_SYSVINIT_PATH="$withval"],
-        [])
+       [AS_HELP_STRING([--with-sysvinit-path=PATH],
+               [Specify the path to where the SysV init scripts are located @<:@default=based on distro@:>@])],
+       [SYSTEM_SYSVINIT_PATH="$withval"],
+       [])
 
 AC_ARG_WITH([sysvrcd-path],
         [AS_HELP_STRING([--with-sysvrcd-path=PATH],
@@ -545,10 +524,10 @@ AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
 AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
 AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
+AM_CONDITIONAL(TARGET_SLP, test x"$with_distro" = xslp)
 AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva)
 AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego)
 AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom)
-AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia)
 
 AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes")
 AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes")
@@ -574,36 +553,24 @@ AC_ARG_WITH([dbusinterfacedir],
         [with_dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces])
 
 AC_ARG_WITH([udevrulesdir],
-        AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules]),
+        AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
         [],
         [with_udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d])
 
-AC_ARG_WITH([rootprefix],
-        AS_HELP_STRING([--with-rootprefix=DIR], [rootfs directory prefix for config files and kernel modules]),
-        [], [with_rootprefix=${ac_default_prefix}])
-
-AC_ARG_WITH([rootlibdir],
-        AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
+AC_ARG_WITH([pamlibdir],
+        AS_HELP_STRING([--with-pamlibdir=DIR], [Diectory for PAM modules]),
         [],
-        [with_rootlibdir=${libdir}])
+        [with_pamlibdir=/lib/`$CC -print-multi-os-directory`/security])
 
-AC_ARG_WITH([pamlibdir],
-        AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
+AC_ARG_WITH([rootdir],
+        AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
         [],
-        [with_pamlibdir=${with_rootlibdir}/security])
+        [with_rootdir=${ac_default_prefix}])
 
-AC_ARG_ENABLE([split-usr],
-        AS_HELP_STRING([--enable-split-usr], [Assume that /bin, /sbin aren\'t symlinks into /usr]),
+AC_ARG_WITH([rootlibdir],
+        AS_HELP_STRING([--with-rootlibdir=DIR], [Root directory for libraries necessary for boot]),
         [],
-        [AS_IF([test "x${ac_default_prefix}" != "x${with_rootprefix}"], [
-                enable_split_usr=yes
-        ], [
-                enable_split_usr=no
-        ])])
-
-AS_IF([test "x${enable_split_usr}" = "xyes"], [
-        AC_DEFINE(HAVE_SPLIT_USR, 1, [Define if /bin, /sbin aren't symlinks into /usr])
-])
+        [with_rootlibdir=${libdir}])
 
 AC_SUBST([dbuspolicydir], [$with_dbuspolicydir])
 AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir])
@@ -611,7 +578,7 @@ AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir])
 AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir])
 AC_SUBST([udevrulesdir], [$with_udevrulesdir])
 AC_SUBST([pamlibdir], [$with_pamlibdir])
-AC_SUBST([rootprefix], [$with_rootprefix])
+AC_SUBST([rootdir], [$with_rootdir])
 AC_SUBST([rootlibdir], [$with_rootlibdir])
 
 AC_CONFIG_FILES([Makefile po/Makefile.in])
@@ -629,30 +596,20 @@ AC_MSG_RESULT([
         PAM:                     ${have_pam}
         AUDIT:                   ${have_audit}
         SELinux:                 ${have_selinux}
-        XZ:                      ${have_xz}
         ACL:                     ${have_acl}
         binfmt:                  ${have_binfmt}
-        vconsole:                ${have_vconsole}
-        readahead:               ${have_readahead}
-        quotacheck:              ${have_quotacheck}
-        randomseed:              ${have_randomseed}
-        logind:                  ${have_logind}
         hostnamed:               ${have_hostnamed}
         timedated:               ${have_timedated}
         localed:                 ${have_localed}
-        coredump:                ${have_coredump}
         plymouth:                ${have_plymouth}
         prefix:                  ${prefix}
-        rootprefix:              ${with_rootprefix}
-        libexec dir:             ${libexecdir}
+        root dir:                ${with_rootdir}
         lib dir:                 ${libdir}
         rootlib dir:             ${with_rootlibdir}
-        PAM modules dir:         ${with_pamlibdir}
+        pam modules dir:         ${with_pamlibdir}
         udev rules dir:          ${with_udevrulesdir}
-        D-Bus policy dir:        ${with_dbuspolicydir}
-        D-Bus session dir:       ${with_dbussessionservicedir}
-        D-Bus system dir:        ${with_dbussystemservicedir}
-        D-Bus interfaces dir:    ${with_dbusinterfacedir}
-        Split /usr:              ${enable_split_usr}
-        Build man pages:         ${have_manpages}
+        dbus policy dir:         ${with_dbuspolicydir}
+        dbus session dir:        ${with_dbussessionservicedir}
+        dbus system dir:         ${with_dbussystemservicedir}
+        dbus interfaces dir:     ${with_dbusinterfacedir}
 ])
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..a4cdcde
--- /dev/null
@@ -0,0 +1,27 @@
+systemd for Debian
+==================
+
+systemd can be installed alongside sysvinit and will not change the
+behaviour of the system out of the box.  This is intentional.  To test
+systemd, add:
+
+init=/bin/systemd
+
+to the kernel command line and then rebooting, or install the
+systemd-sysv package.
+
+Known bugs and problems
+=======================
+
+The PAM module makes su exit with an error after running the command,
+hiding the real exit status of the process.
+
+Older ifupdown's postinst has a bug where it ends up creating
+/etc/network/run as a normal directory rather than a symlink to
+/run.  This can cause network interfaces to not
+start correctly on boot.  The easiest way to fix this is to run:
+
+  mv /etc/network/run /lib/init/rw/network
+  ln -s /run /etc/network/run
+
+ -- Tollef Fog Heen <tfheen@debian.org>, Wed, 12 Oct 2011 08:43:50 +0200
diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..5eb39dc
--- /dev/null
@@ -0,0 +1,436 @@
+systemd (37-1slp2+s1) unstable; urgency=low
+
+  * Merge with Debian.
+  * slp: use new M4_DEFINES variable in Makefile.am instead of M4_DISTRO_FLAG.
+
+ -- Rafal Krypa <r.krypa@samsung.com>  Fri, 14 Oct 2011 10:16:47 +0200
+
+systemd (37-1) unstable; urgency=low
+
+  [ Tollef Fog Heen ]
+  * New upstream version
+  * Change the type of the debian-fixup service to oneshot.
+    Closes: #642961
+  * Add ConditionPathIsDirectory to lib-init-rw.automount and
+    lib-init-rw.mount so we only activate the unit if the directory
+    exists.  Closes: #633059
+  * If a sysv service exists in both rcS and rcN.d runlevels, drop the
+    rcN.d ones to avoid loops.  Closes: #637037
+  * Blacklist fuse init script, we do the same work already internally.
+    Closes: #643700
+  * Update README.Debian slightly for /run rather than /lib/init/rw
+
+  [ Josh Triplett ]
+  * Do a one-time migration of the $TMPTIME setting from /etc/default/rcS to
+    /etc/tmpfiles.d/tmp.conf. If /etc/default/rcS has a TMPTIME setting of
+    "infinite" or equivalent, migrate it to an /etc/tmpfiles.d/tmp.conf that
+    overrides the default /usr/lib/tmpfiles.d/tmp.conf and avoids clearing
+    /tmp.  Closes: #643698
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 28 Sep 2011 20:04:13 +0200
+
+systemd (36-1slp2+s1) unstable; urgency=low
+
+  * Merge with Debian.
+  * Remove debian-fixup service.
+  * Versioned dependency on dh-autoreconf.
+
+ -- Rafal Krypa <r.krypa@samsung.com>  Thu, 29 Sep 2011 16:06:45 +0200
+
+systemd (36-1) unstable; urgency=low
+
+  [ Tollef Fog Heen ]
+  * New upstream release. Closes: #634618
+    - Various man page fixes. Closes: #623521
+  * Add debian-fixup service that symlinks mtab to /proc/mounts and
+    migrates /var/run and /var/lock to symlinks to /run
+
+  [ Michael Biebl ]
+  * Build for libnotify 0.7.
+  * Bump Build-Depends on libudev to (>= 172).
+  * Add Build-Depends on libacl1-dev. Required for building systemd-logind
+    with ACL support.
+  * Split libsystemd-login and libsystemd-daemon into separate binary
+    packages.
+  * As autoreconf doesn't like intltool, override dh_autoreconf and call
+    intltoolize and autoreconf ourselves.
+  * Add Build-Depends on intltool.
+  * Do a one-time migration of the hwclock configuration. If UTC is set to
+    "no" in /etc/default/rcS, create /etc/adjtime and add the "LOCAL" setting.
+  * Remove /cgroup cleanup code from postinst.
+  * Add Build-Depends on gperf.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 14 Sep 2011 08:25:17 +0200
+
+systemd (29-1) unstable; urgency=low
+
+  [ Tollef Fog Heen ]
+  * New upstream version, Closes: #630510
+    - Includes typo fixes in documentation.  Closes: #623520
+  * Fall back to the init script reload function if a native .service file
+    doesn't know how to reload.  Closes: #628186
+  * Add hard dependency on udev.  Closes: #627921
+
+  [ Michael Biebl ]
+  * hwclock-load.service is no longer installed, so we don't need to remove it
+    anymore in debian/rules.
+  * Install /usr/lib directory for binfmt.d, modules-load.d, tmpfiles.d and
+    sysctl.d.
+  * Remove obsolete conffiles from /etc/tmpfiles.d on upgrades. Those files
+    are installed in /usr/lib/tmpfiles.d now.
+  * Depend on util-linux (>= 2.19.1-2) which provides whole-disk locking
+    support in fsck and remove our revert patch.
+  * Don't choke when systemd was compiled with a different CAP_LAST_CAP then
+    what it is run with. Patch cherry-picked from upstream Git.
+    Closes: #628081
+  * Enable dev-hugepages.automount and dev-mqueue.automount only when enabled
+    in kernel. Patch cherry-picked from upstream Git.  Closes: #624522
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 08 Jun 2011 16:14:31 +0200
+
+systemd (25-2slp2+s10) unstable; urgency=low
+
+  [ Rafal Krypa ]
+  * Allow disabling of documentation build by "--disable-docs" configure flag.
+
+  [ Mike McCormack ]
+  * Install the .pc file under libdir
+  * rpm: Add spec file
+
+  [ Karol Lewandowski ]
+  * slp: Start getty on board-agnostic serial device
+  * slp: Kill mkcompatdev hack
+  * slp: Kill mdev
+  * slp: Get rid of mnt-db.(auto)mount - it's c110-specific
+  * rpm: Start getty on board-agnostic serial device
+  * Move .pc files to proper location
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Tue, 27 Sep 2011 20:32:14 +0900
+
+systemd (25-2slp2+s9) unstable; urgency=low
+
+  * debian: Don't conflict with klogd
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Mon, 05 Sep 2011 15:33:26 +0200
+
+systemd (25-2slp2+s8) unstable; urgency=low
+
+  * slp: Re-add broken mmc devices faster in bootup sequence
+  * slp: Adjust mount points to new fs layout
+  * slp: Drop unused media.mount
+  * slp: Move SLP-specific rules back to proper place
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 31 Aug 2011 20:03:11 +0200
+
+systemd (25-2slp2+s7) unstable; urgency=low
+
+  * Add libsystemd-daemon library
+  * Expand few more variables for libsystemd-daemon.pc.in
+  * Add myself to list of maintainers
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Thu, 04 Aug 2011 14:59:48 +0200
+
+systemd (25-2slp2+s6) unstable; urgency=low
+
+  * Add /var/lock -> /run/lock bind mount point
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Thu, 14 Jul 2011 16:11:04 +0200
+
+systemd (25-2slp2+s5) unstable; urgency=low
+
+  * Limit amount of systemd-tagged ttys
+  * HACK: Decrease log level to avoid console lockups on Limo REV2.0
+    boards
+  * Kill SysV-compatibility runlevel directories
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Tue, 21 Jun 2011 13:33:54 +0200
+
+systemd (25-2slp2+s4) unstable; urgency=low
+
+  * Revert "Customize sysv-rc scripts path on SLP"
+  * Revert "Don't start readahead related services on slp"
+  * slp: Merge slp-specific parts in makefile
+  * slp: Make bind-mounting /var/run and /var/lock unconditional
+  * slp: Bind mount /var/{cache,lib,log} like it's done on SLP
+  * slp: Don't install Debian-specific /lib/init/rw auto mount point
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Thu, 09 Jun 2011 14:50:14 +0200
+
+systemd (25-2slp2+s3) unstable; urgency=low
+
+  * slp: Create compatibility /run directory
+  * Make sure we remount rootfs read-writable
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 08 Jun 2011 16:06:15 +0200
+
+systemd (25-2slp2+s2) unstable; urgency=low
+
+  * Add usr/etc once again
+  * debian: Don't try to delete LICENSE - it isn't installed anymore
+  * Add slp-compatible mount fstab replacements
+  * slp: Drop unit files for busybox logging deamons
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Fri, 27 May 2011 17:50:32 +0200
+
+systemd (25-2slp2+s1) unstable; urgency=low
+
+  * debian: Avoid using GNU-specific options in installation scripts
+  * Merge slp2-customizations for systemd
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Tue, 24 May 2011 17:00:39 +0200
+
+systemd (25-2) experimental; urgency=low
+
+  * Handle downgrades more gracefully by removing diversion of
+    /lib/lsb/init-functions on downgrades to << 25-1.
+  * Cherry-pick a133bf10d09f788079b82f63faa7058a27ba310b from upstream,
+    avoids assert when dumping properties.  Closes: #624094
+  * Remove "local" in non-function context in init-functions wrapper.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 27 Apr 2011 22:20:04 +0200
+
+systemd (25-1) experimental; urgency=low
+
+  * New upstream release, target experimental due to initscripts
+    dependency.
+    - Fixes where to look for locale config.  Closes: #619166
+  * Depend on initscripts >= 2.88dsf-13.4 for /run transition.
+  * Add Conflicts on klogd, since it doesn't work correctly with the
+    kmg→/dev/log bridge.  Closes: #622555
+  * Add suggests on Python for systemd-analyze.
+  * Divert /lib/lsb/init-functions instead of (ab)using
+    /etc/lsb-base-logging.sh for diverting calls to /etc/init.d/*
+  * Remove obsolete conffile /etc/lsb-base-logging.sh.  Closes: #619093
+  * Backport 3a90ae048233021833ae828c1fc6bf0eeab46197 from master:
+    mkdir /run/systemd/system when starting up
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sun, 24 Apr 2011 09:02:04 +0200
+
+systemd (24-0slp2+s4) unstable; urgency=low
+
+  * slp: Add service to generate slp-compatible devices at bootup
+  * slp: Tag slp-specific ttys
+  * slp: Use kernel tty device name
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 04 May 2011 14:56:35 +0200
+
+systemd (24-0slp2+s3) unstable; urgency=low
+
+  * Fix: Don't use const pointer for for const data
+  * slp: Fixup serial-getty@ once again
+  * slp: Don't mount binfmt_misc nor security fs; disable cryptsetup
+    target
+  * slp: Don't use accept4()
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 20 Apr 2011 19:35:24 +0200
+
+systemd (24-0slp2+s2) unstable; urgency=low
+
+  * debian: Update systemd.install to match upstream changes
+  * Fixup serial-getty@ service on slp
+  * Move busybox services to units/slp
+  * Automatically install busybox services for slp
+  * Install only serial-getty@ on slp
+  * Revert "debian: Don't try to remove service files which aren't
+    installed on slp"
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Fri, 15 Apr 2011 12:12:29 +0200
+
+systemd (24-0slp2+s1) unstable; urgency=low
+
+  * Sync with upstream
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 13 Apr 2011 19:28:40 +0200
+
+systemd (20-1) unstable; urgency=low
+
+  * New upstream version
+  * Install systemd-machine-id-setup
+  * Call systemd-machine-id-setup in postinst
+  * Cherry-pick b8a021c9e276adc9bed5ebfa39c3cab0077113c6 from upstream to
+    prevent dbus assert error.
+  * Enable TCP wrapper support.  Closes: #618409
+  * Enable SELinux support.  Closes: #618412
+  * Make getty start after Apache2 and OpenVPN (which are the only two
+    known users of X-Interactive: yes).  Closes: #618419
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 11 Mar 2011 19:14:21 +0100
+
+systemd (19-1slp2+s3) unstable; urgency=low
+
+  * debian: Don't remove doc/LICENSE - it isn't installed anymore
+  * Revert "debian/systemd.install: include SLP config directory
+    /usr/etc"
+  * debian: Don't try to remove service files which aren't installed on
+    slp
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 13 Apr 2011 19:09:28 +0200
+
+systemd (19-1slp2+s2) unstable; urgency=low
+
+  * Add missing piece to make --with-distro=slp really work
+  * Customize sysv-rc scripts path on SLP
+  * Install serial-getty by default on SLP
+  * Don't install getty@ services on SLP
+  * Add busybox klogd service for slp
+  * Add busybox syslogd service for slp
+  * Don't start readahead related services on slp
+  * Pretty print SLP name
+  * Change default log level to debug
+
+ -- Karol Lewandowski <k.lewandowsk@samsung.com>  Wed, 13 Apr 2011 11:54:03 +0200
+
+systemd (19-1slp2+s1) unstable; urgency=low
+
+  * Set myself as SLP maintainer.
+  * Disable GUI, PAM, AUDIT, cryptsetup.
+  * Add versioned build dependency on linux-libc-dev.
+  * debian/systemd.install: include SLP config directory /usr/etc
+  * Drop version specification from util-linux dependency in systemd package.
+  * Initial customization for SLP.
+
+ -- Rafal Krypa <r.krypa@samsung.com>  Fri, 04 Mar 2011 13:26:14 +0100
+
+systemd (19-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Add systemd-tmpfiles to systemd package.
+  * Add ifup@.service for handling hotplugged interfaces from
+    udev.  Closes: #610871
+  * Mask mtab.service and udev-mtab.service as they are pointless when
+    /etc/mtab is a symlink to /proc/mounts
+  * Add breaks on lvm2 (<< 2.02.84-1) since older versions have udev rules
+    that don't work well with systemd causing delays on bootup.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu, 17 Feb 2011 07:36:22 +0100
+
+systemd (17-1) experimental; urgency=low
+
+  [ Tollef Fog Heen ]
+  * New upstream release
+  * Clarify ifupdown instructions in README.Debian somewhat.
+    Closes: #613320
+  * Silently skip masked services in lsb-base-logging.sh instead of
+    failing.  Initial implementation by Michael Biebl.  Closes: #612551
+  * Disable systemd-vconsole-setup.service for now.
+
+  [ Michael Biebl ]
+  * Bump build dependency on valac-0.10 to (>= 0.10.3).
+  * Improve regex in lsb-base-logging.sh for X-Interactive scripts.
+    Closes: #613325
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Wed, 16 Feb 2011 21:06:16 +0100
+
+systemd (16-1) experimental; urgency=low
+
+  [ Tollef Fog Heen ]
+  * New upstream release.  Closes: #609611
+  * Get rid of now obsolete patches that are upstream.
+  * Use the built-in cryptsetup support in systemd, build-depend on
+    libcryptsetup-dev (>= 2:1.2.0-1) to get a libcryptsetup in /lib.
+  * Don't use systemctl redirect for init scripts with X-Interactive: true
+
+  [ Michael Biebl ]
+  * Update package description
+  * Use v8 debhelper syntax
+  * Make single-user mode work
+  * Run hwclock-save.service on shutdown
+  * Remove dependencies on legacy sysv mount scripts, as we use native
+    mounting.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sun, 16 Jan 2011 11:04:13 +0100
+
+systemd (15-1) UNRELEASED; urgency=low
+
+  [ Tollef Fog Heen ]
+  * New upstream version, thanks a lot to Michael Biebl for help with
+    preparing this version.
+    - This version handles cycle breaking better.  Closes: #609225
+  * Add libaudit-dev to build-depends
+  * /usr/share/systemd/session has been renamed to /usr/share/systemd/user
+    upstream, adjust build system accordingly.
+  * Remove -s from getty serial console invocation.
+  * Add dependency on new util-linux to make sure /sbin/agetty exists
+  * Don't mount /var/lock with gid=lock (Debian has no such group).
+  * Document problem with ifupdown's /etc/network/run being a normal
+    directory.
+
+  [ Michael Biebl ]
+  * Revert upstream change which requires libnotify 0.7 (not yet available in
+    Debian).
+  * Use dh-autoreconf for updating the build system.
+  * Revert upstream commit which uses fsck -l (needs a newer version of
+    util-linux).
+  * Explicitly disable cryptsetup support to not accidentally pick up a
+    libcryptsetup dependency in a tainted build environment, as the library
+    is currently installed in /usr/lib.
+  * Remove autogenerated man pages and vala C sources, so they are rebuilt.
+  * Use native systemd mount support:
+    - Use MountAuto=yes and SwapAuto=yes (default) in system.conf
+    - Mask SysV init mount, check and cleanup scripts.
+    - Create an alias (symlink) for checkroot (→ remount-rootfs.service) as
+      synchronization point for SysV init scripts.
+  * Mask x11-common, rmnologin, hostname, bootmisc and bootlogd.
+  * Create an alias for procps (→ systemd-sysctl.service) and
+    urandom (→ systemd-random-seed-load.service).
+  * Create an alias for module-init-tools (→ systemd-modules-load.service) and
+    a symlink from /etc/modules-load.d/modules.conf â†’ /etc/modules.
+  * Install lsb-base hook which redirects calls to SysV init scripts to
+    systemctl: /etc/init.d/<foo> <action> â†’ systemctl <action> <foo.service>
+  * Install a (auto)mount unit to mount /lib/init/rw early during boot.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sat, 20 Nov 2010 09:28:01 +0100
+
+systemd (11-2) UNRELEASED; urgency=low
+
+  * Tighten depends from systemd-* on systemd to ensure they're upgraded
+    in lockstep.  Thanks to Michael Biebl for the patch.
+  * Add missing #DEBHELPER# token to libpam-systemd
+  * Stop messing with runlevel5/multi-user.target symlink, this is handled
+    correctly upstream.
+  * Stop shipping /cgroup in the package.
+  * Remove tmpwatch services, Debian doesn't have or use tmpwatch.
+  * Make sure to enable GTK bits.
+  * Ship password agent
+  * Clean up cgroups properly on upgrades, thanks to Michael Biebl for the
+    patch.  Closes: #599577
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Tue, 02 Nov 2010 21:47:10 +0100
+
+systemd (11-1) experimental; urgency=low
+
+  * New upstream version.  Closes: #597284
+  * Add pam-auth-update calls to libpam-systemd's postinst and prerm
+  * Make systemd-sysv depend on systemd
+  * Now mounts the cgroup fs in /sys/fs/cgroup.  Closes: #595966
+  * Add libnotify-dev to build-depends (needed for systemadm)
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu, 07 Oct 2010 22:01:19 +0200
+
+systemd (8-2) experimental; urgency=low
+
+  * Hardcode udev rules dir in configure call.
+  * Remove README.source as it's no longer accurate.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Mon, 30 Aug 2010 21:10:26 +0200
+
+systemd (8-1) experimental; urgency=low
+
+  * New upstream release
+  * Only ship the top /cgroup
+  * Pass --with-rootdir= to configure, to make it think / is / rather
+    than //
+  * Add PAM module package
+  * Fix up dependencies in local-fs.target.  Closes: #594420
+  * Move systemadm to its own package.  Closes: #588451
+  * Update standards-version (no changes needed)
+  * Update README.Debian to explain how to use systemd.
+  * Add systemd-sysv package that provides /sbin/init and friends.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sat, 07 Aug 2010 07:31:38 +0200
+
+systemd (0~git+20100605+dfd8ee-1) experimental; urgency=low
+
+  * Initial release, upload to experimental.  Closes: #580814
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Fri, 30 Apr 2010 21:02:25 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..2eed354
--- /dev/null
@@ -0,0 +1,129 @@
+Source: systemd
+Section: admin
+Priority: extra
+Maintainer: Rafal Krypa <r.krypa@samsung.com>, Karol Lewandowski <k.lewandowsk@samsung.com>, DongGi Jang <dg0402.jang@samsung.com>
+X-Original-Maintainer: Tollef Fog Heen <tfheen@debian.org>
+Standards-Version: 3.9.1
+Vcs-Git: git://git.err.no/systemd/
+Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary
+Homepage: http://www.freedesktop.org/wiki/Software/systemd
+Build-Depends: debhelper (>= 7.0.50),
+               libcap-dev,
+               pkg-config,
+               libudev-dev (>= 172),
+               libdbus-1-dev (>= 1.3.2~),
+               libdbus-glib-1-dev,
+               xsltproc,
+               docbook-xsl,
+               docbook-xml,
+               m4,
+               dh-autoreconf (>= 4),
+               intltool,
+               libacl1-dev,
+               linux-libc-dev (>= 2.6.31),
+               gperf
+
+Package: systemd
+Architecture: linux-any
+Section: admin
+Priority: extra
+Recommends: libpam-systemd
+Suggests: systemd-gui, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, util-linux, udev
+Breaks: lvm2 (<< 2.02.84-1)
+Description: system and service manager
+ systemd is a replacement for sysvinit.  It is dependency-based and
+ able to read the LSB init script headers in addition to parsing rcN.d
+ links as hints.
+ .
+ It also provides process supervision using cgroups and the ability to
+ not only depend on other init script being started, but also
+ availability of a given mount point or dbus service.
+
+Package: systemd-sysv
+Architecture: linux-any
+Section: admin
+Priority: extra
+Conflicts: sysvinit, upstart, runit-run
+Replaces: sysvinit
+Depends: systemd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: system and service manager - SysV links
+ systemd is a replacement for sysvinit.  It is dependency-based and
+ able to read the LSB init script headers in addition to parsing rcN.d
+ links as hints.
+ .
+ It also provides process supervision using cgroups and the ability to
+ not only depend on other init script being started, but also
+ availability of a given mount point or dbus service.
+ .
+ This package provides the manual pages and links needed for systemd
+ to replace sysvinit.
+
+Package: libpam-systemd
+Architecture: linux-any
+Section: admin
+Priority: extra
+Depends: systemd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: system and service manager - PAM module
+ systemd is a replacement for sysvinit.  It is dependency-based and
+ able to read the LSB init script headers in addition to parsing rcN.d
+ links as hints.
+ .
+ It also provides process supervision using cgroups and the ability to
+ not only depend on other init script being started, but also
+ availability of a given mount point or dbus service.
+ .
+ This package contains the PAM module which registers user sessions in
+ the systemd control group hierarchy
+
+Package: systemd-gui
+Architecture: linux-any
+Section: admin
+Priority: extra
+Depends: systemd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: system and service manager - GUI
+ systemd is a replacement for sysvinit.  It is dependency-based and
+ able to read the LSB init script headers in addition to parsing rcN.d
+ links as hints.
+ .
+ It also provides process supervision using cgroups and the ability to
+ not only depend on other init script being started, but also
+ availability of a given mount point or dbus service.
+ .
+ This package contains the graphical frontend for systemd.
+
+Package: libsystemd-login0
+Architecture: linux-any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: systemd login utility library
+ The libsystemd-login library provides an interface for the
+ systemd-logind service which is used to track user sessions and seats.
+
+Package: libsystemd-login-dev
+Architecture: linux-any
+Section: libdevel
+Depends: libsystemd-login0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: systemd login utility library - development files
+ The libsystemd-login library provides an interface for the
+ systemd-logind service which is used to track user sessions and seats.
+ .
+ This package contains the development files
+
+Package: libsystemd-daemon0
+Architecture: linux-any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: systemd utility library
+ The sd-daemon library provides a reference implementation of various
+ APIs for new-style daemons, as implemented by the systemd init system.
+
+Package: libsystemd-daemon-dev
+Architecture: linux-any
+Section: libdevel
+Depends: libsystemd-daemon0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: systemd utility library - development files
+ The sd-daemon library provides a reference implementation of various
+ APIs for new-style daemons, as implemented by the systemd init system.
+ .
+ This package contains the development files
diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..dd56ec7
--- /dev/null
@@ -0,0 +1,23 @@
+Downloaded from http://cgit.freedesktop.org/systemd/, packaged by
+Tollef Fog Heen <tfheen@debian.org> 2010-04-30 21:00.
+
+Copyright:
+
+  Copyright 2010 Lennart Poettering
+  Copyright 2010 Maarten Lankhorst
+  Copyright 1995-2004 Miquel van Smoorenburg
+
+Authors:
+
+  Lennart Poettering
+  Kay Sievers
+
+Licence:
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+please see /usr/share/common-licenses/GPL-2 for the full text of the
+GPL version 2.
diff --git a/debian/debian-fixup b/debian/debian-fixup
new file mode 100755 (executable)
index 0000000..399afb8
--- /dev/null
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+set -e
+
+if [ ! -L /etc/mtab ]; then
+    ln -sf /proc/mounts /etc/mtab
+fi
+if [ ! -L /var/run ]; then
+    rm -rf /var/run
+    ln -s /run /var/run
+fi
+if [ ! -L /var/lock ]; then
+    rm -rf /var/lock
+    ln -s /run/lock /var/lock
+fi
+exit 0
diff --git a/debian/debian-fixup.service b/debian/debian-fixup.service
new file mode 100644 (file)
index 0000000..6848466
--- /dev/null
@@ -0,0 +1,10 @@
+[Unit]
+Description=Various fixups to make systemd work better on Debian
+Before=var-run.mount var-lock.mount
+After=remount-rootfs.service
+DefaultDependencies=no
+
+[Service]
+ExecStart=/lib/systemd/debian-fixup
+Type=oneshot
+RemainAfterExit=true
diff --git a/debian/ifup@.service b/debian/ifup@.service
new file mode 100644 (file)
index 0000000..4d5cc8c
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=Start ifup for %I
+After=local-fs.target
+
+[Service]
+ExecStart=/sbin/ifup --allow=hotplug %I
+ExecStop=/sbin/ifdown %I
+RemainAfterExit=true
diff --git a/debian/init-functions b/debian/init-functions
new file mode 100644 (file)
index 0000000..81e4bd7
--- /dev/null
@@ -0,0 +1,99 @@
+# -*-Shell-script-*-
+# /lib/lsb/init-functions
+
+. /lib/lsb/init-functions.systemd
+
+if [ -e /sys/fs/cgroup/systemd ] ; then
+    # Some init scripts use "set -e" and "set -u", we don't want that
+    # here
+    set +e
+    set +u
+
+    if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] ; then
+    # If we are called by a maintainer script, chances are good that a
+    # new or updated sysv init script was installed.  Reload daemon to
+    # pick up any changes.
+       echo "Reloading systemd"
+       systemctl daemon-reload
+    fi
+
+    # Redirect SysV init scripts when executed by the user
+    if [ $PPID -ne 1 ] && [ -z "$init" ] && [ -z "$_SYSTEMCTL_SKIP_REDIRECT" ] ; then
+        case $(readlink -f "$0") in
+            /etc/init.d/*)
+               # Don't redirect if the init script has X-Interactive: true
+               if ! grep -qs "^# X-Interactive:.*true" "$0"; then
+                   _use_systemctl=1
+               fi
+               # Redirect if there's a matching .service file in /etc or /lib
+               prog=${0##*/}
+               service="${prog%.sh}.service"
+               fp=$(systemctl -p FragmentPath show $service 2>/dev/null | sed 's/^FragmentPath=//')
+               case "$fp"  in
+                   /lib/systemd/system/*|/etc/systemd/system/*)
+                       _use_systemctl=1
+                       ;;
+               esac
+                # Some services can't reload through the .service file,
+                # but can through the init script.
+               if [ "$(systemctl -p CanReload show $service 2>/dev/null)" = "CanReload=no" ] && [ "$1" = "reload" ]; then
+                   _use_systemctl=0
+            fi
+            ;;
+       esac
+    else
+       export _SYSTEMCTL_SKIP_REDIRECT="true"
+    fi
+else
+    _use_systemctl=0
+fi
+
+systemctl_redirect () {
+       local s
+       local rc
+       local prog=${1##*/}
+        local command=$2
+
+       case "$command" in
+       start)
+               s="Starting $prog (via systemctl)"
+               ;;
+       stop)
+               s="Stopping $prog (via systemctl)"
+               ;;
+       reload|force-reload)
+               s="Reloading $prog configuration (via systemctl)"
+               ;;
+       restart)
+               s="Restarting $prog (via systemctl)"
+               ;;
+       esac
+
+       service="${prog%.sh}.service"
+
+       # Don't try to run masked services. Don't check for errors, if
+       # this errors, we'll just call systemctl and possibly explode
+       # there.
+       state=$(systemctl -p LoadState show $service 2>/dev/null)
+       [ "$state" = "LoadState=masked" ] && return 0
+
+       [ "$command" = status ] || log_daemon_msg "$s" "$service"
+       /bin/systemctl $command "$service"
+       rc=$?
+       [ "$command" = status ] || log_end_msg $rc
+
+       return $rc
+}
+
+if [ "$_use_systemctl" = "1" ]; then
+        if  [ "x$1" = xstart -o \
+                "x$1" = xstop -o \
+                "x$1" = xrestart -o \
+                "x$1" = xreload -o \
+                "x$1" = xforce-reload -o \
+                "x$1" = xstatus ] ; then
+
+               systemctl_redirect $0 $1
+               exit $?
+       fi
+fi
similarity index 63%
rename from sysctl.d/coredump.conf.in
rename to debian/lib-init-rw.automount
index ab19b1e..f32a921 100644 (file)
@@ -5,6 +5,11 @@
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
 
-# See sysctl.d(5) for details
+[Unit]
+Description=Debian early rw Automount Point
+DefaultDependencies=no
+Before=basic.target
+ConditionPathIsDirectory=/lib/init/rw
 
-kernel.core_pattern=|@rootlibexecdir@/systemd-coredump %p %u %g %s %t %e
+[Automount]
+Where=/lib/init/rw
diff --git a/debian/lib-init-rw.mount b/debian/lib-init-rw.mount
new file mode 100644 (file)
index 0000000..f3650d2
--- /dev/null
@@ -0,0 +1,10 @@
+[Unit]
+Description=Debian early rw mount
+DefaultDependencies=no
+ConditionPathIsDirectory=/lib/init/rw
+
+[Mount]
+What=tmpfs
+Where=/lib/init/rw
+Type=tmpfs
+Options=mode=0755,nosuid
diff --git a/debian/libpam-systemd.install b/debian/libpam-systemd.install
new file mode 100644 (file)
index 0000000..18b8af9
--- /dev/null
@@ -0,0 +1,2 @@
+lib/security/pam_systemd.so
+usr/share/man/man8/pam_systemd.8
diff --git a/debian/libpam-systemd.postinst b/debian/libpam-systemd.postinst
new file mode 100644 (file)
index 0000000..c6177d8
--- /dev/null
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+pam-auth-update --package
+
+#DEBHELPER#
diff --git a/debian/libpam-systemd.prerm b/debian/libpam-systemd.prerm
new file mode 100644 (file)
index 0000000..7b57168
--- /dev/null
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+set -e
+
+# pam-auth-update --remove removes the named profile from the active config.
+# It arguably should be called during deconfigure as well, but deconfigure
+# can happen in some cases during a dist-upgrade and we don't want to
+# deconfigure all PAM modules in the middle of a dist-upgrade by accident.
+#
+# More importantly, with the current implementation, --remove also removes
+# all local preferences for the named config (such as whether it's enabled
+# or disabled), which we don't want to do on deconfigure.
+#
+# This may need to change later as pam-auth-update evolves.
+
+if [ "$1" = "remove" ] ; then
+    pam-auth-update --package --remove systemd
+fi
+
+#DEBHELPER#
diff --git a/debian/libsystemd-daemon-dev.install b/debian/libsystemd-daemon-dev.install
new file mode 100644 (file)
index 0000000..3a20bfc
--- /dev/null
@@ -0,0 +1,3 @@
+usr/lib/libsystemd-daemon.so
+usr/lib/pkgconfig/libsystemd-daemon.pc
+usr/include/systemd/sd-daemon.h
diff --git a/debian/libsystemd-daemon0.install b/debian/libsystemd-daemon0.install
new file mode 100644 (file)
index 0000000..48d464a
--- /dev/null
@@ -0,0 +1 @@
+lib/libsystemd-daemon.so.*
diff --git a/debian/libsystemd-daemon0.symbols b/debian/libsystemd-daemon0.symbols
new file mode 100644 (file)
index 0000000..5c064cc
--- /dev/null
@@ -0,0 +1,12 @@
+libsystemd-daemon.so.0 libsystemd-daemon0 #MINVER#
+ LIBSYSTEMD_DAEMON_31@LIBSYSTEMD_DAEMON_31 31
+ sd_booted@LIBSYSTEMD_DAEMON_31 31
+ sd_is_fifo@LIBSYSTEMD_DAEMON_31 31
+ sd_is_mq@LIBSYSTEMD_DAEMON_31 31
+ sd_is_socket@LIBSYSTEMD_DAEMON_31 31
+ sd_is_socket_inet@LIBSYSTEMD_DAEMON_31 31
+ sd_is_socket_unix@LIBSYSTEMD_DAEMON_31 31
+ sd_is_special@LIBSYSTEMD_DAEMON_31 31
+ sd_listen_fds@LIBSYSTEMD_DAEMON_31 31
+ sd_notify@LIBSYSTEMD_DAEMON_31 31
+ sd_notifyf@LIBSYSTEMD_DAEMON_31 31
diff --git a/debian/libsystemd-login-dev.install b/debian/libsystemd-login-dev.install
new file mode 100644 (file)
index 0000000..d6a0367
--- /dev/null
@@ -0,0 +1,3 @@
+usr/lib/libsystemd-login.so
+usr/lib/pkgconfig/libsystemd-login.pc
+usr/include/systemd/sd-login.h
diff --git a/debian/libsystemd-login0.install b/debian/libsystemd-login0.install
new file mode 100644 (file)
index 0000000..02ccaf8
--- /dev/null
@@ -0,0 +1 @@
+lib/libsystemd-login.so.*
diff --git a/debian/libsystemd-login0.symbols b/debian/libsystemd-login0.symbols
new file mode 100644 (file)
index 0000000..9441669
--- /dev/null
@@ -0,0 +1,21 @@
+libsystemd-login.so.0 libsystemd-login0 #MINVER#
+ LIBSYSTEMD_LOGIN_31@LIBSYSTEMD_LOGIN_31 31
+ sd_get_seats@LIBSYSTEMD_LOGIN_31 31
+ sd_get_sessions@LIBSYSTEMD_LOGIN_31 31
+ sd_get_uids@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_flush@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_get_fd@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_new@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_unref@LIBSYSTEMD_LOGIN_31 31
+ sd_pid_get_owner_uid@LIBSYSTEMD_LOGIN_31 31
+ sd_pid_get_session@LIBSYSTEMD_LOGIN_31 31
+ sd_seat_can_multi_session@LIBSYSTEMD_LOGIN_31 31
+ sd_seat_get_active@LIBSYSTEMD_LOGIN_31 31
+ sd_seat_get_sessions@LIBSYSTEMD_LOGIN_31 31
+ sd_session_get_seat@LIBSYSTEMD_LOGIN_31 31
+ sd_session_get_uid@LIBSYSTEMD_LOGIN_31 31
+ sd_session_is_active@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_get_seats@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_get_sessions@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_get_state@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_is_on_seat@LIBSYSTEMD_LOGIN_31 31
diff --git a/debian/pam-configs/systemd b/debian/pam-configs/systemd
new file mode 100644 (file)
index 0000000..b31ad4b
--- /dev/null
@@ -0,0 +1,6 @@
+Name: Register user sessions in the systemd control group hierarchy
+Default: yes
+Priority: 0
+Session-Type: Additional
+Session:
+       optional        pam_systemd.so
diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..2766f13
--- /dev/null
@@ -0,0 +1,65 @@
+#! /usr/bin/make -f
+
+DISTRIBUTION := SLP
+
+#export DH_VERBOSE=1
+#export DEB_BUILD_OPTIONS="nostrip"
+
+ifeq ($(DISTRIBUTION),SLP)
+DH_OPTIONS += -Nlibpam-systemd -Nsystemd-gui
+export DH_OPTIONS
+endif
+
+override_dh_auto_configure:
+ifeq ($(DISTRIBUTION),SLP)
+       dh_auto_configure -- \
+               --with-rootdir= \
+               --with-rootlibdir=/lib \
+               --with-udevrulesdir=/lib/udev/rules.d \
+               --disable-gtk \
+               --disable-libcryptsetup \
+               --disable-audit \
+               --disable-pam \
+               --disable-tcpwrap \
+               --disable-selinux \
+               --with-distro=slp
+else
+       dh_auto_configure -- \
+               --with-rootdir= \
+               --with-rootlibdir=/lib \
+               --with-udevrulesdir=/lib/udev/rules.d \
+               --enable-gtk \
+               --enable-libcryptsetup \
+               --enable-tcpwrap \
+               --enable-selinux
+endif
+
+override_dh_auto_clean:
+       dh_auto_clean
+       rm -f man/*.[1358]
+       rm -f src/systemadm.c
+       rm -f src/gnome-ask-password-agent.c
+       rm -f src/systemd-interfaces.c
+
+override_dh_install:
+ifneq ($(DISTRIBUTION),SLP)
+       rm debian/tmp/lib/security/pam_systemd.la
+endif
+       rm debian/tmp/usr/lib/*.la
+       rm debian/tmp/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service
+       chmod +x debian/debian-fixup
+       dh_install -O--parallel --fail-missing
+ifneq ($(DISTRIBUTION),SLP)
+       dh_install -plibpam-systemd debian/pam-configs /usr/share
+endif
+       dh_install debian/ifup@.service /lib/systemd/system
+
+autoreconf:
+       intltoolize -f
+       autoreconf -f -i
+
+override_dh_autoreconf:
+       dh_autoreconf debian/rules -- autoreconf
+
+%:
+       dh $@ --parallel --with autoreconf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..7423a2d
--- /dev/null
@@ -0,0 +1 @@
+single-debian-patch
diff --git a/debian/systemd-gui.install b/debian/systemd-gui.install
new file mode 100644 (file)
index 0000000..ca6555b
--- /dev/null
@@ -0,0 +1,3 @@
+usr/bin/systemadm
+usr/share/man/man1/systemadm.1
+usr/bin/systemd-gnome-ask-password-agent
diff --git a/debian/systemd-hack-up-the-source.hook b/debian/systemd-hack-up-the-source.hook
new file mode 100755 (executable)
index 0000000..7ccca0a
--- /dev/null
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+set -x
+
+find -name Makefile -type l -print -delete
+rm -r test1 test2 src/Makefile
+. /usr/share/gitpkg/hooks/quilt-patches-deb-export-hook
diff --git a/debian/systemd-sysv.install b/debian/systemd-sysv.install
new file mode 100644 (file)
index 0000000..0f6f677
--- /dev/null
@@ -0,0 +1,7 @@
+usr/share/man/man8/telinit.8
+usr/share/man/man1/init.1
+usr/share/man/man8/runlevel.8
+usr/share/man/man8/shutdown.8
+usr/share/man/man8/poweroff.8
+usr/share/man/man8/reboot.8
+usr/share/man/man8/halt.8
diff --git a/debian/systemd-sysv.links b/debian/systemd-sysv.links
new file mode 100644 (file)
index 0000000..dca459f
--- /dev/null
@@ -0,0 +1,7 @@
+/bin/systemd /sbin/init
+/bin/systemctl /sbin/telinit
+/bin/systemctl /sbin/runlevel
+/bin/systemctl /sbin/shutdown
+/bin/systemctl /sbin/poweroff
+/bin/systemctl /sbin/reboot
+/bin/systemctl /sbin/halt
diff --git a/debian/systemd.dirs b/debian/systemd.dirs
new file mode 100644 (file)
index 0000000..f5bdd21
--- /dev/null
@@ -0,0 +1 @@
+run
diff --git a/debian/systemd.install b/debian/systemd.install
new file mode 100644 (file)
index 0000000..8a2a894
--- /dev/null
@@ -0,0 +1,38 @@
+etc
+usr/etc
+bin/systemd
+bin/systemctl
+bin/systemd-notify
+bin/systemd-tty-ask-password-agent
+bin/systemd-ask-password
+bin/systemd-machine-id-setup
+bin/systemd-tmpfiles
+bin/systemd-loginctl
+lib/systemd/
+lib/udev/rules.d/
+usr/bin/systemd-cgls
+usr/bin/systemd-nspawn
+usr/bin/systemd-stdio-bridge
+usr/bin/systemd-analyze
+usr/share/man/man1/systemd-notify.1
+usr/share/man/man1/systemd-cgls.1
+usr/share/man/man1/systemd.1
+usr/share/man/man1/systemctl.1
+usr/share/man/man1/systemd-nspawn.1
+usr/share/man/man1/systemd-ask-password.1
+usr/share/man/man1/systemd-loginctl.1
+usr/share/man/man3
+usr/share/man/man5
+usr/share/man/man7
+usr/share/man/man8/systemd-tmpfiles.8
+usr/share/dbus-1
+usr/share/doc
+usr/share/pkgconfig
+usr/share/polkit-1
+usr/share/systemd/kbd-model-map
+usr/lib/binfmt.d
+usr/lib/modules-load.d
+usr/lib/sysctl.d
+usr/lib/systemd
+usr/lib/tmpfiles.d
+debian/init-functions lib/lsb
diff --git a/debian/systemd.links b/debian/systemd.links
new file mode 100644 (file)
index 0000000..007035b
--- /dev/null
@@ -0,0 +1,55 @@
+# These are all services which have native implementations
+# So we mask them by linking against /dev/null or create an alias
+/lib/systemd/system/systemd-random-seed-load.service /lib/systemd/system/urandom.service
+/lib/systemd/system/systemd-sysctl.service /lib/systemd/system/procps.service
+
+/lib/systemd/system/systemd-modules-load.service /lib/systemd/system/module-init-tools.service
+/etc/modules /etc/modules-load.d/modules.conf
+
+/dev/null /lib/systemd/system/x11-common.service
+/dev/null /lib/systemd/system/hostname.service
+/dev/null /lib/systemd/system/rmnologin.service
+/dev/null /lib/systemd/system/bootmisc.service
+
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643700
+/dev/null /lib/systemd/system/fuse.service
+
+# Although bootlogd is disabled by default (via /etc/default/bootlogd)
+# by masking them we avoid spawning a shell uselessly thrice during boot.
+# Besides, bootlogd doesn't look particularly useful in a systemd world.
+/dev/null /lib/systemd/system/bootlogd.service
+/dev/null /lib/systemd/system/stop-bootlogd-single.service
+/dev/null /lib/systemd/system/stop-bootlogd.service
+
+# These are pointless, /etc/mtab should be a symlink
+/dev/null /lib/systemd/system/mtab.service
+/dev/null /lib/systemd/system/udev-mtab.service
+
+# TODO: make hwclock a symlink to hwclock-load.service?
+# Before this can happen we need to ensure that the 85-hwclock.rules
+# udev rule is not triggered when running systemd.
+/dev/null /lib/systemd/system/hwclock.service
+/dev/null /lib/systemd/system/hwclockfirst.service
+
+# We use native mount support so mask those services
+# TODO: check if any sysv init script depends on those facilities
+/dev/null /lib/systemd/system/mountkernfs.service
+/dev/null /lib/systemd/system/mountdevsubfs.service
+/dev/null /lib/systemd/system/mountall.service
+/dev/null /lib/systemd/system/mountall-bootclean.service
+/dev/null /lib/systemd/system/mountnfs.service
+/dev/null /lib/systemd/system/mountnfs-bootclean.service
+/dev/null /lib/systemd/system/checkfs.service
+# We need checkroot as synchronisation point, so symlink it to remount-rootfs
+/lib/systemd/system/remount-rootfs.service /lib/systemd/system/checkroot.service
+
+# We use the built-in cryptsetup support
+/dev/null /lib/systemd/system/cryptdisks.service
+/dev/null /lib/systemd/system/cryptdisks-early.service
+
+# Single user mode is implemented natively, don't use legacy SysV init scripts
+# to avoid spawning sulogin twice.
+/dev/null /lib/systemd/system/single.service
+/dev/null /lib/systemd/system/killprocs.service
+
+# TODO: mtab/udev-mtab (symlink /etc/mtab to /proc/self/mounts in postinst)
diff --git a/debian/systemd.postinst b/debian/systemd.postinst
new file mode 100644 (file)
index 0000000..7f7c2da
--- /dev/null
@@ -0,0 +1,45 @@
+#! /bin/sh
+
+set -e
+
+if [ -n "$2" ]; then
+    systemctl daemon-reexec || true
+fi
+
+# Do a one-time migration of the local time setting
+if dpkg --compare-versions "$2" lt "33-1"; then
+    if [ -f /etc/default/rcS ]; then
+        . /etc/default/rcS
+    fi
+    if [ "$UTC" = "no" ] && [ ! -e /etc/adjtime ]; then
+        printf "0.0 0 0.0\n0\nLOCAL" > /etc/adjtime
+    fi
+fi
+
+# Do a one-time migration of the TMPTIME setting
+if dpkg --compare-versions "$2" lt "36-2"; then
+    if [ -f /etc/default/rcS ]; then
+        . /etc/default/rcS
+    fi
+    if [ ! -e /etc/tmpfiles.d/tmp.conf ]; then
+        case "$TMPTIME" in
+            -*|infinite|infinity)
+                cat > /etc/tmpfiles.d/tmp.conf <<EOF
+# Automatically migrated from TMPTIME in /etc/default/rcS
+# Clear /var/tmp as in /usr/lib/tmpfiles.d/tmp.conf, but avoid clearing /tmp
+d /var/tmp 1777 root root 30d
+EOF
+                ;;
+        esac
+    fi
+fi
+
+systemd-machine-id-setup
+
+dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@"
+
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd -- "$@"
+
+#DEBHELPER#
diff --git a/debian/systemd.postrm b/debian/systemd.postrm
new file mode 100644 (file)
index 0000000..dfa97dc
--- /dev/null
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = remove ] || [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 25-1; then
+    dpkg-divert --remove --package systemd --rename \
+        --divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions
+fi
+
+dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@"
+
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/systemd.preinst b/debian/systemd.preinst
new file mode 100644 (file)
index 0000000..3028dad
--- /dev/null
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+    dpkg-divert --add --package systemd --rename \
+        --divert /lib/lsb/init-functions.systemd /lib/lsb/init-functions
+fi
+
+dpkg-maintscript-helper rm_conffile /etc/lsb-base-logging.sh 20-1 systemd -- "$@"
+
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/legacy.conf 25-2 systemd -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/systemd.conf 25-2 systemd -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/tmpfiles.d/x11.conf 25-2 systemd -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/depcomp b/depcomp
deleted file mode 100755 (executable)
index bd0ac08..0000000
--- a/depcomp
+++ /dev/null
@@ -1,688 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2011-12-04.11; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[     ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${
-              s/^ *//
-              s/ \\*$//
-              s/$/:/
-              p
-            }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[   ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/      \1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/        /
-  G
-  p
-}' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-       set fnord "$@"
-       shift
-       shift
-       ;;
-    *)
-       set fnord "$@" "$arg"
-       shift
-       shift
-       ;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::     \1 \\:p' >> "$depfile"
-  echo "       " >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/install-sh b/install-sh
deleted file mode 100755 (executable)
index a9244eb..0000000
+++ /dev/null
@@ -1,527 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2011-01-19.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""       $nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-       shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-       case $mode in
-         *' '* | *'    '* | *'
-'*       | *'*'* | *'?'* | *'['*)
-           echo "$0: invalid mode: $mode" >&2
-           exit 1;;
-       esac
-       shift;;
-
-    -o) chowncmd="$chownprog $2"
-       shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-       # Protect names problematic for `test' and other utilities.
-       case $dst_arg in
-         -* | [=\(\)!]) dst_arg=./$dst_arg;;
-       esac
-       shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)        shift
-       break;;
-
-    -*)        echo "$0: invalid option: $1" >&2
-       exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-       u_plus_rw=
-      else
-       u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-       u_plus_rw=
-      else
-       u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for `test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-       echo "$0: $dst_arg: Is a directory" >&2
-       exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-       (dirname "$dst") 2>/dev/null ||
-       expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-            X"$dst" : 'X\(//\)[^/]' \| \
-            X"$dst" : 'X\(//\)$' \| \
-            X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-       echo X"$dst" |
-           sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-                  s//\1/
-                  q
-                }
-                /^X\(\/\/\)[^/].*/{
-                  s//\1/
-                  q
-                }
-                /^X\(\/\/\)$/{
-                  s//\1/
-                  q
-                }
-                /^X\(\/\).*/{
-                  s//\1/
-                  q
-                }
-                s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-       # Create intermediate dirs using mode 755 as modified by the umask.
-       # This is like FreeBSD 'install' as of 1997-10-28.
-       umask=`umask`
-       case $stripcmd.$umask in
-         # Optimize common cases.
-         *[2367][2367]) mkdir_umask=$umask;;
-         .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-         *[0-7])
-           mkdir_umask=`expr $umask + 22 \
-             - $umask % 100 % 40 + $umask % 20 \
-             - $umask % 10 % 4 + $umask % 2
-           `;;
-         *) mkdir_umask=$umask,go-w;;
-       esac
-
-       # With -d, create the new directory with the user-specified mode.
-       # Otherwise, rely on $mkdir_umask.
-       if test -n "$dir_arg"; then
-         mkdir_mode=-m$mode
-       else
-         mkdir_mode=
-       fi
-
-       posix_mkdir=false
-       case $umask in
-         *[123567][0-7][0-7])
-           # POSIX mkdir -p sets u+wx bits regardless of umask, which
-           # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-           ;;
-         *)
-           tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-           trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-           if (umask $mkdir_umask &&
-               exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-           then
-             if test -z "$dir_arg" || {
-                  # Check for POSIX incompatibilities with -m.
-                  # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                  # other-writeable bit of parent directory when it shouldn't.
-                  # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                  ls_ld_tmpdir=`ls -ld "$tmpdir"`
-                  case $ls_ld_tmpdir in
-                    d????-?r-*) different_mode=700;;
-                    d????-?--*) different_mode=755;;
-                    *) false;;
-                  esac &&
-                  $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                    ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-                    test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                  }
-                }
-             then posix_mkdir=:
-             fi
-             rmdir "$tmpdir/d" "$tmpdir"
-           else
-             # Remove any dirs left behind by ancient mkdir implementations.
-             rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-           fi
-           trap '' 0;;
-       esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-       umask $mkdir_umask &&
-       $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-       /*) prefix='/';;
-       [-=\(\)!]*) prefix='./';;
-       *)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-       test X"$d" = X && continue
-
-       prefix=$prefix$d
-       if test -d "$prefix"; then
-         prefixes=
-       else
-         if $posix_mkdir; then
-           (umask=$mkdir_umask &&
-            $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-           # Don't fail if two instances are running concurrently.
-           test -d "$prefix" || exit 1
-         else
-           case $prefix in
-             *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-             *) qprefix=$prefix;;
-           esac
-           prefixes="$prefixes '$qprefix'"
-         fi
-       fi
-       prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-       # Don't fail if two instances are running concurrently.
-       (umask $mkdir_umask &&
-        eval "\$doit_exec \$mkdirprog $prefixes") ||
-         test -d "$dstdir" || exit 1
-       obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"    2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-       # Now remove or move aside any old file at destination location.
-       # We try this two ways since rm can't unlink itself on some
-       # systems and the destination file might be busy for other
-       # reasons.  In this case, the final cleanup might fail but the new
-       # file should still install successfully.
-       {
-         test ! -f "$dst" ||
-         $doit $rmcmd -f "$dst" 2>/dev/null ||
-         { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-           { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-         } ||
-         { echo "$0: cannot unlink or rename $dst" >&2
-           (exit 1); exit 1
-         }
-       } &&
-
-       # Now rename the file to the real destination.
-       $doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/libsystemd_basic_la_vala.stamp b/libsystemd_basic_la_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/libsystemd_core_la_vala.stamp b/libsystemd_core_la_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/libsystemd_daemon_la_vala.stamp b/libsystemd_daemon_la_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libsystemd_id128_la_vala.stamp b/libsystemd_id128_la_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libsystemd_journal_la_vala.stamp b/libsystemd_journal_la_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/libsystemd_login_la_vala.stamp b/libsystemd_login_la_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/ltmain.sh b/ltmain.sh
deleted file mode 100644 (file)
index 63ae69d..0000000
--- a/ltmain.sh
+++ /dev/null
@@ -1,9655 +0,0 @@
-
-# libtool (GNU libtool) 2.4.2
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:        $host
-#         shell:               $SHELL
-#         compiler:            $LTCC
-#         compiler flags:              $LTCFLAGS
-#         linker:              $LD (gnu? $with_gnu_ld)
-#         $progname:   (GNU libtool) 2.4.2
-#         automake:    $automake_version
-#         autoconf:    $autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-         export $lt_var
-         lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-         lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-       fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77     # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS="  $lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-               s@/\./@/@g
-               t dotsl
-               s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-       # list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-       IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-       func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-       my_arg=`$ECHO "$1" | $SED \
-           -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \    ]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-       eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-           $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-       eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-       :more
-       /\./!{
-         N
-         s/\n# / /
-         b more
-       }
-       :go
-       /^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-       s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-       s/^# *$//
-       s/\$progname/'$progname'/
-       p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-       :print
-        s/^# //
-       s/^# *$//
-       s*\$progname*'$progname'*
-       s*\$host*'"$host"'*
-       s*\$SHELL*'"$SHELL"'*
-       s*\$LTCC*'"$LTCC"'*
-       s*\$LTCFLAGS*'"$LTCFLAGS"'*
-       s*\$LD*'"$LD"'*
-       s/\$with_gnu_ld/'"$with_gnu_ld"'/
-       s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-       s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-       p
-       d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-       taglist="$taglist $tagname"
-
-       # Evaluate the configuration.  Be careful to quote the path
-       # and the sed script, to avoid splitting on whitespace, but
-       # also don't use non-portable quotes within backquotes within
-       # quotes we have to do it in 2 steps:
-       extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-       eval "$extractedcf"
-      else
-       func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)      opt_debug='set -x'
-                       func_echo "enabling shell trace mode"
-                       $opt_debug
-                       ;;
-      --dry-run|--dryrun|-n)
-                       opt_dry_run=:
-                       ;;
-      --config)
-                       opt_config=:
-func_config
-                       ;;
-      --dlopen|-dlopen)
-                       optarg="$1"
-                       opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-                       shift
-                       ;;
-      --preserve-dup-deps)
-                       opt_preserve_dup_deps=:
-                       ;;
-      --features)
-                       opt_features=:
-func_features
-                       ;;
-      --finish)
-                       opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-                       ;;
-      --help)
-                       opt_help=:
-                       ;;
-      --help-all)
-                       opt_help_all=:
-opt_help=': help-all'
-                       ;;
-      --mode)
-                       test $# = 0 && func_missing_arg $opt && break
-                       optarg="$1"
-                       opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-                       shift
-                       ;;
-      --no-silent|--no-quiet)
-                       opt_silent=false
-func_append preserve_args " $opt"
-                       ;;
-      --no-warning|--no-warn)
-                       opt_warning=false
-func_append preserve_args " $opt"
-                       ;;
-      --no-verbose)
-                       opt_verbose=false
-func_append preserve_args " $opt"
-                       ;;
-      --silent|--quiet)
-                       opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-                       ;;
-      --verbose|-v)
-                       opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-                       ;;
-      --tag)
-                       test $# = 0 && func_missing_arg $opt && break
-                       optarg="$1"
-                       opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-                       shift
-                       ;;
-
-      -\?|-h)          func_usage                              ;;
-      --help)          func_help                               ;;
-      --version)       func_version                            ;;
-
-      # Separate optargs to long options:
-      --*=*)
-                       func_split_long_opt "$opt"
-                       set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-                       shift
-                       ;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-                       func_split_short_opt "$opt"
-                       set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-                       shift
-                       ;;
-
-      --)              break                                   ;;
-      -*)              func_fatal_help "unrecognized option \`$opt'" ;;
-      *)               set dummy "$opt" ${1+"$@"};     shift; break  ;;
-    esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
-
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-       for lalib_p_l in 1 2 3 4
-       do
-           read lalib_p_line
-           case "$lalib_p_line" in
-               \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-           esac
-       done
-       exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)        . "$1" ;;
-    *)         . "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-       func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-       for z in $available_tags; do
-         if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-           # Evaluate the configuration.
-           eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-           CC_quoted=
-           for arg in $CC; do
-             # Double-quote args containing other shell metacharacters.
-             func_append_quoted CC_quoted "$arg"
-           done
-           CC_expanded=`func_echo_all $CC`
-           CC_quoted_expanded=`func_echo_all $CC_quoted`
-           case "$@ " in
-           " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-           " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-             # The compiler in the base compile command matches
-             # the one in the tagged configuration.
-             # Assume this is the tagged configuration we want.
-             tagname=$z
-             break
-             ;;
-           esac
-         fi
-       done
-       # If $tagname still isn't set, then no tagged configuration
-       # was found and let the user know that the "--tag" command
-       # line option must be used.
-       if test -z "$tagname"; then
-         func_echo "unable to infer tagged configuration"
-         func_fatal_error "specify a tag with \`--tag'"
-#      else
-#        func_verbose "using $tagname tagged configuration"
-       fi
-       ;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-       # do not "continue".  Instead, add this to base_compile
-       lastarg="$arg"
-       arg_mode=normal
-       ;;
-
-      target )
-       libobj="$arg"
-       arg_mode=normal
-       continue
-       ;;
-
-      normal )
-       # Accept any command-line options.
-       case $arg in
-       -o)
-         test -n "$libobj" && \
-           func_fatal_error "you cannot specify \`-o' more than once"
-         arg_mode=target
-         continue
-         ;;
-
-       -pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-         continue
-         ;;
-
-       -shared | -static | -prefer-pic | -prefer-non-pic)
-         func_append later " $arg"
-         continue
-         ;;
-
-       -no-suppress)
-         suppress_opt=no
-         continue
-         ;;
-
-       -Xcompiler)
-         arg_mode=arg  #  the next one goes into the "base_compile" arg list
-         continue      #  The current "srcfile" will either be retained or
-         ;;            #  replaced later.  I would guess that would be a bug.
-
-       -Wc,*)
-         func_stripname '-Wc,' '' "$arg"
-         args=$func_stripname_result
-         lastarg=
-         save_ifs="$IFS"; IFS=','
-         for arg in $args; do
-           IFS="$save_ifs"
-           func_append_quoted lastarg "$arg"
-         done
-         IFS="$save_ifs"
-         func_stripname ' ' '' "$lastarg"
-         lastarg=$func_stripname_result
-
-         # Add the arguments to base_compile.
-         func_append base_compile " $lastarg"
-         continue
-         ;;
-
-       *)
-         # Accept the current argument as the source file.
-         # The previous "srcfile" becomes the current argument.
-         #
-         lastarg="$srcfile"
-         srcfile="$arg"
-         ;;
-       esac  #  case $arg
-       ;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-       func_basename "$srcfile"
-       libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-       test "$build_libtool_libs" != yes && \
-         func_fatal_configuration "can not build a shared library"
-       build_old_libs=no
-       continue
-       ;;
-
-      -static)
-       build_libtool_libs=no
-       build_old_libs=yes
-       continue
-       ;;
-
-      -prefer-pic)
-       pic_mode=yes
-       continue
-       ;;
-
-      -prefer-non-pic)
-       pic_mode=no
-       continue
-       ;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'   &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-       func_echo "Waiting for $lockfile to be removed"
-       sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-       $ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-       $opt_dry_run || $RM $removelist
-       exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-       command="$base_compile $qsrcfile $pic_flag"
-      else
-       # Don't build PIC code
-       command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-       # Place PIC objects in $objdir
-       func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command" \
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-       $ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-       $opt_dry_run || $RM $removelist
-       exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-       func_show_eval '$MV "$output_obj" "$lobj"' \
-         'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-       suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-       # Don't build PIC code
-       command="$base_compile $qsrcfile$pie_flag"
-      else
-       command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-       func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-        test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-       $ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-       $opt_dry_run || $RM $removelist
-       exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-       func_show_eval '$MV "$output_obj" "$obj"' \
-         'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-       removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-       func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-       echo
-       func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-       H
-       d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-       || func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-       func_resolve_sysroot "$file"
-       file=$func_resolve_sysroot_result
-
-       # Check to see that this really is a libtool archive.
-       func_lalib_unsafe_p "$file" \
-         || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-       # Read the libtool library.
-       dlname=
-       library_names=
-       func_source "$file"
-
-       # Skip this library if it cannot be dlopened.
-       if test -z "$dlname"; then
-         # Warn if it was a shared library.
-         test -n "$library_names" && \
-           func_warning "\`$file' was not linked with \`-export-dynamic'"
-         continue
-       fi
-
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-
-       if test -f "$dir/$objdir/$dlname"; then
-         func_append dir "/$objdir"
-       else
-         if test ! -f "$dir/$dlname"; then
-           func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-         fi
-       fi
-       ;;
-
-      *.lo)
-       # Just add the directory containing the .lo file.
-       func_dirname "$file" "" "."
-       dir="$func_dirname_result"
-       ;;
-
-      *)
-       func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-       continue
-       ;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-       eval "$shlibpath_var=\"\$dir\""
-      else
-       eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-       # Do a test to see if this is really a libtool program.
-       if func_ltwrapper_script_p "$file"; then
-         func_source "$file"
-         # Transform arg to wrapped name.
-         file="$progdir/$program"
-       elif func_ltwrapper_executable_p "$file"; then
-         func_ltwrapper_scriptname "$file"
-         func_source "$func_ltwrapper_scriptname_result"
-         # Transform arg to wrapped name.
-         file="$progdir/$program"
-       fi
-       ;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-       # Export the shlibpath_var.
-       eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-       eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-             else
-               $lt_unset $lt_var
-             fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-       eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-       echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-       func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-       if func_lalib_unsafe_p "$opt"; then
-         func_append libs " $opt"
-       else
-         func_warning "\`$opt' is not a valid libtool archive"
-       fi
-
-      else
-       func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-         sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-           > $tmpdir/tmp-la
-         mv -f $tmpdir/tmp-la $lib
-       done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-       if test -n "$finish_cmds"; then
-         # Do each command in the finish commands.
-         func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-       fi
-       if test -n "$finish_eval"; then
-         # Do the single finish_eval.
-         eval cmds=\"$finish_eval\"
-         $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-       fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-       $ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-       echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-       echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-       echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-       echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-       libdir=LIBDIR
-       eval flag=\"$hardcode_libdir_flag_spec\"
-
-       $ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-       $ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-       echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-       solaris2.[6789]|solaris2.1[0-9])
-         echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-         echo "pages."
-         ;;
-       *)
-         echo "more information, such as the ld(1) and ld.so(8) manual pages."
-         ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-       func_append files " $dest"
-       dest=$arg
-       continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-       if $install_cp; then :; else
-         prev=$arg
-       fi
-       ;;
-      -g | -m | -o)
-       prev=$arg
-       ;;
-      -s)
-       stripme=" -s"
-       continue
-       ;;
-      -*)
-       ;;
-      *)
-       # If the previous option needed an argument, then skip it.
-       if test -n "$prev"; then
-         if test "x$prev" = x-m && test -n "$install_override_mode"; then
-           arg2=$install_override_mode
-           no_mode=false
-         fi
-         prev=
-       else
-         dest=$arg
-         continue
-       fi
-       ;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-       func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-       func_quote_for_eval "$install_override_mode"
-       func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-       func_fatal_help "no file or destination specified"
-      else
-       func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-       func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-       case $file in
-       *.lo) ;;
-       *)
-         func_fatal_help "\`$destdir' must be an absolute directory name"
-         ;;
-       esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-       # Do the static libraries later.
-       func_append staticlibs " $file"
-       ;;
-
-      *.la)
-       func_resolve_sysroot "$file"
-       file=$func_resolve_sysroot_result
-
-       # Check to see that this really is a libtool archive.
-       func_lalib_unsafe_p "$file" \
-         || func_fatal_help "\`$file' is not a valid libtool archive"
-
-       library_names=
-       old_library=
-       relink_command=
-       func_source "$file"
-
-       # Add the libdir to current_libdirs if it is the destination.
-       if test "X$destdir" = "X$libdir"; then
-         case "$current_libdirs " in
-         *" $libdir "*) ;;
-         *) func_append current_libdirs " $libdir" ;;
-         esac
-       else
-         # Note the libdir as a future libdir.
-         case "$future_libdirs " in
-         *" $libdir "*) ;;
-         *) func_append future_libdirs " $libdir" ;;
-         esac
-       fi
-
-       func_dirname "$file" "/" ""
-       dir="$func_dirname_result"
-       func_append dir "$objdir"
-
-       if test -n "$relink_command"; then
-         # Determine the prefix the user has applied to our future dir.
-         inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-         # Don't allow the user to place us outside of our expected
-         # location b/c this prevents finding dependent libraries that
-         # are installed to the same prefix.
-         # At present, this check doesn't affect windows .dll's that
-         # are installed into $libdir/../bin (currently, that works fine)
-         # but it's something to keep an eye on.
-         test "$inst_prefix_dir" = "$destdir" && \
-           func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-         if test -n "$inst_prefix_dir"; then
-           # Stick the inst_prefix_dir data into the link command.
-           relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-         else
-           relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-         fi
-
-         func_warning "relinking \`$file'"
-         func_show_eval "$relink_command" \
-           'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-       fi
-
-       # See the names of the shared library.
-       set dummy $library_names; shift
-       if test -n "$1"; then
-         realname="$1"
-         shift
-
-         srcname="$realname"
-         test -n "$relink_command" && srcname="$realname"T
-
-         # Install the shared library and build the symlinks.
-         func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-             'exit $?'
-         tstripme="$stripme"
-         case $host_os in
-         cygwin* | mingw* | pw32* | cegcc*)
-           case $realname in
-           *.dll.a)
-             tstripme=""
-             ;;
-           esac
-           ;;
-         esac
-         if test -n "$tstripme" && test -n "$striplib"; then
-           func_show_eval "$striplib $destdir/$realname" 'exit $?'
-         fi
-
-         if test "$#" -gt 0; then
-           # Delete the old symlinks, and create new ones.
-           # Try `ln -sf' first, because the `ln' binary might depend on
-           # the symlink we replace!  Solaris /bin/ln does not understand -f,
-           # so we also need to try rm && ln -s.
-           for linkname
-           do
-             test "$linkname" != "$realname" \
-               && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-           done
-         fi
-
-         # Do each command in the postinstall commands.
-         lib="$destdir/$realname"
-         func_execute_cmds "$postinstall_cmds" 'exit $?'
-       fi
-
-       # Install the pseudo-library for information purposes.
-       func_basename "$file"
-       name="$func_basename_result"
-       instname="$dir/$name"i
-       func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-       # Maybe install the static library, too.
-       test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-       ;;
-
-      *.lo)
-       # Install (i.e. copy) a libtool object.
-
-       # Figure out destination file name, if it wasn't already specified.
-       if test -n "$destname"; then
-         destfile="$destdir/$destname"
-       else
-         func_basename "$file"
-         destfile="$func_basename_result"
-         destfile="$destdir/$destfile"
-       fi
-
-       # Deduce the name of the destination old-style object file.
-       case $destfile in
-       *.lo)
-         func_lo2o "$destfile"
-         staticdest=$func_lo2o_result
-         ;;
-       *.$objext)
-         staticdest="$destfile"
-         destfile=
-         ;;
-       *)
-         func_fatal_help "cannot copy a libtool object to \`$destfile'"
-         ;;
-       esac
-
-       # Install the libtool object if requested.
-       test -n "$destfile" && \
-         func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-       # Install the old object if enabled.
-       if test "$build_old_libs" = yes; then
-         # Deduce the name of the old-style object file.
-         func_lo2o "$file"
-         staticobj=$func_lo2o_result
-         func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-       fi
-       exit $EXIT_SUCCESS
-       ;;
-
-      *)
-       # Figure out destination file name, if it wasn't already specified.
-       if test -n "$destname"; then
-         destfile="$destdir/$destname"
-       else
-         func_basename "$file"
-         destfile="$func_basename_result"
-         destfile="$destdir/$destfile"
-       fi
-
-       # If the file is missing, and there is a .exe on the end, strip it
-       # because it is most likely a libtool script we actually want to
-       # install
-       stripped_ext=""
-       case $file in
-         *.exe)
-           if test ! -f "$file"; then
-             func_stripname '' '.exe' "$file"
-             file=$func_stripname_result
-             stripped_ext=".exe"
-           fi
-           ;;
-       esac
-
-       # Do a test to see if this is really a libtool program.
-       case $host in
-       *cygwin* | *mingw*)
-           if func_ltwrapper_executable_p "$file"; then
-             func_ltwrapper_scriptname "$file"
-             wrapper=$func_ltwrapper_scriptname_result
-           else
-             func_stripname '' '.exe' "$file"
-             wrapper=$func_stripname_result
-           fi
-           ;;
-       *)
-           wrapper=$file
-           ;;
-       esac
-       if func_ltwrapper_script_p "$wrapper"; then
-         notinst_deplibs=
-         relink_command=
-
-         func_source "$wrapper"
-
-         # Check the variables that should have been set.
-         test -z "$generated_by_libtool_version" && \
-           func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-         finalize=yes
-         for lib in $notinst_deplibs; do
-           # Check to see that each library is installed.
-           libdir=
-           if test -f "$lib"; then
-             func_source "$lib"
-           fi
-           libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-           if test -n "$libdir" && test ! -f "$libfile"; then
-             func_warning "\`$lib' has not been installed in \`$libdir'"
-             finalize=no
-           fi
-         done
-
-         relink_command=
-         func_source "$wrapper"
-
-         outputname=
-         if test "$fast_install" = no && test -n "$relink_command"; then
-           $opt_dry_run || {
-             if test "$finalize" = yes; then
-               tmpdir=`func_mktempdir`
-               func_basename "$file$stripped_ext"
-               file="$func_basename_result"
-               outputname="$tmpdir/$file"
-               # Replace the output file specification.
-               relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-               $opt_silent || {
-                 func_quote_for_expand "$relink_command"
-                 eval "func_echo $func_quote_for_expand_result"
-               }
-               if eval "$relink_command"; then :
-                 else
-                 func_error "error: relink \`$file' with the above command before installing it"
-                 $opt_dry_run || ${RM}r "$tmpdir"
-                 continue
-               fi
-               file="$outputname"
-             else
-               func_warning "cannot relink \`$file'"
-             fi
-           }
-         else
-           # Install the binary that we compiled earlier.
-           file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-         fi
-       fi
-
-       # remove .exe since cygwin /usr/bin/install will append another
-       # one anyway
-       case $install_prog,$host in
-       */usr/bin/install*,*cygwin*)
-         case $file:$destfile in
-         *.exe:*.exe)
-           # this is ok
-           ;;
-         *.exe:*)
-           destfile=$destfile.exe
-           ;;
-         *:*.exe)
-           func_stripname '' '.exe' "$destfile"
-           destfile=$func_stripname_result
-           ;;
-         esac
-         ;;
-       esac
-       func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-       $opt_dry_run || if test -n "$outputname"; then
-         ${RM}r "$tmpdir"
-       fi
-       ;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-       func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-       my_dlsyms="${my_outputname}S.c"
-      else
-       func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-       # Discover the nlist of each of the dlfiles.
-       nlist="$output_objdir/${my_outputname}.nm"
-
-       func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-       # Parse the name list into a source file.
-       func_verbose "creating $output_objdir/$my_dlsyms"
-
-       $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-       if test "$dlself" = yes; then
-         func_verbose "generating symbol list for \`$output'"
-
-         $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-         # Add our own program objects to the symbol list.
-         progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-         for progfile in $progfiles; do
-           func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-           func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-           $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-         done
-
-         if test -n "$exclude_expsyms"; then
-           $opt_dry_run || {
-             eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-             eval '$MV "$nlist"T "$nlist"'
-           }
-         fi
-
-         if test -n "$export_symbols_regex"; then
-           $opt_dry_run || {
-             eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-             eval '$MV "$nlist"T "$nlist"'
-           }
-         fi
-
-         # Prepare the list of exported symbols
-         if test -z "$export_symbols"; then
-           export_symbols="$output_objdir/$outputname.exp"
-           $opt_dry_run || {
-             $RM $export_symbols
-             eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-             case $host in
-             *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-               ;;
-             esac
-           }
-         else
-           $opt_dry_run || {
-             eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-             eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-             eval '$MV "$nlist"T "$nlist"'
-             case $host in
-               *cygwin* | *mingw* | *cegcc* )
-                 eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                 eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-                 ;;
-             esac
-           }
-         fi
-       fi
-
-       for dlprefile in $dlprefiles; do
-         func_verbose "extracting global C symbols from \`$dlprefile'"
-         func_basename "$dlprefile"
-         name="$func_basename_result"
-          case $host in
-           *cygwin* | *mingw* | *cegcc* )
-             # if an import library, we need to obtain dlname
-             if func_win32_import_lib_p "$dlprefile"; then
-               func_tr_sh "$dlprefile"
-               eval "curr_lafile=\$libfile_$func_tr_sh_result"
-               dlprefile_dlbasename=""
-               if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-                 # Use subshell, to avoid clobbering current variable values
-                 dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-                 if test -n "$dlprefile_dlname" ; then
-                   func_basename "$dlprefile_dlname"
-                   dlprefile_dlbasename="$func_basename_result"
-                 else
-                   # no lafile. user explicitly requested -dlpreopen <import library>.
-                   $sharedlib_from_linklib_cmd "$dlprefile"
-                   dlprefile_dlbasename=$sharedlib_from_linklib_result
-                 fi
-               fi
-               $opt_dry_run || {
-                 if test -n "$dlprefile_dlbasename" ; then
-                   eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-                 else
-                   func_warning "Could not compute DLL name from $name"
-                   eval '$ECHO ": $name " >> "$nlist"'
-                 fi
-                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-                   $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-               }
-             else # not an import lib
-               $opt_dry_run || {
-                 eval '$ECHO ": $name " >> "$nlist"'
-                 func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-                 eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-               }
-             fi
-           ;;
-           *)
-             $opt_dry_run || {
-               eval '$ECHO ": $name " >> "$nlist"'
-               func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-               eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-             }
-           ;;
-          esac
-       done
-
-       $opt_dry_run || {
-         # Make sure we have at least an empty file.
-         test -f "$nlist" || : > "$nlist"
-
-         if test -n "$exclude_expsyms"; then
-           $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-           $MV "$nlist"T "$nlist"
-         fi
-
-         # Try sorting and uniquifying the output.
-         if $GREP -v "^: " < "$nlist" |
-             if sort -k 3 </dev/null >/dev/null 2>&1; then
-               sort -k 3
-             else
-               sort +2
-             fi |
-             uniq > "$nlist"S; then
-           :
-         else
-           $GREP -v "^: " < "$nlist" > "$nlist"S
-         fi
-
-         if test -f "$nlist"S; then
-           eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-         else
-           echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-         fi
-
-         echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-         case $need_lib_prefix in
-         no)
-           eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-           ;;
-         *)
-           eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-           ;;
-         esac
-         echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-       } # !$opt_dry_run
-
-       pic_flag_for_symtable=
-       case "$compile_command " in
-       *" -static "*) ;;
-       *)
-         case $host in
-         # compiling the symbol table file with pic_flag works around
-         # a FreeBSD bug that causes programs to crash when -lm is
-         # linked before any other PIC object.  But we must not use
-         # pic_flag when linking with -static.  The problem exists in
-         # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-         *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-           pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-         *-*-hpux*)
-           pic_flag_for_symtable=" $pic_flag"  ;;
-         *)
-           if test "X$my_pic_p" != Xno; then
-             pic_flag_for_symtable=" $pic_flag"
-           fi
-           ;;
-         esac
-         ;;
-       esac
-       symtab_cflags=
-       for arg in $LTCFLAGS; do
-         case $arg in
-         -pie | -fpie | -fPIE) ;;
-         *) func_append symtab_cflags " $arg" ;;
-         esac
-       done
-
-       # Now compile the dynamic symbol file.
-       func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-       # Clean up the generated files.
-       func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-       # Transform the symbol file into the correct name.
-       symfileobj="$output_objdir/${my_outputname}S.$objext"
-       case $host in
-       *cygwin* | *mingw* | *cegcc* )
-         if test -f "$output_objdir/$my_outputname.def"; then
-           compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-           finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-         else
-           compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-           finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-         fi
-         ;;
-       *)
-         compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-         finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-         ;;
-       esac
-       ;;
-      *)
-       func_fatal_error "unknown suffix for \`$my_dlsyms'"
-       ;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-       $SED -n -e '
-           1,100{
-               / I /{
-                   s,.*,import,
-                   p
-                   q
-               }
-           }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[         ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-       func_echo "Waiting for $lockfile to be removed"
-       sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-                  'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-       [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-       *) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-       *" $my_xlib_u "*)
-         func_arith $extracted_serial + 1
-         extracted_serial=$func_arith_result
-         my_xlib_u=lt$extracted_serial-$my_xlib ;;
-       *) break ;;
-       esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-       func_verbose "Extracting $my_xabs"
-       # Do not bother doing anything if just a dry run
-       $opt_dry_run || {
-         darwin_orig_dir=`pwd`
-         cd $my_xdir || exit $?
-         darwin_archive=$my_xabs
-         darwin_curdir=`pwd`
-         darwin_base_archive=`basename "$darwin_archive"`
-         darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-         if test -n "$darwin_arches"; then
-           darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-           darwin_arch=
-           func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-           for darwin_arch in  $darwin_arches ; do
-             func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-             cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-             func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-             cd "$darwin_curdir"
-             $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-           done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-           darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-           darwin_file=
-           darwin_files=
-           for darwin_file in $darwin_filelist; do
-             darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-             $LIPO -create -output "$darwin_file" $darwin_files
-           done # $darwin_filelist
-           $RM -rf unfat-$$
-           cd "$darwin_orig_dir"
-         else
-           cd $darwin_orig_dir
-           func_extract_an_archive "$my_xdir" "$my_xabs"
-         fi # $darwin_arches
-       } # !$opt_dry_run
-       ;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-       ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-       func_emit_wrapper_arg1=${1-no}
-
-       $ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-       if test "$fast_install" = yes; then
-         $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-         $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-       $ECHO \"\$relink_command_output\" >&2
-       $RM \"\$progdir/\$file\"
-       exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-       else
-         $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-       fi
-
-       $ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-       # fixup the dll searchpath if we need to.
-       #
-       # Fix the DLL searchpath if we need to.  Do this before prepending
-       # to shlibpath, because on Windows, both are PATH and uninstalled
-       # libraries must come first.
-       if test -n "$dllsearchpath"; then
-         $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-       fi
-
-       # Export our shlibpath_var if we have one.
-       if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-         $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-       fi
-
-       $ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-       cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-           cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-       (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-           cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-           if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-             cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-           else
-             cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-           fi
-
-           if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-             cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-           else
-             cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-           fi
-
-           if test "$fast_install" = yes; then
-             cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-           else
-             cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-           fi
-
-
-           cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-       {
-EOF
-           case "$host" in
-             *mingw* | *cygwin* )
-               # make stdout use "unix" line endings
-               echo "          setmode(1,_O_BINARY);"
-               ;;
-             esac
-
-           cat <<"EOF"
-         lt_dump_script (stdout);
-         return 0;
-       }
-      if (strcmp (argv[i], debug_opt) == 0)
-       {
-          lt_debug = 1;
-          continue;
-       }
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-                   "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-EOF
-           cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
-           cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-                 tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-                 actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-                 "(main) libtool target name: %s\n",
-                 target_name);
-EOF
-
-           cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-                   strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-           cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-           case $host_os in
-             mingw*)
-           cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-       *p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-       *p = '/';
-      }
-  }
-EOF
-           ;;
-           esac
-
-           cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-                 nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-                     i, nonnull (newargz[i]));
-    }
-
-EOF
-
-           case $host_os in
-             mingw*)
-               cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-                     "(main) failed to launch target \"%s\": %s\n",
-                     lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-               ;;
-             *)
-               cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-               ;;
-           esac
-
-           cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-                         string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-       return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-       {
-         concat_name = xstrdup (wrapper);
-         if (check_executable (concat_name))
-           return concat_name;
-         XFREE (concat_name);
-       }
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-       has_slash = 1;
-       break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-       {
-         for (p = path; *p; p = p_next)
-           {
-             const char *q;
-             size_t p_len;
-             for (q = p; *q; q++)
-               if (IS_PATH_SEPARATOR (*q))
-                 break;
-             p_len = q - p;
-             p_next = (*q == '\0' ? q : q + 1);
-             if (p_len == 0)
-               {
-                 /* empty path: current directory */
-                 if (getcwd (tmp, LT_PATHMAX) == NULL)
-                   lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-                 tmp_len = strlen (tmp);
-                 concat_name =
-                   XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-                 memcpy (concat_name, tmp, tmp_len);
-                 concat_name[tmp_len] = '/';
-                 strcpy (concat_name + tmp_len + 1, wrapper);
-               }
-             else
-               {
-                 concat_name =
-                   XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-                 memcpy (concat_name, p, p_len);
-                 concat_name[p_len] = '/';
-                 strcpy (concat_name + p_len + 1, wrapper);
-               }
-             if (check_executable (concat_name))
-               return concat_name;
-             XFREE (concat_name);
-           }
-       }
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-                     "checking path component for symlinks: %s\n",
-                     tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-       {
-         if (S_ISLNK (s.st_mode) != 0)
-           {
-             has_symlinks = 1;
-             break;
-           }
-
-         /* search backwards for last DIR_SEPARATOR */
-         p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-         while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-           p--;
-         if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-           {
-             /* no more DIR_SEPARATORS left */
-             break;
-           }
-         *p = '\0';
-       }
-      else
-       {
-         lt_fatal (__FILE__, __LINE__,
-                   "error accessing file \"%s\": %s",
-                   tmp_pathspec, nonnull (strerror (errno)));
-       }
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-               "could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-       *str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-              int line, const char *mode,
-              const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-                 "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-                 "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-                 "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-           case $host_os in
-             mingw*)
-               cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-       new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-       {
-         int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-         size_t length;
-         unsigned int backslashes;
-         const char *s;
-         char *quoted_string;
-         char *p;
-
-         length = 0;
-         backslashes = 0;
-         if (quote_around)
-           length++;
-         for (s = string; *s != '\0'; s++)
-           {
-             char c = *s;
-             if (c == '"')
-               length += backslashes + 1;
-             length++;
-             if (c == '\\')
-               backslashes++;
-             else
-               backslashes = 0;
-           }
-         if (quote_around)
-           length += backslashes + 1;
-
-         quoted_string = XMALLOC (char, length + 1);
-
-         p = quoted_string;
-         backslashes = 0;
-         if (quote_around)
-           *p++ = '"';
-         for (s = string; *s != '\0'; s++)
-           {
-             char c = *s;
-             if (c == '"')
-               {
-                 unsigned int j;
-                 for (j = backslashes + 1; j > 0; j--)
-                   *p++ = '\\';
-               }
-             *p++ = c;
-             if (c == '\\')
-               backslashes++;
-             else
-               backslashes = 0;
-           }
-         if (quote_around)
-           {
-             unsigned int j;
-             for (j = backslashes; j > 0; j--)
-               *p++ = '\\';
-             *p++ = '"';
-           }
-         *p = '\0';
-
-         new_argv[i] = quoted_string;
-       }
-      else
-       new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-               ;;
-           esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-           func_emit_wrapper yes |
-             $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-       test "$build_libtool_libs" != yes && \
-         func_fatal_configuration "can not build a shared library"
-       build_old_libs=no
-       break
-       ;;
-      -all-static | -static | -static-libtool-libs)
-       case $arg in
-       -all-static)
-         if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-           func_warning "complete static linking is impossible in this configuration"
-         fi
-         if test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=yes
-         ;;
-       -static)
-         if test -z "$pic_flag" && test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=built
-         ;;
-       -static-libtool-libs)
-         if test -z "$pic_flag" && test -n "$link_static_flag"; then
-           dlopen_self=$dlopen_self_static
-         fi
-         prefer_static_libs=yes
-         ;;
-       esac
-       build_libtool_libs=no
-       build_old_libs=yes
-       break
-       ;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-       case $prev in
-       output)
-         func_append compile_command " @OUTPUT@"
-         func_append finalize_command " @OUTPUT@"
-         ;;
-       esac
-
-       case $prev in
-       bindir)
-         bindir="$arg"
-         prev=
-         continue
-         ;;
-       dlfiles|dlprefiles)
-         if test "$preload" = no; then
-           # Add the symbol object into the linking commands.
-           func_append compile_command " @SYMFILE@"
-           func_append finalize_command " @SYMFILE@"
-           preload=yes
-         fi
-         case $arg in
-         *.la | *.lo) ;;  # We handle these cases below.
-         force)
-           if test "$dlself" = no; then
-             dlself=needless
-             export_dynamic=yes
-           fi
-           prev=
-           continue
-           ;;
-         self)
-           if test "$prev" = dlprefiles; then
-             dlself=yes
-           elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-             dlself=yes
-           else
-             dlself=needless
-             export_dynamic=yes
-           fi
-           prev=
-           continue
-           ;;
-         *)
-           if test "$prev" = dlfiles; then
-             func_append dlfiles " $arg"
-           else
-             func_append dlprefiles " $arg"
-           fi
-           prev=
-           continue
-           ;;
-         esac
-         ;;
-       expsyms)
-         export_symbols="$arg"
-         test -f "$arg" \
-           || func_fatal_error "symbol file \`$arg' does not exist"
-         prev=
-         continue
-         ;;
-       expsyms_regex)
-         export_symbols_regex="$arg"
-         prev=
-         continue
-         ;;
-       framework)
-         case $host in
-           *-*-darwin*)
-             case "$deplibs " in
-               *" $qarg.ltframework "*) ;;
-               *) func_append deplibs " $qarg.ltframework" # this is fixed later
-                  ;;
-             esac
-             ;;
-         esac
-         prev=
-         continue
-         ;;
-       inst_prefix)
-         inst_prefix_dir="$arg"
-         prev=
-         continue
-         ;;
-       objectlist)
-         if test -f "$arg"; then
-           save_arg=$arg
-           moreargs=
-           for fil in `cat "$save_arg"`
-           do
-#            func_append moreargs " $fil"
-             arg=$fil
-             # A libtool-controlled object.
-
-             # Check to see that this really is a libtool object.
-             if func_lalib_unsafe_p "$arg"; then
-               pic_object=
-               non_pic_object=
-
-               # Read the .lo file
-               func_source "$arg"
-
-               if test -z "$pic_object" ||
-                  test -z "$non_pic_object" ||
-                  test "$pic_object" = none &&
-                  test "$non_pic_object" = none; then
-                 func_fatal_error "cannot find name of object for \`$arg'"
-               fi
-
-               # Extract subdirectory from the argument.
-               func_dirname "$arg" "/" ""
-               xdir="$func_dirname_result"
-
-               if test "$pic_object" != none; then
-                 # Prepend the subdirectory the object is found in.
-                 pic_object="$xdir$pic_object"
-
-                 if test "$prev" = dlfiles; then
-                   if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-                     func_append dlfiles " $pic_object"
-                     prev=
-                     continue
-                   else
-                     # If libtool objects are unsupported, then we need to preload.
-                     prev=dlprefiles
-                   fi
-                 fi
-
-                 # CHECK ME:  I think I busted this.  -Ossama
-                 if test "$prev" = dlprefiles; then
-                   # Preload the old-style object.
-                   func_append dlprefiles " $pic_object"
-                   prev=
-                 fi
-
-                 # A PIC object.
-                 func_append libobjs " $pic_object"
-                 arg="$pic_object"
-               fi
-
-               # Non-PIC object.
-               if test "$non_pic_object" != none; then
-                 # Prepend the subdirectory the object is found in.
-                 non_pic_object="$xdir$non_pic_object"
-
-                 # A standard non-PIC object
-                 func_append non_pic_objects " $non_pic_object"
-                 if test -z "$pic_object" || test "$pic_object" = none ; then
-                   arg="$non_pic_object"
-                 fi
-               else
-                 # If the PIC object exists, use it instead.
-                 # $xdir was prepended to $pic_object above.
-                 non_pic_object="$pic_object"
-                 func_append non_pic_objects " $non_pic_object"
-               fi
-             else
-               # Only an error if not doing a dry-run.
-               if $opt_dry_run; then
-                 # Extract subdirectory from the argument.
-                 func_dirname "$arg" "/" ""
-                 xdir="$func_dirname_result"
-
-                 func_lo2o "$arg"
-                 pic_object=$xdir$objdir/$func_lo2o_result
-                 non_pic_object=$xdir$func_lo2o_result
-                 func_append libobjs " $pic_object"
-                 func_append non_pic_objects " $non_pic_object"
-               else
-                 func_fatal_error "\`$arg' is not a valid libtool object"
-               fi
-             fi
-           done
-         else
-           func_fatal_error "link input file \`$arg' does not exist"
-         fi
-         arg=$save_arg
-         prev=
-         continue
-         ;;
-       precious_regex)
-         precious_files_regex="$arg"
-         prev=
-         continue
-         ;;
-       release)
-         release="-$arg"
-         prev=
-         continue
-         ;;
-       rpath | xrpath)
-         # We need an absolute path.
-         case $arg in
-         [\\/]* | [A-Za-z]:[\\/]*) ;;
-         *)
-           func_fatal_error "only absolute run-paths are allowed"
-           ;;
-         esac
-         if test "$prev" = rpath; then
-           case "$rpath " in
-           *" $arg "*) ;;
-           *) func_append rpath " $arg" ;;
-           esac
-         else
-           case "$xrpath " in
-           *" $arg "*) ;;
-           *) func_append xrpath " $arg" ;;
-           esac
-         fi
-         prev=
-         continue
-         ;;
-       shrext)
-         shrext_cmds="$arg"
-         prev=
-         continue
-         ;;
-       weak)
-         func_append weak_libs " $arg"
-         prev=
-         continue
-         ;;
-       xcclinker)
-         func_append linker_flags " $qarg"
-         func_append compiler_flags " $qarg"
-         prev=
-         func_append compile_command " $qarg"
-         func_append finalize_command " $qarg"
-         continue
-         ;;
-       xcompiler)
-         func_append compiler_flags " $qarg"
-         prev=
-         func_append compile_command " $qarg"
-         func_append finalize_command " $qarg"
-         continue
-         ;;
-       xlinker)
-         func_append linker_flags " $qarg"
-         func_append compiler_flags " $wl$qarg"
-         prev=
-         func_append compile_command " $wl$qarg"
-         func_append finalize_command " $wl$qarg"
-         continue
-         ;;
-       *)
-         eval "$prev=\"\$arg\""
-         prev=
-         continue
-         ;;
-       esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-       if test -n "$link_static_flag"; then
-         # See comment for -static flag below, for more details.
-         func_append compile_command " $link_static_flag"
-         func_append finalize_command " $link_static_flag"
-       fi
-       continue
-       ;;
-
-      -allow-undefined)
-       # FIXME: remove this flag sometime in the future.
-       func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-       ;;
-
-      -avoid-version)
-       avoid_version=yes
-       continue
-       ;;
-
-      -bindir)
-       prev=bindir
-       continue
-       ;;
-
-      -dlopen)
-       prev=dlfiles
-       continue
-       ;;
-
-      -dlpreopen)
-       prev=dlprefiles
-       continue
-       ;;
-
-      -export-dynamic)
-       export_dynamic=yes
-       continue
-       ;;
-
-      -export-symbols | -export-symbols-regex)
-       if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-         func_fatal_error "more than one -exported-symbols argument is not allowed"
-       fi
-       if test "X$arg" = "X-export-symbols"; then
-         prev=expsyms
-       else
-         prev=expsyms_regex
-       fi
-       continue
-       ;;
-
-      -framework)
-       prev=framework
-       continue
-       ;;
-
-      -inst-prefix-dir)
-       prev=inst_prefix
-       continue
-       ;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-       case $with_gcc/$host in
-       no/*-*-irix* | /*-*-irix*)
-         func_append compile_command " $arg"
-         func_append finalize_command " $arg"
-         ;;
-       esac
-       continue
-       ;;
-
-      -L*)
-       func_stripname "-L" '' "$arg"
-       if test -z "$func_stripname_result"; then
-         if test "$#" -gt 0; then
-           func_fatal_error "require no space between \`-L' and \`$1'"
-         else
-           func_fatal_error "need path for \`-L' option"
-         fi
-       fi
-       func_resolve_sysroot "$func_stripname_result"
-       dir=$func_resolve_sysroot_result
-       # We need an absolute path.
-       case $dir in
-       [\\/]* | [A-Za-z]:[\\/]*) ;;
-       *)
-         absdir=`cd "$dir" && pwd`
-         test -z "$absdir" && \
-           func_fatal_error "cannot determine absolute directory name of \`$dir'"
-         dir="$absdir"
-         ;;
-       esac
-       case "$deplibs " in
-       *" -L$dir "* | *" $arg "*)
-         # Will only happen for absolute or sysroot arguments
-         ;;
-       *)
-         # Preserve sysroot, but never include relative directories
-         case $dir in
-           [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-           *) func_append deplibs " -L$dir" ;;
-         esac
-         func_append lib_search_path " $dir"
-         ;;
-       esac
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-         testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-         case :$dllsearchpath: in
-         *":$dir:"*) ;;
-         ::) dllsearchpath=$dir;;
-         *) func_append dllsearchpath ":$dir";;
-         esac
-         case :$dllsearchpath: in
-         *":$testbindir:"*) ;;
-         ::) dllsearchpath=$testbindir;;
-         *) func_append dllsearchpath ":$testbindir";;
-         esac
-         ;;
-       esac
-       continue
-       ;;
-
-      -l*)
-       if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-         case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-           # These systems don't actually have a C or math library (as such)
-           continue
-           ;;
-         *-*-os2*)
-           # These systems don't actually have a C library (as such)
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-           # Do not include libc due to us having libc/libc_r.
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-rhapsody* | *-*-darwin1.[012])
-           # Rhapsody C and math libraries are in the System framework
-           func_append deplibs " System.ltframework"
-           continue
-           ;;
-         *-*-sco3.2v5* | *-*-sco5v6*)
-           # Causes problems with __ctype
-           test "X$arg" = "X-lc" && continue
-           ;;
-         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-           # Compiler inserts libc in the correct place for threads to work
-           test "X$arg" = "X-lc" && continue
-           ;;
-         esac
-       elif test "X$arg" = "X-lc_r"; then
-        case $host in
-        *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-          # Do not include libc_r directly, use -pthread flag.
-          continue
-          ;;
-        esac
-       fi
-       func_append deplibs " $arg"
-       continue
-       ;;
-
-      -module)
-       module=yes
-       continue
-       ;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-       func_append compiler_flags " $arg"
-       func_append compile_command " $arg"
-       func_append finalize_command " $arg"
-       prev=xcompiler
-       continue
-       ;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-       func_append compiler_flags " $arg"
-       func_append compile_command " $arg"
-       func_append finalize_command " $arg"
-       case "$new_inherited_linker_flags " in
-           *" $arg "*) ;;
-           * ) func_append new_inherited_linker_flags " $arg" ;;
-       esac
-       continue
-       ;;
-
-      -multi_module)
-       single_module="${wl}-multi_module"
-       continue
-       ;;
-
-      -no-fast-install)
-       fast_install=no
-       continue
-       ;;
-
-      -no-install)
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-         # The PATH hackery in wrapper scripts is required on Windows
-         # and Darwin in order for the loader to find any dlls it needs.
-         func_warning "\`-no-install' is ignored for $host"
-         func_warning "assuming \`-no-fast-install' instead"
-         fast_install=no
-         ;;
-       *) no_install=yes ;;
-       esac
-       continue
-       ;;
-
-      -no-undefined)
-       allow_undefined=no
-       continue
-       ;;
-
-      -objectlist)
-       prev=objectlist
-       continue
-       ;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-       prev=precious_regex
-       continue
-       ;;
-
-      -release)
-       prev=release
-       continue
-       ;;
-
-      -rpath)
-       prev=rpath
-       continue
-       ;;
-
-      -R)
-       prev=xrpath
-       continue
-       ;;
-
-      -R*)
-       func_stripname '-R' '' "$arg"
-       dir=$func_stripname_result
-       # We need an absolute path.
-       case $dir in
-       [\\/]* | [A-Za-z]:[\\/]*) ;;
-       =*)
-         func_stripname '=' '' "$dir"
-         dir=$lt_sysroot$func_stripname_result
-         ;;
-       *)
-         func_fatal_error "only absolute run-paths are allowed"
-         ;;
-       esac
-       case "$xrpath " in
-       *" $dir "*) ;;
-       *) func_append xrpath " $dir" ;;
-       esac
-       continue
-       ;;
-
-      -shared)
-       # The effects of -shared are defined in a previous loop.
-       continue
-       ;;
-
-      -shrext)
-       prev=shrext
-       continue
-       ;;
-
-      -static | -static-libtool-libs)
-       # The effects of -static are defined in a previous loop.
-       # We used to do the same as -all-static on platforms that
-       # didn't have a PIC flag, but the assumption that the effects
-       # would be equivalent was wrong.  It would break on at least
-       # Digital Unix and AIX.
-       continue
-       ;;
-
-      -thread-safe)
-       thread_safe=yes
-       continue
-       ;;
-
-      -version-info)
-       prev=vinfo
-       continue
-       ;;
-
-      -version-number)
-       prev=vinfo
-       vinfo_number=yes
-       continue
-       ;;
-
-      -weak)
-        prev=weak
-       continue
-       ;;
-
-      -Wc,*)
-       func_stripname '-Wc,' '' "$arg"
-       args=$func_stripname_result
-       arg=
-       save_ifs="$IFS"; IFS=','
-       for flag in $args; do
-         IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-         func_append arg " $func_quote_for_eval_result"
-         func_append compiler_flags " $func_quote_for_eval_result"
-       done
-       IFS="$save_ifs"
-       func_stripname ' ' '' "$arg"
-       arg=$func_stripname_result
-       ;;
-
-      -Wl,*)
-       func_stripname '-Wl,' '' "$arg"
-       args=$func_stripname_result
-       arg=
-       save_ifs="$IFS"; IFS=','
-       for flag in $args; do
-         IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-         func_append arg " $wl$func_quote_for_eval_result"
-         func_append compiler_flags " $wl$func_quote_for_eval_result"
-         func_append linker_flags " $func_quote_for_eval_result"
-       done
-       IFS="$save_ifs"
-       func_stripname ' ' '' "$arg"
-       arg=$func_stripname_result
-       ;;
-
-      -Xcompiler)
-       prev=xcompiler
-       continue
-       ;;
-
-      -Xlinker)
-       prev=xlinker
-       continue
-       ;;
-
-      -XCClinker)
-       prev=xcclinker
-       continue
-       ;;
-
-      # -msg_* for osf cc
-      -msg_*)
-       func_quote_for_eval "$arg"
-       arg="$func_quote_for_eval_result"
-       ;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-        func_quote_for_eval "$arg"
-       arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-       arg="$func_quote_for_eval_result"
-       ;;
-
-      *.$objext)
-       # A standard object.
-       func_append objs " $arg"
-       ;;
-
-      *.lo)
-       # A libtool-controlled object.
-
-       # Check to see that this really is a libtool object.
-       if func_lalib_unsafe_p "$arg"; then
-         pic_object=
-         non_pic_object=
-
-         # Read the .lo file
-         func_source "$arg"
-
-         if test -z "$pic_object" ||
-            test -z "$non_pic_object" ||
-            test "$pic_object" = none &&
-            test "$non_pic_object" = none; then
-           func_fatal_error "cannot find name of object for \`$arg'"
-         fi
-
-         # Extract subdirectory from the argument.
-         func_dirname "$arg" "/" ""
-         xdir="$func_dirname_result"
-
-         if test "$pic_object" != none; then
-           # Prepend the subdirectory the object is found in.
-           pic_object="$xdir$pic_object"
-
-           if test "$prev" = dlfiles; then
-             if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-               func_append dlfiles " $pic_object"
-               prev=
-               continue
-             else
-               # If libtool objects are unsupported, then we need to preload.
-               prev=dlprefiles
-             fi
-           fi
-
-           # CHECK ME:  I think I busted this.  -Ossama
-           if test "$prev" = dlprefiles; then
-             # Preload the old-style object.
-             func_append dlprefiles " $pic_object"
-             prev=
-           fi
-
-           # A PIC object.
-           func_append libobjs " $pic_object"
-           arg="$pic_object"
-         fi
-
-         # Non-PIC object.
-         if test "$non_pic_object" != none; then
-           # Prepend the subdirectory the object is found in.
-           non_pic_object="$xdir$non_pic_object"
-
-           # A standard non-PIC object
-           func_append non_pic_objects " $non_pic_object"
-           if test -z "$pic_object" || test "$pic_object" = none ; then
-             arg="$non_pic_object"
-           fi
-         else
-           # If the PIC object exists, use it instead.
-           # $xdir was prepended to $pic_object above.
-           non_pic_object="$pic_object"
-           func_append non_pic_objects " $non_pic_object"
-         fi
-       else
-         # Only an error if not doing a dry-run.
-         if $opt_dry_run; then
-           # Extract subdirectory from the argument.
-           func_dirname "$arg" "/" ""
-           xdir="$func_dirname_result"
-
-           func_lo2o "$arg"
-           pic_object=$xdir$objdir/$func_lo2o_result
-           non_pic_object=$xdir$func_lo2o_result
-           func_append libobjs " $pic_object"
-           func_append non_pic_objects " $non_pic_object"
-         else
-           func_fatal_error "\`$arg' is not a valid libtool object"
-         fi
-       fi
-       ;;
-
-      *.$libext)
-       # An archive.
-       func_append deplibs " $arg"
-       func_append old_deplibs " $arg"
-       continue
-       ;;
-
-      *.la)
-       # A libtool-controlled library.
-
-       func_resolve_sysroot "$arg"
-       if test "$prev" = dlfiles; then
-         # This library was specified with -dlopen.
-         func_append dlfiles " $func_resolve_sysroot_result"
-         prev=
-       elif test "$prev" = dlprefiles; then
-         # The library was specified with -dlpreopen.
-         func_append dlprefiles " $func_resolve_sysroot_result"
-         prev=
-       else
-         func_append deplibs " $func_resolve_sysroot_result"
-       fi
-       continue
-       ;;
-
-      # Some other compiler argument.
-      *)
-       # Unknown arguments in both finalize_command and compile_command need
-       # to be aesthetically quoted because they are evaled later.
-       func_quote_for_eval "$arg"
-       arg="$func_quote_for_eval_result"
-       ;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-       func_append compile_command " $arg"
-       func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-       case "$libs " in
-       *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-       esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-       for pre_post_dep in $predeps $postdeps; do
-         case "$pre_post_deps " in
-         *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-         esac
-         func_append pre_post_deps " $pre_post_dep"
-       done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-       passes="conv dlpreopen link"
-       for file in $dlfiles $dlprefiles; do
-         case $file in
-         *.la) ;;
-         *)
-           func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-           ;;
-         esac
-       done
-       ;;
-    prog)
-       compile_deplibs=
-       finalize_deplibs=
-       alldeplibs=no
-       newdlfiles=
-       newdlprefiles=
-       passes="conv scan dlopen dlpreopen link"
-       ;;
-    *)  passes="conv"
-       ;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-       ## FIXME: Find the place where the list is rebuilt in the wrong
-       ##        order, and fix it there properly
-        tmp_deplibs=
-       for deplib in $deplibs; do
-         tmp_deplibs="$deplib $tmp_deplibs"
-       done
-       deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-        test "$linkmode,$pass" = "prog,scan"; then
-       libs="$deplibs"
-       deplibs=
-      fi
-      if test "$linkmode" = prog; then
-       case $pass in
-       dlopen) libs="$dlfiles" ;;
-       dlpreopen) libs="$dlprefiles" ;;
-       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-       esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-       # Collect and forward deplibs of preopened libtool libs
-       for lib in $dlprefiles; do
-         # Ignore non-libtool-libs
-         dependency_libs=
-         func_resolve_sysroot "$lib"
-         case $lib in
-         *.la) func_source "$func_resolve_sysroot_result" ;;
-         esac
-
-         # Collect preopened libtool deplibs, except any this library
-         # has declared as weak libs
-         for deplib in $dependency_libs; do
-           func_basename "$deplib"
-            deplib_base=$func_basename_result
-           case " $weak_libs " in
-           *" $deplib_base "*) ;;
-           *) func_append deplibs " $deplib" ;;
-           esac
-         done
-       done
-       libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-       # Collect dlpreopened libraries
-       save_deplibs="$deplibs"
-       deplibs=
-      fi
-
-      for deplib in $libs; do
-       lib=
-       found=no
-       case $deplib in
-       -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-         if test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$deplib $compile_deplibs"
-           finalize_deplibs="$deplib $finalize_deplibs"
-         else
-           func_append compiler_flags " $deplib"
-           if test "$linkmode" = lib ; then
-               case "$new_inherited_linker_flags " in
-                   *" $deplib "*) ;;
-                   * ) func_append new_inherited_linker_flags " $deplib" ;;
-               esac
-           fi
-         fi
-         continue
-         ;;
-       -l*)
-         if test "$linkmode" != lib && test "$linkmode" != prog; then
-           func_warning "\`-l' is ignored for archives/objects"
-           continue
-         fi
-         func_stripname '-l' '' "$deplib"
-         name=$func_stripname_result
-         if test "$linkmode" = lib; then
-           searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-         else
-           searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-         fi
-         for searchdir in $searchdirs; do
-           for search_ext in .la $std_shrext .so .a; do
-             # Search the libtool library
-             lib="$searchdir/lib${name}${search_ext}"
-             if test -f "$lib"; then
-               if test "$search_ext" = ".la"; then
-                 found=yes
-               else
-                 found=no
-               fi
-               break 2
-             fi
-           done
-         done
-         if test "$found" != yes; then
-           # deplib doesn't seem to be a libtool library
-           if test "$linkmode,$pass" = "prog,link"; then
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           else
-             deplibs="$deplib $deplibs"
-             test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-           fi
-           continue
-         else # deplib is a libtool library
-           # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-           # We need to do some special things here, and not later.
-           if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-             case " $predeps $postdeps " in
-             *" $deplib "*)
-               if func_lalib_p "$lib"; then
-                 library_names=
-                 old_library=
-                 func_source "$lib"
-                 for l in $old_library $library_names; do
-                   ll="$l"
-                 done
-                 if test "X$ll" = "X$old_library" ; then # only static version available
-                   found=no
-                   func_dirname "$lib" "" "."
-                   ladir="$func_dirname_result"
-                   lib=$ladir/$old_library
-                   if test "$linkmode,$pass" = "prog,link"; then
-                     compile_deplibs="$deplib $compile_deplibs"
-                     finalize_deplibs="$deplib $finalize_deplibs"
-                   else
-                     deplibs="$deplib $deplibs"
-                     test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-                   fi
-                   continue
-                 fi
-               fi
-               ;;
-             *) ;;
-             esac
-           fi
-         fi
-         ;; # -l
-       *.ltframework)
-         if test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$deplib $compile_deplibs"
-           finalize_deplibs="$deplib $finalize_deplibs"
-         else
-           deplibs="$deplib $deplibs"
-           if test "$linkmode" = lib ; then
-               case "$new_inherited_linker_flags " in
-                   *" $deplib "*) ;;
-                   * ) func_append new_inherited_linker_flags " $deplib" ;;
-               esac
-           fi
-         fi
-         continue
-         ;;
-       -L*)
-         case $linkmode in
-         lib)
-           deplibs="$deplib $deplibs"
-           test "$pass" = conv && continue
-           newdependency_libs="$deplib $newdependency_libs"
-           func_stripname '-L' '' "$deplib"
-           func_resolve_sysroot "$func_stripname_result"
-           func_append newlib_search_path " $func_resolve_sysroot_result"
-           ;;
-         prog)
-           if test "$pass" = conv; then
-             deplibs="$deplib $deplibs"
-             continue
-           fi
-           if test "$pass" = scan; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           func_stripname '-L' '' "$deplib"
-           func_resolve_sysroot "$func_stripname_result"
-           func_append newlib_search_path " $func_resolve_sysroot_result"
-           ;;
-         *)
-           func_warning "\`-L' is ignored for archives/objects"
-           ;;
-         esac # linkmode
-         continue
-         ;; # -L
-       -R*)
-         if test "$pass" = link; then
-           func_stripname '-R' '' "$deplib"
-           func_resolve_sysroot "$func_stripname_result"
-           dir=$func_resolve_sysroot_result
-           # Make sure the xrpath contains only unique directories.
-           case "$xrpath " in
-           *" $dir "*) ;;
-           *) func_append xrpath " $dir" ;;
-           esac
-         fi
-         deplibs="$deplib $deplibs"
-         continue
-         ;;
-       *.la)
-         func_resolve_sysroot "$deplib"
-         lib=$func_resolve_sysroot_result
-         ;;
-       *.$libext)
-         if test "$pass" = conv; then
-           deplibs="$deplib $deplibs"
-           continue
-         fi
-         case $linkmode in
-         lib)
-           # Linking convenience modules into shared libraries is allowed,
-           # but linking other static libraries is non-portable.
-           case " $dlpreconveniencelibs " in
-           *" $deplib "*) ;;
-           *)
-             valid_a_lib=no
-             case $deplibs_check_method in
-               match_pattern*)
-                 set dummy $deplibs_check_method; shift
-                 match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-                 if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-                   | $EGREP "$match_pattern_regex" > /dev/null; then
-                   valid_a_lib=yes
-                 fi
-               ;;
-               pass_all)
-                 valid_a_lib=yes
-               ;;
-             esac
-             if test "$valid_a_lib" != yes; then
-               echo
-               $ECHO "*** Warning: Trying to link with static lib archive $deplib."
-               echo "*** I have the capability to make that library automatically link in when"
-               echo "*** you link to this library.  But I can only do this if you have a"
-               echo "*** shared version of the library, which you do not appear to have"
-               echo "*** because the file extensions .$libext of this argument makes me believe"
-               echo "*** that it is just a static archive that I should not use here."
-             else
-               echo
-               $ECHO "*** Warning: Linking the shared library $output against the"
-               $ECHO "*** static library $deplib is not portable!"
-               deplibs="$deplib $deplibs"
-             fi
-             ;;
-           esac
-           continue
-           ;;
-         prog)
-           if test "$pass" != link; then
-             deplibs="$deplib $deplibs"
-           else
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           fi
-           continue
-           ;;
-         esac # linkmode
-         ;; # *.$libext
-       *.lo | *.$objext)
-         if test "$pass" = conv; then
-           deplibs="$deplib $deplibs"
-         elif test "$linkmode" = prog; then
-           if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-             # If there is no dlopen support or we're linking statically,
-             # we need to preload.
-             func_append newdlprefiles " $deplib"
-             compile_deplibs="$deplib $compile_deplibs"
-             finalize_deplibs="$deplib $finalize_deplibs"
-           else
-             func_append newdlfiles " $deplib"
-           fi
-         fi
-         continue
-         ;;
-       %DEPLIBS%)
-         alldeplibs=yes
-         continue
-         ;;
-       esac # case $deplib
-
-       if test "$found" = yes || test -f "$lib"; then :
-       else
-         func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-       fi
-
-       # Check to see that this really is a libtool archive.
-       func_lalib_unsafe_p "$lib" \
-         || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-       func_dirname "$lib" "" "."
-       ladir="$func_dirname_result"
-
-       dlname=
-       dlopen=
-       dlpreopen=
-       libdir=
-       library_names=
-       old_library=
-       inherited_linker_flags=
-       # If the library was installed with an old release of libtool,
-       # it will not redefine variables installed, or shouldnotlink
-       installed=yes
-       shouldnotlink=no
-       avoidtemprpath=
-
-
-       # Read the .la file
-       func_source "$lib"
-
-       # Convert "-framework foo" to "foo.ltframework"
-       if test -n "$inherited_linker_flags"; then
-         tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-         for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-           case " $new_inherited_linker_flags " in
-             *" $tmp_inherited_linker_flag "*) ;;
-             *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-           esac
-         done
-       fi
-       dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-       if test "$linkmode,$pass" = "lib,link" ||
-          test "$linkmode,$pass" = "prog,scan" ||
-          { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-         test -n "$dlopen" && func_append dlfiles " $dlopen"
-         test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-       fi
-
-       if test "$pass" = conv; then
-         # Only check for convenience libraries
-         deplibs="$lib $deplibs"
-         if test -z "$libdir"; then
-           if test -z "$old_library"; then
-             func_fatal_error "cannot find name of link library for \`$lib'"
-           fi
-           # It is a libtool convenience library, so add in its objects.
-           func_append convenience " $ladir/$objdir/$old_library"
-           func_append old_convenience " $ladir/$objdir/$old_library"
-         elif test "$linkmode" != prog && test "$linkmode" != lib; then
-           func_fatal_error "\`$lib' is not a convenience library"
-         fi
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           deplibs="$deplib $deplibs"
-           if $opt_preserve_dup_deps ; then
-             case "$tmp_libs " in
-             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-             esac
-           fi
-           func_append tmp_libs " $deplib"
-         done
-         continue
-       fi # $pass = conv
-
-
-       # Get the name of the library we link against.
-       linklib=
-       if test -n "$old_library" &&
-          { test "$prefer_static_libs" = yes ||
-            test "$prefer_static_libs,$installed" = "built,no"; }; then
-         linklib=$old_library
-       else
-         for l in $old_library $library_names; do
-           linklib="$l"
-         done
-       fi
-       if test -z "$linklib"; then
-         func_fatal_error "cannot find name of link library for \`$lib'"
-       fi
-
-       # This library was specified with -dlopen.
-       if test "$pass" = dlopen; then
-         if test -z "$libdir"; then
-           func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-         fi
-         if test -z "$dlname" ||
-            test "$dlopen_support" != yes ||
-            test "$build_libtool_libs" = no; then
-           # If there is no dlname, no dlopen support or we're linking
-           # statically, we need to preload.  We also need to preload any
-           # dependent libraries so libltdl's deplib preloader doesn't
-           # bomb out in the load deplibs phase.
-           func_append dlprefiles " $lib $dependency_libs"
-         else
-           func_append newdlfiles " $lib"
-         fi
-         continue
-       fi # $pass = dlopen
-
-       # We need an absolute path.
-       case $ladir in
-       [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-       *)
-         abs_ladir=`cd "$ladir" && pwd`
-         if test -z "$abs_ladir"; then
-           func_warning "cannot determine absolute directory name of \`$ladir'"
-           func_warning "passing it literally to the linker, although it might fail"
-           abs_ladir="$ladir"
-         fi
-         ;;
-       esac
-       func_basename "$lib"
-       laname="$func_basename_result"
-
-       # Find the relevant object directory and library name.
-       if test "X$installed" = Xyes; then
-         if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           func_warning "library \`$lib' was moved."
-           dir="$ladir"
-           absdir="$abs_ladir"
-           libdir="$abs_ladir"
-         else
-           dir="$lt_sysroot$libdir"
-           absdir="$lt_sysroot$libdir"
-         fi
-         test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-       else
-         if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-           dir="$ladir"
-           absdir="$abs_ladir"
-           # Remove this search path later
-           func_append notinst_path " $abs_ladir"
-         else
-           dir="$ladir/$objdir"
-           absdir="$abs_ladir/$objdir"
-           # Remove this search path later
-           func_append notinst_path " $abs_ladir"
-         fi
-       fi # $installed = yes
-       func_stripname 'lib' '.la' "$laname"
-       name=$func_stripname_result
-
-       # This library was specified with -dlpreopen.
-       if test "$pass" = dlpreopen; then
-         if test -z "$libdir" && test "$linkmode" = prog; then
-           func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-         fi
-         case "$host" in
-           # special handling for platforms with PE-DLLs.
-           *cygwin* | *mingw* | *cegcc* )
-             # Linker will automatically link against shared library if both
-             # static and shared are present.  Therefore, ensure we extract
-             # symbols from the import library if a shared library is present
-             # (otherwise, the dlopen module name will be incorrect).  We do
-             # this by putting the import library name into $newdlprefiles.
-             # We recover the dlopen module name by 'saving' the la file
-             # name in a special purpose variable, and (later) extracting the
-             # dlname from the la file.
-             if test -n "$dlname"; then
-               func_tr_sh "$dir/$linklib"
-               eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-               func_append newdlprefiles " $dir/$linklib"
-             else
-               func_append newdlprefiles " $dir/$old_library"
-               # Keep a list of preopened convenience libraries to check
-               # that they are being used correctly in the link pass.
-               test -z "$libdir" && \
-                 func_append dlpreconveniencelibs " $dir/$old_library"
-             fi
-           ;;
-           * )
-             # Prefer using a static library (so that no silly _DYNAMIC symbols
-             # are required to link).
-             if test -n "$old_library"; then
-               func_append newdlprefiles " $dir/$old_library"
-               # Keep a list of preopened convenience libraries to check
-               # that they are being used correctly in the link pass.
-               test -z "$libdir" && \
-                 func_append dlpreconveniencelibs " $dir/$old_library"
-             # Otherwise, use the dlname, so that lt_dlopen finds it.
-             elif test -n "$dlname"; then
-               func_append newdlprefiles " $dir/$dlname"
-             else
-               func_append newdlprefiles " $dir/$linklib"
-             fi
-           ;;
-         esac
-       fi # $pass = dlpreopen
-
-       if test -z "$libdir"; then
-         # Link the convenience library
-         if test "$linkmode" = lib; then
-           deplibs="$dir/$old_library $deplibs"
-         elif test "$linkmode,$pass" = "prog,link"; then
-           compile_deplibs="$dir/$old_library $compile_deplibs"
-           finalize_deplibs="$dir/$old_library $finalize_deplibs"
-         else
-           deplibs="$lib $deplibs" # used for prog,scan pass
-         fi
-         continue
-       fi
-
-
-       if test "$linkmode" = prog && test "$pass" != link; then
-         func_append newlib_search_path " $ladir"
-         deplibs="$lib $deplibs"
-
-         linkalldeplibs=no
-         if test "$link_all_deplibs" != no || test -z "$library_names" ||
-            test "$build_libtool_libs" = no; then
-           linkalldeplibs=yes
-         fi
-
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           case $deplib in
-           -L*) func_stripname '-L' '' "$deplib"
-                func_resolve_sysroot "$func_stripname_result"
-                func_append newlib_search_path " $func_resolve_sysroot_result"
-                ;;
-           esac
-           # Need to link against all dependency_libs?
-           if test "$linkalldeplibs" = yes; then
-             deplibs="$deplib $deplibs"
-           else
-             # Need to hardcode shared library paths
-             # or/and link against static libraries
-             newdependency_libs="$deplib $newdependency_libs"
-           fi
-           if $opt_preserve_dup_deps ; then
-             case "$tmp_libs " in
-             *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-             esac
-           fi
-           func_append tmp_libs " $deplib"
-         done # for deplib
-         continue
-       fi # $linkmode = prog...
-
-       if test "$linkmode,$pass" = "prog,link"; then
-         if test -n "$library_names" &&
-            { { test "$prefer_static_libs" = no ||
-                test "$prefer_static_libs,$installed" = "built,yes"; } ||
-              test -z "$old_library"; }; then
-           # We need to hardcode the library path
-           if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-             # Make sure the rpath contains only unique directories.
-             case "$temp_rpath:" in
-             *"$absdir:"*) ;;
-             *) func_append temp_rpath "$absdir:" ;;
-             esac
-           fi
-
-           # Hardcode the library path.
-           # Skip directories that are in the system default run-time
-           # search path.
-           case " $sys_lib_dlsearch_path " in
-           *" $absdir "*) ;;
-           *)
-             case "$compile_rpath " in
-             *" $absdir "*) ;;
-             *) func_append compile_rpath " $absdir" ;;
-             esac
-             ;;
-           esac
-           case " $sys_lib_dlsearch_path " in
-           *" $libdir "*) ;;
-           *)
-             case "$finalize_rpath " in
-             *" $libdir "*) ;;
-             *) func_append finalize_rpath " $libdir" ;;
-             esac
-             ;;
-           esac
-         fi # $linkmode,$pass = prog,link...
-
-         if test "$alldeplibs" = yes &&
-            { test "$deplibs_check_method" = pass_all ||
-              { test "$build_libtool_libs" = yes &&
-                test -n "$library_names"; }; }; then
-           # We only need to search for static libraries
-           continue
-         fi
-       fi
-
-       link_static=no # Whether the deplib will be linked statically
-       use_static_libs=$prefer_static_libs
-       if test "$use_static_libs" = built && test "$installed" = yes; then
-         use_static_libs=no
-       fi
-       if test -n "$library_names" &&
-          { test "$use_static_libs" = no || test -z "$old_library"; }; then
-         case $host in
-         *cygwin* | *mingw* | *cegcc*)
-             # No point in relinking DLLs because paths are not encoded
-             func_append notinst_deplibs " $lib"
-             need_relink=no
-           ;;
-         *)
-           if test "$installed" = no; then
-             func_append notinst_deplibs " $lib"
-             need_relink=yes
-           fi
-           ;;
-         esac
-         # This is a shared library
-
-         # Warn about portability, can't link against -module's on some
-         # systems (darwin).  Don't bleat about dlopened modules though!
-         dlopenmodule=""
-         for dlpremoduletest in $dlprefiles; do
-           if test "X$dlpremoduletest" = "X$lib"; then
-             dlopenmodule="$dlpremoduletest"
-             break
-           fi
-         done
-         if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-           echo
-           if test "$linkmode" = prog; then
-             $ECHO "*** Warning: Linking the executable $output against the loadable module"
-           else
-             $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-           fi
-           $ECHO "*** $linklib is not portable!"
-         fi
-         if test "$linkmode" = lib &&
-            test "$hardcode_into_libs" = yes; then
-           # Hardcode the library path.
-           # Skip directories that are in the system default run-time
-           # search path.
-           case " $sys_lib_dlsearch_path " in
-           *" $absdir "*) ;;
-           *)
-             case "$compile_rpath " in
-             *" $absdir "*) ;;
-             *) func_append compile_rpath " $absdir" ;;
-             esac
-             ;;
-           esac
-           case " $sys_lib_dlsearch_path " in
-           *" $libdir "*) ;;
-           *)
-             case "$finalize_rpath " in
-             *" $libdir "*) ;;
-             *) func_append finalize_rpath " $libdir" ;;
-             esac
-             ;;
-           esac
-         fi
-
-         if test -n "$old_archive_from_expsyms_cmds"; then
-           # figure out the soname
-           set dummy $library_names
-           shift
-           realname="$1"
-           shift
-           libname=`eval "\\$ECHO \"$libname_spec\""`
-           # use dlname if we got it. it's perfectly good, no?
-           if test -n "$dlname"; then
-             soname="$dlname"
-           elif test -n "$soname_spec"; then
-             # bleh windows
-             case $host in
-             *cygwin* | mingw* | *cegcc*)
-               func_arith $current - $age
-               major=$func_arith_result
-               versuffix="-$major"
-               ;;
-             esac
-             eval soname=\"$soname_spec\"
-           else
-             soname="$realname"
-           fi
-
-           # Make a new name for the extract_expsyms_cmds to use
-           soroot="$soname"
-           func_basename "$soroot"
-           soname="$func_basename_result"
-           func_stripname 'lib' '.dll' "$soname"
-           newlib=libimp-$func_stripname_result.a
-
-           # If the library has no export list, then create one now
-           if test -f "$output_objdir/$soname-def"; then :
-           else
-             func_verbose "extracting exported symbol list from \`$soname'"
-             func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-           fi
-
-           # Create $newlib
-           if test -f "$output_objdir/$newlib"; then :; else
-             func_verbose "generating import library for \`$soname'"
-             func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-           fi
-           # make sure the library variables are pointing to the new library
-           dir=$output_objdir
-           linklib=$newlib
-         fi # test -n "$old_archive_from_expsyms_cmds"
-
-         if test "$linkmode" = prog || test "$opt_mode" != relink; then
-           add_shlibpath=
-           add_dir=
-           add=
-           lib_linked=yes
-           case $hardcode_action in
-           immediate | unsupported)
-             if test "$hardcode_direct" = no; then
-               add="$dir/$linklib"
-               case $host in
-                 *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-                 *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-                 *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-                   *-*-unixware7*) add_dir="-L$dir" ;;
-                 *-*-darwin* )
-                   # if the lib is a (non-dlopened) module then we can not
-                   # link against it, someone is ignoring the earlier warnings
-                   if /usr/bin/file -L $add 2> /dev/null |
-                        $GREP ": [^:]* bundle" >/dev/null ; then
-                     if test "X$dlopenmodule" != "X$lib"; then
-                       $ECHO "*** Warning: lib $linklib is a module, not a shared library"
-                       if test -z "$old_library" ; then
-                         echo
-                         echo "*** And there doesn't seem to be a static archive available"
-                         echo "*** The link will probably fail, sorry"
-                       else
-                         add="$dir/$old_library"
-                       fi
-                     elif test -n "$old_library"; then
-                       add="$dir/$old_library"
-                     fi
-                   fi
-               esac
-             elif test "$hardcode_minus_L" = no; then
-               case $host in
-               *-*-sunos*) add_shlibpath="$dir" ;;
-               esac
-               add_dir="-L$dir"
-               add="-l$name"
-             elif test "$hardcode_shlibpath_var" = no; then
-               add_shlibpath="$dir"
-               add="-l$name"
-             else
-               lib_linked=no
-             fi
-             ;;
-           relink)
-             if test "$hardcode_direct" = yes &&
-                test "$hardcode_direct_absolute" = no; then
-               add="$dir/$linklib"
-             elif test "$hardcode_minus_L" = yes; then
-               add_dir="-L$absdir"
-               # Try looking first in the location we're being installed to.
-               if test -n "$inst_prefix_dir"; then
-                 case $libdir in
-                   [\\/]*)
-                     func_append add_dir " -L$inst_prefix_dir$libdir"
-                     ;;
-                 esac
-               fi
-               add="-l$name"
-             elif test "$hardcode_shlibpath_var" = yes; then
-               add_shlibpath="$dir"
-               add="-l$name"
-             else
-               lib_linked=no
-             fi
-             ;;
-           *) lib_linked=no ;;
-           esac
-
-           if test "$lib_linked" != yes; then
-             func_fatal_configuration "unsupported hardcode properties"
-           fi
-
-           if test -n "$add_shlibpath"; then
-             case :$compile_shlibpath: in
-             *":$add_shlibpath:"*) ;;
-             *) func_append compile_shlibpath "$add_shlibpath:" ;;
-             esac
-           fi
-           if test "$linkmode" = prog; then
-             test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-             test -n "$add" && compile_deplibs="$add $compile_deplibs"
-           else
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-             if test "$hardcode_direct" != yes &&
-                test "$hardcode_minus_L" != yes &&
-                test "$hardcode_shlibpath_var" = yes; then
-               case :$finalize_shlibpath: in
-               *":$libdir:"*) ;;
-               *) func_append finalize_shlibpath "$libdir:" ;;
-               esac
-             fi
-           fi
-         fi
-
-         if test "$linkmode" = prog || test "$opt_mode" = relink; then
-           add_shlibpath=
-           add_dir=
-           add=
-           # Finalize command for both is simple: just hardcode it.
-           if test "$hardcode_direct" = yes &&
-              test "$hardcode_direct_absolute" = no; then
-             add="$libdir/$linklib"
-           elif test "$hardcode_minus_L" = yes; then
-             add_dir="-L$libdir"
-             add="-l$name"
-           elif test "$hardcode_shlibpath_var" = yes; then
-             case :$finalize_shlibpath: in
-             *":$libdir:"*) ;;
-             *) func_append finalize_shlibpath "$libdir:" ;;
-             esac
-             add="-l$name"
-           elif test "$hardcode_automatic" = yes; then
-             if test -n "$inst_prefix_dir" &&
-                test -f "$inst_prefix_dir$libdir/$linklib" ; then
-               add="$inst_prefix_dir$libdir/$linklib"
-             else
-               add="$libdir/$linklib"
-             fi
-           else
-             # We cannot seem to hardcode it, guess we'll fake it.
-             add_dir="-L$libdir"
-             # Try looking first in the location we're being installed to.
-             if test -n "$inst_prefix_dir"; then
-               case $libdir in
-                 [\\/]*)
-                   func_append add_dir " -L$inst_prefix_dir$libdir"
-                   ;;
-               esac
-             fi
-             add="-l$name"
-           fi
-
-           if test "$linkmode" = prog; then
-             test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-             test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-           else
-             test -n "$add_dir" && deplibs="$add_dir $deplibs"
-             test -n "$add" && deplibs="$add $deplibs"
-           fi
-         fi
-       elif test "$linkmode" = prog; then
-         # Here we assume that one of hardcode_direct or hardcode_minus_L
-         # is not unsupported.  This is valid on all known static and
-         # shared platforms.
-         if test "$hardcode_direct" != unsupported; then
-           test -n "$old_library" && linklib="$old_library"
-           compile_deplibs="$dir/$linklib $compile_deplibs"
-           finalize_deplibs="$dir/$linklib $finalize_deplibs"
-         else
-           compile_deplibs="-l$name -L$dir $compile_deplibs"
-           finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-         fi
-       elif test "$build_libtool_libs" = yes; then
-         # Not a shared library
-         if test "$deplibs_check_method" != pass_all; then
-           # We're trying link a shared library against a static one
-           # but the system doesn't support it.
-
-           # Just print a warning and add the library to dependency_libs so
-           # that the program can be linked against the static library.
-           echo
-           $ECHO "*** Warning: This system can not link to static lib archive $lib."
-           echo "*** I have the capability to make that library automatically link in when"
-           echo "*** you link to this library.  But I can only do this if you have a"
-           echo "*** shared version of the library, which you do not appear to have."
-           if test "$module" = yes; then
-             echo "*** But as you try to build a module library, libtool will still create "
-             echo "*** a static module, that should work as long as the dlopening application"
-             echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-             if test -z "$global_symbol_pipe"; then
-               echo
-               echo "*** However, this would only work if libtool was able to extract symbol"
-               echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-               echo "*** not find such a program.  So, this module is probably useless."
-               echo "*** \`nm' from GNU binutils and a full rebuild may help."
-             fi
-             if test "$build_old_libs" = no; then
-               build_libtool_libs=module
-               build_old_libs=yes
-             else
-               build_libtool_libs=no
-             fi
-           fi
-         else
-           deplibs="$dir/$old_library $deplibs"
-           link_static=yes
-         fi
-       fi # link shared/static library?
-
-       if test "$linkmode" = lib; then
-         if test -n "$dependency_libs" &&
-            { test "$hardcode_into_libs" != yes ||
-              test "$build_old_libs" = yes ||
-              test "$link_static" = yes; }; then
-           # Extract -R from dependency_libs
-           temp_deplibs=
-           for libdir in $dependency_libs; do
-             case $libdir in
-             -R*) func_stripname '-R' '' "$libdir"
-                  temp_xrpath=$func_stripname_result
-                  case " $xrpath " in
-                  *" $temp_xrpath "*) ;;
-                  *) func_append xrpath " $temp_xrpath";;
-                  esac;;
-             *) func_append temp_deplibs " $libdir";;
-             esac
-           done
-           dependency_libs="$temp_deplibs"
-         fi
-
-         func_append newlib_search_path " $absdir"
-         # Link against this library
-         test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-         # ... and its dependency_libs
-         tmp_libs=
-         for deplib in $dependency_libs; do
-           newdependency_libs="$deplib $newdependency_libs"
-           case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-           if $opt_preserve_dup_deps ; then
-             case "$tmp_libs " in
-             *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-             esac
-           fi
-           func_append tmp_libs " $func_resolve_sysroot_result"
-         done
-
-         if test "$link_all_deplibs" != no; then
-           # Add the search paths of all dependency libraries
-           for deplib in $dependency_libs; do
-             path=
-             case $deplib in
-             -L*) path="$deplib" ;;
-             *.la)
-               func_resolve_sysroot "$deplib"
-               deplib=$func_resolve_sysroot_result
-               func_dirname "$deplib" "" "."
-               dir=$func_dirname_result
-               # We need an absolute path.
-               case $dir in
-               [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-               *)
-                 absdir=`cd "$dir" && pwd`
-                 if test -z "$absdir"; then
-                   func_warning "cannot determine absolute directory name of \`$dir'"
-                   absdir="$dir"
-                 fi
-                 ;;
-               esac
-               if $GREP "^installed=no" $deplib > /dev/null; then
-               case $host in
-               *-*-darwin*)
-                 depdepl=
-                 eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-                 if test -n "$deplibrary_names" ; then
-                   for tmp in $deplibrary_names ; do
-                     depdepl=$tmp
-                   done
-                   if test -f "$absdir/$objdir/$depdepl" ; then
-                     depdepl="$absdir/$objdir/$depdepl"
-                     darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-                     func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-                     func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-                     path=
-                   fi
-                 fi
-                 ;;
-               *)
-                 path="-L$absdir/$objdir"
-                 ;;
-               esac
-               else
-                 eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-                 test -z "$libdir" && \
-                   func_fatal_error "\`$deplib' is not a valid libtool archive"
-                 test "$absdir" != "$libdir" && \
-                   func_warning "\`$deplib' seems to be moved"
-
-                 path="-L$absdir"
-               fi
-               ;;
-             esac
-             case " $deplibs " in
-             *" $path "*) ;;
-             *) deplibs="$path $deplibs" ;;
-             esac
-           done
-         fi # link_all_deplibs != no
-       fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-       if test "$linkmode" = "prog"; then
-         compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-         finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-       else
-         compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-       fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-       # Link the dlpreopened libraries before other libraries
-       for deplib in $save_deplibs; do
-         deplibs="$deplib $deplibs"
-       done
-      fi
-      if test "$pass" != dlopen; then
-       if test "$pass" != conv; then
-         # Make sure lib_search_path contains only unique directories.
-         lib_search_path=
-         for dir in $newlib_search_path; do
-           case "$lib_search_path " in
-           *" $dir "*) ;;
-           *) func_append lib_search_path " $dir" ;;
-           esac
-         done
-         newlib_search_path=
-       fi
-
-       if test "$linkmode,$pass" != "prog,link"; then
-         vars="deplibs"
-       else
-         vars="compile_deplibs finalize_deplibs"
-       fi
-       for var in $vars dependency_libs; do
-         # Add libraries to $var in reverse order
-         eval tmp_libs=\"\$$var\"
-         new_libs=
-         for deplib in $tmp_libs; do
-           # FIXME: Pedantically, this is the right thing to do, so
-           #        that some nasty dependency loop isn't accidentally
-           #        broken:
-           #new_libs="$deplib $new_libs"
-           # Pragmatically, this seems to cause very few problems in
-           # practice:
-           case $deplib in
-           -L*) new_libs="$deplib $new_libs" ;;
-           -R*) ;;
-           *)
-             # And here is the reason: when a library appears more
-             # than once as an explicit dependence of a library, or
-             # is implicitly linked in more than once by the
-             # compiler, it is considered special, and multiple
-             # occurrences thereof are not removed.  Compare this
-             # with having the same library being listed as a
-             # dependency of multiple other libraries: in this case,
-             # we know (pedantically, we assume) the library does not
-             # need to be listed more than once, so we keep only the
-             # last copy.  This is not always right, but it is rare
-             # enough that we require users that really mean to play
-             # such unportable linking tricks to link the library
-             # using -Wl,-lname, so that libtool does not consider it
-             # for duplicate removal.
-             case " $specialdeplibs " in
-             *" $deplib "*) new_libs="$deplib $new_libs" ;;
-             *)
-               case " $new_libs " in
-               *" $deplib "*) ;;
-               *) new_libs="$deplib $new_libs" ;;
-               esac
-               ;;
-             esac
-             ;;
-           esac
-         done
-         tmp_libs=
-         for deplib in $new_libs; do
-           case $deplib in
-           -L*)
-             case " $tmp_libs " in
-             *" $deplib "*) ;;
-             *) func_append tmp_libs " $deplib" ;;
-             esac
-             ;;
-           *) func_append tmp_libs " $deplib" ;;
-           esac
-         done
-         eval $var=\"$tmp_libs\"
-       done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-       case " $predeps $postdeps $compiler_lib_search_path " in
-       *" $i "*)
-         i=""
-         ;;
-       esac
-       if test -n "$i" ; then
-         func_append tmp_libs " $i"
-       fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-       func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-       func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-       func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-       func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-       func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-       func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-       func_stripname 'lib' '.la' "$outputname"
-       name=$func_stripname_result
-       eval shared_ext=\"$shrext_cmds\"
-       eval libname=\"$libname_spec\"
-       ;;
-      *)
-       test "$module" = no && \
-         func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-       if test "$need_lib_prefix" != no; then
-         # Add the "lib" prefix for modules if required
-         func_stripname '' '.la' "$outputname"
-         name=$func_stripname_result
-         eval shared_ext=\"$shrext_cmds\"
-         eval libname=\"$libname_spec\"
-       else
-         func_stripname '' '.la' "$outputname"
-         libname=$func_stripname_result
-       fi
-       ;;
-      esac
-
-      if test -n "$objs"; then
-       if test "$deplibs_check_method" != pass_all; then
-         func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-       else
-         echo
-         $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-         $ECHO "*** objects $objs is not portable!"
-         func_append libobjs " $objs"
-       fi
-      fi
-
-      test "$dlself" != no && \
-       func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-       func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-       if test "$build_libtool_libs" = yes; then
-         # Building a libtool convenience library.
-         # Some compilers have problems with a `.al' extension so
-         # convenience libraries should have the same extension an
-         # archive normally would.
-         oldlibs="$output_objdir/$libname.$libext $oldlibs"
-         build_libtool_libs=convenience
-         build_old_libs=yes
-       fi
-
-       test -n "$vinfo" && \
-         func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-       test -n "$release" && \
-         func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-       # Parse the version information argument.
-       save_ifs="$IFS"; IFS=':'
-       set dummy $vinfo 0 0 0
-       shift
-       IFS="$save_ifs"
-
-       test -n "$7" && \
-         func_fatal_help "too many parameters to \`-version-info'"
-
-       # convert absolute version numbers to libtool ages
-       # this retains compatibility with .la files and attempts
-       # to make the code below a bit more comprehensible
-
-       case $vinfo_number in
-       yes)
-         number_major="$1"
-         number_minor="$2"
-         number_revision="$3"
-         #
-         # There are really only two kinds -- those that
-         # use the current revision as the major version
-         # and those that subtract age and use age as
-         # a minor version.  But, then there is irix
-         # which has an extra 1 added just for fun
-         #
-         case $version_type in
-         # correct linux to gnu/linux during the next big refactor
-         darwin|linux|osf|windows|none)
-           func_arith $number_major + $number_minor
-           current=$func_arith_result
-           age="$number_minor"
-           revision="$number_revision"
-           ;;
-         freebsd-aout|freebsd-elf|qnx|sunos)
-           current="$number_major"
-           revision="$number_minor"
-           age="0"
-           ;;
-         irix|nonstopux)
-           func_arith $number_major + $number_minor
-           current=$func_arith_result
-           age="$number_minor"
-           revision="$number_minor"
-           lt_irix_increment=no
-           ;;
-         esac
-         ;;
-       no)
-         current="$1"
-         revision="$2"
-         age="$3"
-         ;;
-       esac
-
-       # Check that each of the things are valid numbers.
-       case $current in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         func_error "CURRENT \`$current' must be a nonnegative integer"
-         func_fatal_error "\`$vinfo' is not valid version information"
-         ;;
-       esac
-
-       case $revision in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         func_error "REVISION \`$revision' must be a nonnegative integer"
-         func_fatal_error "\`$vinfo' is not valid version information"
-         ;;
-       esac
-
-       case $age in
-       0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-       *)
-         func_error "AGE \`$age' must be a nonnegative integer"
-         func_fatal_error "\`$vinfo' is not valid version information"
-         ;;
-       esac
-
-       if test "$age" -gt "$current"; then
-         func_error "AGE \`$age' is greater than the current interface number \`$current'"
-         func_fatal_error "\`$vinfo' is not valid version information"
-       fi
-
-       # Calculate the version variables.
-       major=
-       versuffix=
-       verstring=
-       case $version_type in
-       none) ;;
-
-       darwin)
-         # Like Linux, but with the current version available in
-         # verstring for coding it into the library header
-         func_arith $current - $age
-         major=.$func_arith_result
-         versuffix="$major.$age.$revision"
-         # Darwin ld doesn't like 0 for these options...
-         func_arith $current + 1
-         minor_current=$func_arith_result
-         xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-         verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-         ;;
-
-       freebsd-aout)
-         major=".$current"
-         versuffix=".$current.$revision";
-         ;;
-
-       freebsd-elf)
-         major=".$current"
-         versuffix=".$current"
-         ;;
-
-       irix | nonstopux)
-         if test "X$lt_irix_increment" = "Xno"; then
-           func_arith $current - $age
-         else
-           func_arith $current - $age + 1
-         fi
-         major=$func_arith_result
-
-         case $version_type in
-           nonstopux) verstring_prefix=nonstopux ;;
-           *)         verstring_prefix=sgi ;;
-         esac
-         verstring="$verstring_prefix$major.$revision"
-
-         # Add in all the interfaces that we are compatible with.
-         loop=$revision
-         while test "$loop" -ne 0; do
-           func_arith $revision - $loop
-           iface=$func_arith_result
-           func_arith $loop - 1
-           loop=$func_arith_result
-           verstring="$verstring_prefix$major.$iface:$verstring"
-         done
-
-         # Before this point, $major must not contain `.'.
-         major=.$major
-         versuffix="$major.$revision"
-         ;;
-
-       linux) # correct to gnu/linux during the next big refactor
-         func_arith $current - $age
-         major=.$func_arith_result
-         versuffix="$major.$age.$revision"
-         ;;
-
-       osf)
-         func_arith $current - $age
-         major=.$func_arith_result
-         versuffix=".$current.$age.$revision"
-         verstring="$current.$age.$revision"
-
-         # Add in all the interfaces that we are compatible with.
-         loop=$age
-         while test "$loop" -ne 0; do
-           func_arith $current - $loop
-           iface=$func_arith_result
-           func_arith $loop - 1
-           loop=$func_arith_result
-           verstring="$verstring:${iface}.0"
-         done
-
-         # Make executables depend on our current version.
-         func_append verstring ":${current}.0"
-         ;;
-
-       qnx)
-         major=".$current"
-         versuffix=".$current"
-         ;;
-
-       sunos)
-         major=".$current"
-         versuffix=".$current.$revision"
-         ;;
-
-       windows)
-         # Use '-' rather than '.', since we only want one
-         # extension on DOS 8.3 filesystems.
-         func_arith $current - $age
-         major=$func_arith_result
-         versuffix="-$major"
-         ;;
-
-       *)
-         func_fatal_configuration "unknown library version type \`$version_type'"
-         ;;
-       esac
-
-       # Clear the version info if we defaulted, and they specified a release.
-       if test -z "$vinfo" && test -n "$release"; then
-         major=
-         case $version_type in
-         darwin)
-           # we can't check for "0.0" in archive_cmds due to quoting
-           # problems, so we reset it completely
-           verstring=
-           ;;
-         *)
-           verstring="0.0"
-           ;;
-         esac
-         if test "$need_version" = no; then
-           versuffix=
-         else
-           versuffix=".0.0"
-         fi
-       fi
-
-       # Remove version info from name if versioning should be avoided
-       if test "$avoid_version" = yes && test "$need_version" = no; then
-         major=
-         versuffix=
-         verstring=""
-       fi
-
-       # Check to see if the archive will have undefined symbols.
-       if test "$allow_undefined" = yes; then
-         if test "$allow_undefined_flag" = unsupported; then
-           func_warning "undefined symbols not allowed in $host shared libraries"
-           build_libtool_libs=no
-           build_old_libs=yes
-         fi
-       else
-         # Don't allow undefined symbols.
-         allow_undefined_flag="$no_undefined_flag"
-       fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-       # Remove our outputs, but don't remove object files since they
-       # may have been created when compiling PIC objects.
-       removelist=
-       tempremovelist=`$ECHO "$output_objdir/*"`
-       for p in $tempremovelist; do
-         case $p in
-           *.$objext | *.gcno)
-              ;;
-           $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-              if test "X$precious_files_regex" != "X"; then
-                if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-                then
-                  continue
-                fi
-              fi
-              func_append removelist " $p"
-              ;;
-           *) ;;
-         esac
-       done
-       test -n "$removelist" && \
-         func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-       func_append oldlibs " $output_objdir/$libname.$libext"
-
-       # Transform .lo files to .o files.
-       oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #        lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #        deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #        dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-       # If the user specified any rpath flags, then add them.
-       temp_xrpath=
-       for libdir in $xrpath; do
-         func_replace_sysroot "$libdir"
-         func_append temp_xrpath " -R$func_replace_sysroot_result"
-         case "$finalize_rpath " in
-         *" $libdir "*) ;;
-         *) func_append finalize_rpath " $libdir" ;;
-         esac
-       done
-       if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-         dependency_libs="$temp_xrpath $dependency_libs"
-       fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-       case " $dlprefiles $dlfiles " in
-       *" $lib "*) ;;
-       *) func_append dlfiles " $lib" ;;
-       esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-       case "$dlprefiles " in
-       *" $lib "*) ;;
-       *) func_append dlprefiles " $lib" ;;
-       esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-       if test -n "$rpath"; then
-         case $host in
-         *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-           # these systems don't actually have a c library (as such)!
-           ;;
-         *-*-rhapsody* | *-*-darwin1.[012])
-           # Rhapsody C library is in the System framework
-           func_append deplibs " System.ltframework"
-           ;;
-         *-*-netbsd*)
-           # Don't link with libc until the a.out ld.so is fixed.
-           ;;
-         *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-           # Do not include libc due to us having libc/libc_r.
-           ;;
-         *-*-sco3.2v5* | *-*-sco5v6*)
-           # Causes problems with __ctype
-           ;;
-         *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-           # Compiler inserts libc in the correct place for threads to work
-           ;;
-         *)
-           # Add libc to deplibs on all other systems if necessary.
-           if test "$build_libtool_need_lc" = "yes"; then
-             func_append deplibs " -lc"
-           fi
-           ;;
-         esac
-       fi
-
-       # Transform deplibs into only deplibs that can be linked in shared.
-       name_save=$name
-       libname_save=$libname
-       release_save=$release
-       versuffix_save=$versuffix
-       major_save=$major
-       # I'm not sure if I'm treating the release correctly.  I think
-       # release should show up in the -l (ie -lgmp5) so we don't want to
-       # add it in twice.  Is that correct?
-       release=""
-       versuffix=""
-       major=""
-       newdeplibs=
-       droppeddeps=no
-       case $deplibs_check_method in
-       pass_all)
-         # Don't check for shared/static.  Everything works.
-         # This might be a little naive.  We might want to check
-         # whether the library exists or not.  But this is on
-         # osf3 & osf4 and I'm not really sure... Just
-         # implementing what was already the behavior.
-         newdeplibs=$deplibs
-         ;;
-       test_compile)
-         # This code stresses the "libraries are programs" paradigm to its
-         # limits. Maybe even breaks it.  We compile a program, linking it
-         # against the deplibs as a proxy for the library.  Then we can check
-         # whether they linked in statically or dynamically with ldd.
-         $opt_dry_run || $RM conftest.c
-         cat > conftest.c <<EOF
-         int main() { return 0; }
-EOF
-         $opt_dry_run || $RM conftest
-         if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-           ldd_output=`ldd conftest`
-           for i in $deplibs; do
-             case $i in
-             -l*)
-               func_stripname -l '' "$i"
-               name=$func_stripname_result
-               if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                 case " $predeps $postdeps " in
-                 *" $i "*)
-                   func_append newdeplibs " $i"
-                   i=""
-                   ;;
-                 esac
-               fi
-               if test -n "$i" ; then
-                 libname=`eval "\\$ECHO \"$libname_spec\""`
-                 deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-                 set dummy $deplib_matches; shift
-                 deplib_match=$1
-                 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                   func_append newdeplibs " $i"
-                 else
-                   droppeddeps=yes
-                   echo
-                   $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-                   echo "*** I have the capability to make that library automatically link in when"
-                   echo "*** you link to this library.  But I can only do this if you have a"
-                   echo "*** shared version of the library, which I believe you do not have"
-                   echo "*** because a test_compile did reveal that the linker did not use it for"
-                   echo "*** its dynamic dependency list that programs get resolved with at runtime."
-                 fi
-               fi
-               ;;
-             *)
-               func_append newdeplibs " $i"
-               ;;
-             esac
-           done
-         else
-           # Error occurred in the first compile.  Let's try to salvage
-           # the situation: Compile a separate program for each library.
-           for i in $deplibs; do
-             case $i in
-             -l*)
-               func_stripname -l '' "$i"
-               name=$func_stripname_result
-               $opt_dry_run || $RM conftest
-               if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-                 ldd_output=`ldd conftest`
-                 if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-                   case " $predeps $postdeps " in
-                   *" $i "*)
-                     func_append newdeplibs " $i"
-                     i=""
-                     ;;
-                   esac
-                 fi
-                 if test -n "$i" ; then
-                   libname=`eval "\\$ECHO \"$libname_spec\""`
-                   deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-                   set dummy $deplib_matches; shift
-                   deplib_match=$1
-                   if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-                     func_append newdeplibs " $i"
-                   else
-                     droppeddeps=yes
-                     echo
-                     $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-                     echo "*** I have the capability to make that library automatically link in when"
-                     echo "*** you link to this library.  But I can only do this if you have a"
-                     echo "*** shared version of the library, which you do not appear to have"
-                     echo "*** because a test_compile did reveal that the linker did not use this one"
-                     echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-                   fi
-                 fi
-               else
-                 droppeddeps=yes
-                 echo
-                 $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-                 echo "*** make it link in!  You will probably need to install it or some"
-                 echo "*** library that it depends on before this library will be fully"
-                 echo "*** functional.  Installing it before continuing would be even better."
-               fi
-               ;;
-             *)
-               func_append newdeplibs " $i"
-               ;;
-             esac
-           done
-         fi
-         ;;
-       file_magic*)
-         set dummy $deplibs_check_method; shift
-         file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-         for a_deplib in $deplibs; do
-           case $a_deplib in
-           -l*)
-             func_stripname -l '' "$a_deplib"
-             name=$func_stripname_result
-             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               case " $predeps $postdeps " in
-               *" $a_deplib "*)
-                 func_append newdeplibs " $a_deplib"
-                 a_deplib=""
-                 ;;
-               esac
-             fi
-             if test -n "$a_deplib" ; then
-               libname=`eval "\\$ECHO \"$libname_spec\""`
-               if test -n "$file_magic_glob"; then
-                 libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-               else
-                 libnameglob=$libname
-               fi
-               test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                 if test "$want_nocaseglob" = yes; then
-                   shopt -s nocaseglob
-                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-                   $nocaseglob
-                 else
-                   potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-                 fi
-                 for potent_lib in $potential_libs; do
-                     # Follow soft links.
-                     if ls -lLd "$potent_lib" 2>/dev/null |
-                        $GREP " -> " >/dev/null; then
-                       continue
-                     fi
-                     # The statement above tries to avoid entering an
-                     # endless loop below, in case of cyclic links.
-                     # We might still enter an endless loop, since a link
-                     # loop can be closed while we follow links,
-                     # but so what?
-                     potlib="$potent_lib"
-                     while test -h "$potlib" 2>/dev/null; do
-                       potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-                       case $potliblink in
-                       [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-                       *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-                       esac
-                     done
-                     if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-                        $SED -e 10q |
-                        $EGREP "$file_magic_regex" > /dev/null; then
-                       func_append newdeplibs " $a_deplib"
-                       a_deplib=""
-                       break 2
-                     fi
-                 done
-               done
-             fi
-             if test -n "$a_deplib" ; then
-               droppeddeps=yes
-               echo
-               $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-               echo "*** I have the capability to make that library automatically link in when"
-               echo "*** you link to this library.  But I can only do this if you have a"
-               echo "*** shared version of the library, which you do not appear to have"
-               echo "*** because I did check the linker path looking for a file starting"
-               if test -z "$potlib" ; then
-                 $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-               else
-                 $ECHO "*** with $libname and none of the candidates passed a file format test"
-                 $ECHO "*** using a file magic. Last file checked: $potlib"
-               fi
-             fi
-             ;;
-           *)
-             # Add a -L argument.
-             func_append newdeplibs " $a_deplib"
-             ;;
-           esac
-         done # Gone through all deplibs.
-         ;;
-       match_pattern*)
-         set dummy $deplibs_check_method; shift
-         match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-         for a_deplib in $deplibs; do
-           case $a_deplib in
-           -l*)
-             func_stripname -l '' "$a_deplib"
-             name=$func_stripname_result
-             if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-               case " $predeps $postdeps " in
-               *" $a_deplib "*)
-                 func_append newdeplibs " $a_deplib"
-                 a_deplib=""
-                 ;;
-               esac
-             fi
-             if test -n "$a_deplib" ; then
-               libname=`eval "\\$ECHO \"$libname_spec\""`
-               for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-                 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-                 for potent_lib in $potential_libs; do
-                   potlib="$potent_lib" # see symlink-check above in file_magic test
-                   if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-                      $EGREP "$match_pattern_regex" > /dev/null; then
-                     func_append newdeplibs " $a_deplib"
-                     a_deplib=""
-                     break 2
-                   fi
-                 done
-               done
-             fi
-             if test -n "$a_deplib" ; then
-               droppeddeps=yes
-               echo
-               $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-               echo "*** I have the capability to make that library automatically link in when"
-               echo "*** you link to this library.  But I can only do this if you have a"
-               echo "*** shared version of the library, which you do not appear to have"
-               echo "*** because I did check the linker path looking for a file starting"
-               if test -z "$potlib" ; then
-                 $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-               else
-                 $ECHO "*** with $libname and none of the candidates passed a file format test"
-                 $ECHO "*** using a regex pattern. Last file checked: $potlib"
-               fi
-             fi
-             ;;
-           *)
-             # Add a -L argument.
-             func_append newdeplibs " $a_deplib"
-             ;;
-           esac
-         done # Gone through all deplibs.
-         ;;
-       none | unknown | *)
-         newdeplibs=""
-         tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-         if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-           for i in $predeps $postdeps ; do
-             # can't use Xsed below, because $i might contain '/'
-             tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-           done
-         fi
-         case $tmp_deplibs in
-         *[!\  \ ]*)
-           echo
-           if test "X$deplibs_check_method" = "Xnone"; then
-             echo "*** Warning: inter-library dependencies are not supported in this platform."
-           else
-             echo "*** Warning: inter-library dependencies are not known to be supported."
-           fi
-           echo "*** All declared inter-library dependencies are being dropped."
-           droppeddeps=yes
-           ;;
-         esac
-         ;;
-       esac
-       versuffix=$versuffix_save
-       major=$major_save
-       release=$release_save
-       libname=$libname_save
-       name=$name_save
-
-       case $host in
-       *-*-rhapsody* | *-*-darwin1.[012])
-         # On Rhapsody replace the C library with the System framework
-         newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-         ;;
-       esac
-
-       if test "$droppeddeps" = yes; then
-         if test "$module" = yes; then
-           echo
-           echo "*** Warning: libtool could not satisfy all declared inter-library"
-           $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-           echo "*** a static module, that should work as long as the dlopening"
-           echo "*** application is linked with the -dlopen flag."
-           if test -z "$global_symbol_pipe"; then
-             echo
-             echo "*** However, this would only work if libtool was able to extract symbol"
-             echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-             echo "*** not find such a program.  So, this module is probably useless."
-             echo "*** \`nm' from GNU binutils and a full rebuild may help."
-           fi
-           if test "$build_old_libs" = no; then
-             oldlibs="$output_objdir/$libname.$libext"
-             build_libtool_libs=module
-             build_old_libs=yes
-           else
-             build_libtool_libs=no
-           fi
-         else
-           echo "*** The inter-library dependencies that have been dropped here will be"
-           echo "*** automatically added whenever a program is linked with this library"
-           echo "*** or is declared to -dlopen it."
-
-           if test "$allow_undefined" = no; then
-             echo
-             echo "*** Since this library must not contain undefined symbols,"
-             echo "*** because either the platform does not support them or"
-             echo "*** it was explicitly requested with -no-undefined,"
-             echo "*** libtool will only create a static version of it."
-             if test "$build_old_libs" = no; then
-               oldlibs="$output_objdir/$libname.$libext"
-               build_libtool_libs=module
-               build_old_libs=yes
-             else
-               build_libtool_libs=no
-             fi
-           fi
-         fi
-       fi
-       # Done checking deplibs!
-       deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-       *-*-darwin*)
-         newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-         new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-         deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-         ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-       case " $new_libs " in
-       *" -L$path/$objdir "*) ;;
-       *)
-         case " $deplibs " in
-         *" -L$path/$objdir "*)
-           func_append new_libs " -L$path/$objdir" ;;
-         esac
-         ;;
-       esac
-      done
-      for deplib in $deplibs; do
-       case $deplib in
-       -L*)
-         case " $new_libs " in
-         *" $deplib "*) ;;
-         *) func_append new_libs " $deplib" ;;
-         esac
-         ;;
-       *) func_append new_libs " $deplib" ;;
-       esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-       # Remove ${wl} instances when linking with ld.
-       # FIXME: should test the right _cmds variable.
-       case $archive_cmds in
-         *\$LD\ *) wl= ;;
-        esac
-       if test "$hardcode_into_libs" = yes; then
-         # Hardcode the library paths
-         hardcode_libdirs=
-         dep_rpath=
-         rpath="$finalize_rpath"
-         test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-         for libdir in $rpath; do
-           if test -n "$hardcode_libdir_flag_spec"; then
-             if test -n "$hardcode_libdir_separator"; then
-               func_replace_sysroot "$libdir"
-               libdir=$func_replace_sysroot_result
-               if test -z "$hardcode_libdirs"; then
-                 hardcode_libdirs="$libdir"
-               else
-                 # Just accumulate the unique libdirs.
-                 case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-                 *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                   ;;
-                 *)
-                   func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-                   ;;
-                 esac
-               fi
-             else
-               eval flag=\"$hardcode_libdir_flag_spec\"
-               func_append dep_rpath " $flag"
-             fi
-           elif test -n "$runpath_var"; then
-             case "$perm_rpath " in
-             *" $libdir "*) ;;
-             *) func_append perm_rpath " $libdir" ;;
-             esac
-           fi
-         done
-         # Substitute the hardcoded libdirs into the rpath.
-         if test -n "$hardcode_libdir_separator" &&
-            test -n "$hardcode_libdirs"; then
-           libdir="$hardcode_libdirs"
-           eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-         fi
-         if test -n "$runpath_var" && test -n "$perm_rpath"; then
-           # We should set the runpath_var.
-           rpath=
-           for dir in $perm_rpath; do
-             func_append rpath "$dir:"
-           done
-           eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-         fi
-         test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-       fi
-
-       shlibpath="$finalize_shlibpath"
-       test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-       if test -n "$shlibpath"; then
-         eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-       fi
-
-       # Get the real and link names of the library.
-       eval shared_ext=\"$shrext_cmds\"
-       eval library_names=\"$library_names_spec\"
-       set dummy $library_names
-       shift
-       realname="$1"
-       shift
-
-       if test -n "$soname_spec"; then
-         eval soname=\"$soname_spec\"
-       else
-         soname="$realname"
-       fi
-       if test -z "$dlname"; then
-         dlname=$soname
-       fi
-
-       lib="$output_objdir/$realname"
-       linknames=
-       for link
-       do
-         func_append linknames " $link"
-       done
-
-       # Use standard objects if they are pic
-       test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-       test "X$libobjs" = "X " && libobjs=
-
-       delfiles=
-       if test -n "$export_symbols" && test -n "$include_expsyms"; then
-         $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-         export_symbols="$output_objdir/$libname.uexp"
-         func_append delfiles " $export_symbols"
-       fi
-
-       orig_export_symbols=
-       case $host_os in
-       cygwin* | mingw* | cegcc*)
-         if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-           # exporting using user supplied symfile
-           if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-             # and it's NOT already a .def file. Must figure out
-             # which of the given symbols are data symbols and tag
-             # them as such. So, trigger use of export_symbols_cmds.
-             # export_symbols gets reassigned inside the "prepare
-             # the list of exported symbols" if statement, so the
-             # include_expsyms logic still works.
-             orig_export_symbols="$export_symbols"
-             export_symbols=
-             always_export_symbols=yes
-           fi
-         fi
-         ;;
-       esac
-
-       # Prepare the list of exported symbols
-       if test -z "$export_symbols"; then
-         if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-           func_verbose "generating symbol list for \`$libname.la'"
-           export_symbols="$output_objdir/$libname.exp"
-           $opt_dry_run || $RM $export_symbols
-           cmds=$export_symbols_cmds
-           save_ifs="$IFS"; IFS='~'
-           for cmd1 in $cmds; do
-             IFS="$save_ifs"
-             # Take the normal branch if the nm_file_list_spec branch
-             # doesn't work or if tool conversion is not needed.
-             case $nm_file_list_spec~$to_tool_file_cmd in
-               *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-                 try_normal_branch=yes
-                 eval cmd=\"$cmd1\"
-                 func_len " $cmd"
-                 len=$func_len_result
-                 ;;
-               *)
-                 try_normal_branch=no
-                 ;;
-             esac
-             if test "$try_normal_branch" = yes \
-                && { test "$len" -lt "$max_cmd_len" \
-                     || test "$max_cmd_len" -le -1; }
-             then
-               func_show_eval "$cmd" 'exit $?'
-               skipped_export=false
-             elif test -n "$nm_file_list_spec"; then
-               func_basename "$output"
-               output_la=$func_basename_result
-               save_libobjs=$libobjs
-               save_output=$output
-               output=${output_objdir}/${output_la}.nm
-               func_to_tool_file "$output"
-               libobjs=$nm_file_list_spec$func_to_tool_file_result
-               func_append delfiles " $output"
-               func_verbose "creating $NM input file list: $output"
-               for obj in $save_libobjs; do
-                 func_to_tool_file "$obj"
-                 $ECHO "$func_to_tool_file_result"
-               done > "$output"
-               eval cmd=\"$cmd1\"
-               func_show_eval "$cmd" 'exit $?'
-               output=$save_output
-               libobjs=$save_libobjs
-               skipped_export=false
-             else
-               # The command line is too long to execute in one step.
-               func_verbose "using reloadable object file for export list..."
-               skipped_export=:
-               # Break out early, otherwise skipped_export may be
-               # set to false by a later but shorter cmd.
-               break
-             fi
-           done
-           IFS="$save_ifs"
-           if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-             func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-           fi
-         fi
-       fi
-
-       if test -n "$export_symbols" && test -n "$include_expsyms"; then
-         tmp_export_symbols="$export_symbols"
-         test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-         $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-       fi
-
-       if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-         # The given exports_symbols file has to be filtered, so filter it.
-         func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-         # FIXME: $output_objdir/$libname.filter potentially contains lots of
-         # 's' commands which not all seds can handle. GNU sed should be fine
-         # though. Also, the filter scales superlinearly with the number of
-         # global variables. join(1) would be nice here, but unfortunately
-         # isn't a blessed tool.
-         $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-         func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-         export_symbols=$output_objdir/$libname.def
-         $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-       fi
-
-       tmp_deplibs=
-       for test_deplib in $deplibs; do
-         case " $convenience " in
-         *" $test_deplib "*) ;;
-         *)
-           func_append tmp_deplibs " $test_deplib"
-           ;;
-         esac
-       done
-       deplibs="$tmp_deplibs"
-
-       if test -n "$convenience"; then
-         if test -n "$whole_archive_flag_spec" &&
-           test "$compiler_needs_object" = yes &&
-           test -z "$libobjs"; then
-           # extract the archives, so we have objects to list.
-           # TODO: could optimize this to just extract one archive.
-           whole_archive_flag_spec=
-         fi
-         if test -n "$whole_archive_flag_spec"; then
-           save_libobjs=$libobjs
-           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-           test "X$libobjs" = "X " && libobjs=
-         else
-           gentop="$output_objdir/${outputname}x"
-           func_append generated " $gentop"
-
-           func_extract_archives $gentop $convenience
-           func_append libobjs " $func_extract_archives_result"
-           test "X$libobjs" = "X " && libobjs=
-         fi
-       fi
-
-       if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-         eval flag=\"$thread_safe_flag_spec\"
-         func_append linker_flags " $flag"
-       fi
-
-       # Make a backup of the uninstalled library when relinking
-       if test "$opt_mode" = relink; then
-         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-       fi
-
-       # Do each of the archive commands.
-       if test "$module" = yes && test -n "$module_cmds" ; then
-         if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-           eval test_cmds=\"$module_expsym_cmds\"
-           cmds=$module_expsym_cmds
-         else
-           eval test_cmds=\"$module_cmds\"
-           cmds=$module_cmds
-         fi
-       else
-         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-           eval test_cmds=\"$archive_expsym_cmds\"
-           cmds=$archive_expsym_cmds
-         else
-           eval test_cmds=\"$archive_cmds\"
-           cmds=$archive_cmds
-         fi
-       fi
-
-       if test "X$skipped_export" != "X:" &&
-          func_len " $test_cmds" &&
-          len=$func_len_result &&
-          test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-         :
-       else
-         # The command line is too long to link in one step, link piecewise
-         # or, if using GNU ld and skipped_export is not :, use a linker
-         # script.
-
-         # Save the value of $output and $libobjs because we want to
-         # use them later.  If we have whole_archive_flag_spec, we
-         # want to use save_libobjs as it was before
-         # whole_archive_flag_spec was expanded, because we can't
-         # assume the linker understands whole_archive_flag_spec.
-         # This may have to be revisited, in case too many
-         # convenience libraries get linked in and end up exceeding
-         # the spec.
-         if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-           save_libobjs=$libobjs
-         fi
-         save_output=$output
-         func_basename "$output"
-         output_la=$func_basename_result
-
-         # Clear the reloadable object creation command queue and
-         # initialize k to one.
-         test_cmds=
-         concat_cmds=
-         objlist=
-         last_robj=
-         k=1
-
-         if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-           output=${output_objdir}/${output_la}.lnkscript
-           func_verbose "creating GNU ld script: $output"
-           echo 'INPUT (' > $output
-           for obj in $save_libobjs
-           do
-             func_to_tool_file "$obj"
-             $ECHO "$func_to_tool_file_result" >> $output
-           done
-           echo ')' >> $output
-           func_append delfiles " $output"
-           func_to_tool_file "$output"
-           output=$func_to_tool_file_result
-         elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-           output=${output_objdir}/${output_la}.lnk
-           func_verbose "creating linker input file list: $output"
-           : > $output
-           set x $save_libobjs
-           shift
-           firstobj=
-           if test "$compiler_needs_object" = yes; then
-             firstobj="$1 "
-             shift
-           fi
-           for obj
-           do
-             func_to_tool_file "$obj"
-             $ECHO "$func_to_tool_file_result" >> $output
-           done
-           func_append delfiles " $output"
-           func_to_tool_file "$output"
-           output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-         else
-           if test -n "$save_libobjs"; then
-             func_verbose "creating reloadable object files..."
-             output=$output_objdir/$output_la-${k}.$objext
-             eval test_cmds=\"$reload_cmds\"
-             func_len " $test_cmds"
-             len0=$func_len_result
-             len=$len0
-
-             # Loop over the list of objects to be linked.
-             for obj in $save_libobjs
-             do
-               func_len " $obj"
-               func_arith $len + $func_len_result
-               len=$func_arith_result
-               if test "X$objlist" = X ||
-                  test "$len" -lt "$max_cmd_len"; then
-                 func_append objlist " $obj"
-               else
-                 # The command $test_cmds is almost too long, add a
-                 # command to the queue.
-                 if test "$k" -eq 1 ; then
-                   # The first file doesn't have a previous command to add.
-                   reload_objs=$objlist
-                   eval concat_cmds=\"$reload_cmds\"
-                 else
-                   # All subsequent reloadable object files will link in
-                   # the last one created.
-                   reload_objs="$objlist $last_robj"
-                   eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-                 fi
-                 last_robj=$output_objdir/$output_la-${k}.$objext
-                 func_arith $k + 1
-                 k=$func_arith_result
-                 output=$output_objdir/$output_la-${k}.$objext
-                 objlist=" $obj"
-                 func_len " $last_robj"
-                 func_arith $len0 + $func_len_result
-                 len=$func_arith_result
-               fi
-             done
-             # Handle the remaining objects by creating one last
-             # reloadable object file.  All subsequent reloadable object
-             # files will link in the last one created.
-             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-             reload_objs="$objlist $last_robj"
-             eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-             if test -n "$last_robj"; then
-               eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-             fi
-             func_append delfiles " $output"
-
-           else
-             output=
-           fi
-
-           if ${skipped_export-false}; then
-             func_verbose "generating symbol list for \`$libname.la'"
-             export_symbols="$output_objdir/$libname.exp"
-             $opt_dry_run || $RM $export_symbols
-             libobjs=$output
-             # Append the command to create the export file.
-             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-             eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-             if test -n "$last_robj"; then
-               eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-             fi
-           fi
-
-           test -n "$save_libobjs" &&
-             func_verbose "creating a temporary reloadable object file: $output"
-
-           # Loop through the commands generated above and execute them.
-           save_ifs="$IFS"; IFS='~'
-           for cmd in $concat_cmds; do
-             IFS="$save_ifs"
-             $opt_silent || {
-                 func_quote_for_expand "$cmd"
-                 eval "func_echo $func_quote_for_expand_result"
-             }
-             $opt_dry_run || eval "$cmd" || {
-               lt_exit=$?
-
-               # Restore the uninstalled library and exit
-               if test "$opt_mode" = relink; then
-                 ( cd "$output_objdir" && \
-                   $RM "${realname}T" && \
-                   $MV "${realname}U" "$realname" )
-               fi
-
-               exit $lt_exit
-             }
-           done
-           IFS="$save_ifs"
-
-           if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-             func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-             func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-           fi
-         fi
-
-          if ${skipped_export-false}; then
-           if test -n "$export_symbols" && test -n "$include_expsyms"; then
-             tmp_export_symbols="$export_symbols"
-             test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-             $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-           fi
-
-           if test -n "$orig_export_symbols"; then
-             # The given exports_symbols file has to be filtered, so filter it.
-             func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-             # FIXME: $output_objdir/$libname.filter potentially contains lots of
-             # 's' commands which not all seds can handle. GNU sed should be fine
-             # though. Also, the filter scales superlinearly with the number of
-             # global variables. join(1) would be nice here, but unfortunately
-             # isn't a blessed tool.
-             $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-             func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-             export_symbols=$output_objdir/$libname.def
-             $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-           fi
-         fi
-
-         libobjs=$output
-         # Restore the value of output.
-         output=$save_output
-
-         if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-           eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-           test "X$libobjs" = "X " && libobjs=
-         fi
-         # Expand the library linking commands again to reset the
-         # value of $libobjs for piecewise linking.
-
-         # Do each of the archive commands.
-         if test "$module" = yes && test -n "$module_cmds" ; then
-           if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-             cmds=$module_expsym_cmds
-           else
-             cmds=$module_cmds
-           fi
-         else
-           if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-             cmds=$archive_expsym_cmds
-           else
-             cmds=$archive_cmds
-           fi
-         fi
-       fi
-
-       if test -n "$delfiles"; then
-         # Append the command to remove temporary files to $cmds.
-         eval cmds=\"\$cmds~\$RM $delfiles\"
-       fi
-
-       # Add any objects from preloaded convenience libraries
-       if test -n "$dlprefiles"; then
-         gentop="$output_objdir/${outputname}x"
-         func_append generated " $gentop"
-
-         func_extract_archives $gentop $dlprefiles
-         func_append libobjs " $func_extract_archives_result"
-         test "X$libobjs" = "X " && libobjs=
-       fi
-
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-         IFS="$save_ifs"
-         eval cmd=\"$cmd\"
-         $opt_silent || {
-           func_quote_for_expand "$cmd"
-           eval "func_echo $func_quote_for_expand_result"
-         }
-         $opt_dry_run || eval "$cmd" || {
-           lt_exit=$?
-
-           # Restore the uninstalled library and exit
-           if test "$opt_mode" = relink; then
-             ( cd "$output_objdir" && \
-               $RM "${realname}T" && \
-               $MV "${realname}U" "$realname" )
-           fi
-
-           exit $lt_exit
-         }
-       done
-       IFS="$save_ifs"
-
-       # Restore the uninstalled library and exit
-       if test "$opt_mode" = relink; then
-         $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-         if test -n "$convenience"; then
-           if test -z "$whole_archive_flag_spec"; then
-             func_show_eval '${RM}r "$gentop"'
-           fi
-         fi
-
-         exit $EXIT_SUCCESS
-       fi
-
-       # Create links to the real library.
-       for linkname in $linknames; do
-         if test "$realname" != "$linkname"; then
-           func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-         fi
-       done
-
-       # If -module or -export-dynamic was specified, set the dlname.
-       if test "$module" = yes || test "$export_dynamic" = yes; then
-         # On all known operating systems, these are identical.
-         dlname="$soname"
-       fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-       func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-       func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-       func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-       func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-       func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-       func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-       test -n "$objs$old_deplibs" && \
-         func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-       libobj=$output
-       func_lo2o "$libobj"
-       obj=$func_lo2o_result
-       ;;
-      *)
-       libobj=
-       obj="$output"
-       ;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-       if test -n "$whole_archive_flag_spec"; then
-         eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-         reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-       else
-         gentop="$output_objdir/${obj}x"
-         func_append generated " $gentop"
-
-         func_extract_archives $gentop $convenience
-         reload_conv_objs="$reload_objs $func_extract_archives_result"
-       fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-       if test -n "$gentop"; then
-         func_show_eval '${RM}r "$gentop"'
-       fi
-
-       exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-       if test -n "$gentop"; then
-         func_show_eval '${RM}r "$gentop"'
-       fi
-
-       # Create an invalid libtool object if no PIC, so that we don't
-       # accidentally link it into a program.
-       # $show "echo timestamp > $libobj"
-       # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-       exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-       # Only do commands if we really have different PIC objects.
-       reload_objs="$libobjs $reload_conv_objs"
-       output="$libobj"
-       func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-       func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-       *cygwin*) func_stripname '' '.exe' "$output"
-                 output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-       func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-       func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-       && test "$dlopen_self" = unknown \
-       && test "$dlopen_self_static" = unknown && \
-         func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-       # On Rhapsody replace the C library is the System framework
-       compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-       finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-       ;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-       # Don't allow lazy linking, it breaks C++ global constructors
-       # But is supposedly fixed on 10.4 or later (yay!).
-       if test "$tagname" = CXX ; then
-         case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-           10.[0123])
-             func_append compile_command " ${wl}-bind_at_load"
-             func_append finalize_command " ${wl}-bind_at_load"
-           ;;
-         esac
-       fi
-       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-       compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-       finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-       ;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-       case " $new_libs " in
-       *" -L$path/$objdir "*) ;;
-       *)
-         case " $compile_deplibs " in
-         *" -L$path/$objdir "*)
-           func_append new_libs " -L$path/$objdir" ;;
-         esac
-         ;;
-       esac
-      done
-      for deplib in $compile_deplibs; do
-       case $deplib in
-       -L*)
-         case " $new_libs " in
-         *" $deplib "*) ;;
-         *) func_append new_libs " $deplib" ;;
-         esac
-         ;;
-       *) func_append new_libs " $deplib" ;;
-       esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-       # If the user specified any rpath flags, then add them.
-       for libdir in $rpath $xrpath; do
-         # This is the magic to use -rpath.
-         case "$finalize_rpath " in
-         *" $libdir "*) ;;
-         *) func_append finalize_rpath " $libdir" ;;
-         esac
-       done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-       if test -n "$hardcode_libdir_flag_spec"; then
-         if test -n "$hardcode_libdir_separator"; then
-           if test -z "$hardcode_libdirs"; then
-             hardcode_libdirs="$libdir"
-           else
-             # Just accumulate the unique libdirs.
-             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-               ;;
-             *)
-               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-               ;;
-             esac
-           fi
-         else
-           eval flag=\"$hardcode_libdir_flag_spec\"
-           func_append rpath " $flag"
-         fi
-       elif test -n "$runpath_var"; then
-         case "$perm_rpath " in
-         *" $libdir "*) ;;
-         *) func_append perm_rpath " $libdir" ;;
-         esac
-       fi
-       case $host in
-       *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-         testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-         case :$dllsearchpath: in
-         *":$libdir:"*) ;;
-         ::) dllsearchpath=$libdir;;
-         *) func_append dllsearchpath ":$libdir";;
-         esac
-         case :$dllsearchpath: in
-         *":$testbindir:"*) ;;
-         ::) dllsearchpath=$testbindir;;
-         *) func_append dllsearchpath ":$testbindir";;
-         esac
-         ;;
-       esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-        test -n "$hardcode_libdirs"; then
-       libdir="$hardcode_libdirs"
-       eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-       if test -n "$hardcode_libdir_flag_spec"; then
-         if test -n "$hardcode_libdir_separator"; then
-           if test -z "$hardcode_libdirs"; then
-             hardcode_libdirs="$libdir"
-           else
-             # Just accumulate the unique libdirs.
-             case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-             *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-               ;;
-             *)
-               func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-               ;;
-             esac
-           fi
-         else
-           eval flag=\"$hardcode_libdir_flag_spec\"
-           func_append rpath " $flag"
-         fi
-       elif test -n "$runpath_var"; then
-         case "$finalize_perm_rpath " in
-         *" $libdir "*) ;;
-         *) func_append finalize_perm_rpath " $libdir" ;;
-         esac
-       fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-        test -n "$hardcode_libdirs"; then
-       libdir="$hardcode_libdirs"
-       eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-       # Transform all the library objects into standard objects.
-       compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-       finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-       func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-       # Replace the output file specification.
-       compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-       link_command="$compile_command$compile_rpath"
-
-       # We have no uninstalled library dependencies, so finalize right now.
-       exit_status=0
-       func_show_eval "$link_command" 'exit_status=$?'
-
-       if test -n "$postlink_cmds"; then
-         func_to_tool_file "$output"
-         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-         func_execute_cmds "$postlink_cmds" 'exit $?'
-       fi
-
-       # Delete the generated files.
-       if test -f "$output_objdir/${outputname}S.${objext}"; then
-         func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-       fi
-
-       exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-       compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-       finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-       if test -n "$perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $perm_rpath; do
-           func_append rpath "$dir:"
-         done
-         compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-       fi
-       if test -n "$finalize_perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $finalize_perm_rpath; do
-           func_append rpath "$dir:"
-         done
-         finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-       fi
-      fi
-
-      if test "$no_install" = yes; then
-       # We don't need to create a wrapper script.
-       link_command="$compile_var$compile_command$compile_rpath"
-       # Replace the output file specification.
-       link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-       # Delete the old output file.
-       $opt_dry_run || $RM $output
-       # Link the executable and exit
-       func_show_eval "$link_command" 'exit $?'
-
-       if test -n "$postlink_cmds"; then
-         func_to_tool_file "$output"
-         postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-         func_execute_cmds "$postlink_cmds" 'exit $?'
-       fi
-
-       exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-       # Fast installation is not supported
-       link_command="$compile_var$compile_command$compile_rpath"
-       relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-       func_warning "this platform does not like uninstalled shared libraries"
-       func_warning "\`$output' will be relinked during installation"
-      else
-       if test "$fast_install" != no; then
-         link_command="$finalize_var$compile_command$finalize_rpath"
-         if test "$fast_install" = yes; then
-           relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-         else
-           # fast_install is set to needless
-           relink_command=
-         fi
-       else
-         link_command="$compile_var$compile_command$compile_rpath"
-         relink_command="$finalize_var$finalize_command$finalize_rpath"
-       fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-       func_to_tool_file "$output_objdir/$outputname"
-       postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-       func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-       # Preserve any variables that may affect compiler behavior
-       for var in $variables_saved_for_relink; do
-         if eval test -z \"\${$var+set}\"; then
-           relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-         elif eval var_value=\$$var; test -z "$var_value"; then
-           relink_command="$var=; export $var; $relink_command"
-         else
-           func_quote_for_eval "$var_value"
-           relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-         fi
-       done
-       relink_command="(cd `pwd`; $relink_command)"
-       relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-       # win32 will think the script is a binary if it has
-       # a .exe suffix, so we strip it off here.
-       case $output in
-         *.exe) func_stripname '' '.exe' "$output"
-                output=$func_stripname_result ;;
-       esac
-       # test for cygwin because mv fails w/o .exe extensions
-       case $host in
-         *cygwin*)
-           exeext=.exe
-           func_stripname '' '.exe' "$outputname"
-           outputname=$func_stripname_result ;;
-         *) exeext= ;;
-       esac
-       case $host in
-         *cygwin* | *mingw* )
-           func_dirname_and_basename "$output" "" "."
-           output_name=$func_basename_result
-           output_path=$func_dirname_result
-           cwrappersource="$output_path/$objdir/lt-$output_name.c"
-           cwrapper="$output_path/$output_name.exe"
-           $RM $cwrappersource $cwrapper
-           trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-           func_emit_cwrapperexe_src > $cwrappersource
-
-           # The wrapper executable is built using the $host compiler,
-           # because it contains $host paths and files. If cross-
-           # compiling, it, like the target executable, must be
-           # executed on the $host or under an emulation environment.
-           $opt_dry_run || {
-             $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-             $STRIP $cwrapper
-           }
-
-           # Now, create the wrapper script for func_source use:
-           func_ltwrapper_scriptname $cwrapper
-           $RM $func_ltwrapper_scriptname_result
-           trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-           $opt_dry_run || {
-             # note: this script will not be executed, so do not chmod.
-             if test "x$build" = "x$host" ; then
-               $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-             else
-               func_emit_wrapper no > $func_ltwrapper_scriptname_result
-             fi
-           }
-         ;;
-         * )
-           $RM $output
-           trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-           func_emit_wrapper no > $output
-           chmod +x $output
-         ;;
-       esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-       oldobjs="$libobjs_save $symfileobj"
-       addlibs="$convenience"
-       build_libtool_libs=no
-      else
-       if test "$build_libtool_libs" = module; then
-         oldobjs="$libobjs_save"
-         build_libtool_libs=no
-       else
-         oldobjs="$old_deplibs $non_pic_objects"
-         if test "$preload" = yes && test -f "$symfileobj"; then
-           func_append oldobjs " $symfileobj"
-         fi
-       fi
-       addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-       gentop="$output_objdir/${outputname}x"
-       func_append generated " $gentop"
-
-       func_extract_archives $gentop $addlibs
-       func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-
-       # Add any objects from preloaded convenience libraries
-       if test -n "$dlprefiles"; then
-         gentop="$output_objdir/${outputname}x"
-         func_append generated " $gentop"
-
-         func_extract_archives $gentop $dlprefiles
-         func_append oldobjs " $func_extract_archives_result"
-       fi
-
-       # POSIX demands no paths to be encoded in archives.  We have
-       # to avoid creating archives with duplicate basenames if we
-       # might have to extract them afterwards, e.g., when creating a
-       # static archive out of a convenience library, or when linking
-       # the entirety of a libtool archive into another (currently
-       # not supported by libtool).
-       if (for obj in $oldobjs
-           do
-             func_basename "$obj"
-             $ECHO "$func_basename_result"
-           done | sort | sort -uc >/dev/null 2>&1); then
-         :
-       else
-         echo "copying selected object files to avoid basename conflicts..."
-         gentop="$output_objdir/${outputname}x"
-         func_append generated " $gentop"
-         func_mkdir_p "$gentop"
-         save_oldobjs=$oldobjs
-         oldobjs=
-         counter=1
-         for obj in $save_oldobjs
-         do
-           func_basename "$obj"
-           objbase="$func_basename_result"
-           case " $oldobjs " in
-           " ") oldobjs=$obj ;;
-           *[\ /]"$objbase "*)
-             while :; do
-               # Make sure we don't pick an alternate name that also
-               # overlaps.
-               newobj=lt$counter-$objbase
-               func_arith $counter + 1
-               counter=$func_arith_result
-               case " $oldobjs " in
-               *[\ /]"$newobj "*) ;;
-               *) if test ! -f "$gentop/$newobj"; then break; fi ;;
-               esac
-             done
-             func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-             func_append oldobjs " $gentop/$newobj"
-             ;;
-           *) func_append oldobjs " $obj" ;;
-           esac
-         done
-       fi
-       func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-       tool_oldlib=$func_to_tool_file_result
-       eval cmds=\"$old_archive_cmds\"
-
-       func_len " $cmds"
-       len=$func_len_result
-       if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-         cmds=$old_archive_cmds
-       elif test -n "$archiver_list_spec"; then
-         func_verbose "using command file archive linking..."
-         for obj in $oldobjs
-         do
-           func_to_tool_file "$obj"
-           $ECHO "$func_to_tool_file_result"
-         done > $output_objdir/$libname.libcmd
-         func_to_tool_file "$output_objdir/$libname.libcmd"
-         oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-         cmds=$old_archive_cmds
-       else
-         # the command line is too long to link in one step, link in parts
-         func_verbose "using piecewise archive linking..."
-         save_RANLIB=$RANLIB
-         RANLIB=:
-         objlist=
-         concat_cmds=
-         save_oldobjs=$oldobjs
-         oldobjs=
-         # Is there a better way of finding the last object in the list?
-         for obj in $save_oldobjs
-         do
-           last_oldobj=$obj
-         done
-         eval test_cmds=\"$old_archive_cmds\"
-         func_len " $test_cmds"
-         len0=$func_len_result
-         len=$len0
-         for obj in $save_oldobjs
-         do
-           func_len " $obj"
-           func_arith $len + $func_len_result
-           len=$func_arith_result
-           func_append objlist " $obj"
-           if test "$len" -lt "$max_cmd_len"; then
-             :
-           else
-             # the above command should be used before it gets too long
-             oldobjs=$objlist
-             if test "$obj" = "$last_oldobj" ; then
-               RANLIB=$save_RANLIB
-             fi
-             test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-             eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-             objlist=
-             len=$len0
-           fi
-         done
-         RANLIB=$save_RANLIB
-         oldobjs=$objlist
-         if test "X$oldobjs" = "X" ; then
-           eval cmds=\"\$concat_cmds\"
-         else
-           eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-         fi
-       fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-       if eval test -z \"\${$var+set}\"; then
-         relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-       elif eval var_value=\$$var; test -z "$var_value"; then
-         relink_command="$var=; export $var; $relink_command"
-       else
-         func_quote_for_eval "$var_value"
-         relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-       fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-       relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-       for installed in no yes; do
-         if test "$installed" = yes; then
-           if test -z "$install_libdir"; then
-             break
-           fi
-           output="$output_objdir/$outputname"i
-           # Replace all uninstalled libtool libraries with the installed ones
-           newdependency_libs=
-           for deplib in $dependency_libs; do
-             case $deplib in
-             *.la)
-               func_basename "$deplib"
-               name="$func_basename_result"
-               func_resolve_sysroot "$deplib"
-               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-               test -z "$libdir" && \
-                 func_fatal_error "\`$deplib' is not a valid libtool archive"
-               func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-               ;;
-             -L*)
-               func_stripname -L '' "$deplib"
-               func_replace_sysroot "$func_stripname_result"
-               func_append newdependency_libs " -L$func_replace_sysroot_result"
-               ;;
-             -R*)
-               func_stripname -R '' "$deplib"
-               func_replace_sysroot "$func_stripname_result"
-               func_append newdependency_libs " -R$func_replace_sysroot_result"
-               ;;
-             *) func_append newdependency_libs " $deplib" ;;
-             esac
-           done
-           dependency_libs="$newdependency_libs"
-           newdlfiles=
-
-           for lib in $dlfiles; do
-             case $lib in
-             *.la)
-               func_basename "$lib"
-               name="$func_basename_result"
-               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-               test -z "$libdir" && \
-                 func_fatal_error "\`$lib' is not a valid libtool archive"
-               func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-               ;;
-             *) func_append newdlfiles " $lib" ;;
-             esac
-           done
-           dlfiles="$newdlfiles"
-           newdlprefiles=
-           for lib in $dlprefiles; do
-             case $lib in
-             *.la)
-               # Only pass preopened files to the pseudo-archive (for
-               # eventual linking with the app. that links it) if we
-               # didn't already link the preopened objects directly into
-               # the library:
-               func_basename "$lib"
-               name="$func_basename_result"
-               eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-               test -z "$libdir" && \
-                 func_fatal_error "\`$lib' is not a valid libtool archive"
-               func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-               ;;
-             esac
-           done
-           dlprefiles="$newdlprefiles"
-         else
-           newdlfiles=
-           for lib in $dlfiles; do
-             case $lib in
-               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-               *) abs=`pwd`"/$lib" ;;
-             esac
-             func_append newdlfiles " $abs"
-           done
-           dlfiles="$newdlfiles"
-           newdlprefiles=
-           for lib in $dlprefiles; do
-             case $lib in
-               [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-               *) abs=`pwd`"/$lib" ;;
-             esac
-             func_append newdlprefiles " $abs"
-           done
-           dlprefiles="$newdlprefiles"
-         fi
-         $RM $output
-         # place dlname in correct position for cygwin
-         # In fact, it would be nice if we could use this code for all target
-         # systems that can't hard-code library paths into their executables
-         # and that have no shared library path variable independent of PATH,
-         # but it turns out we can't easily determine that from inspecting
-         # libtool variables, so we have to hard-code the OSs to which it
-         # applies here; at the moment, that means platforms that use the PE
-         # object format with DLL files.  See the long comment at the top of
-         # tests/bindir.at for full details.
-         tdlname=$dlname
-         case $host,$output,$installed,$module,$dlname in
-           *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-             # If a -bindir argument was supplied, place the dll there.
-             if test "x$bindir" != x ;
-             then
-               func_relative_path "$install_libdir" "$bindir"
-               tdlname=$func_relative_path_result$dlname
-             else
-               # Otherwise fall back on heuristic.
-               tdlname=../bin/$dlname
-             fi
-             ;;
-         esac
-         $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-         if test "$installed" = no && test "$need_relink" = yes; then
-           $ECHO >> $output "\
-relink_command=\"$relink_command\""
-         fi
-       done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-       odir="$objdir"
-      else
-       odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-       case " $rmdirs " in
-         *" $odir "*) ;;
-         *) func_append rmdirs " $odir" ;;
-       esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-        { test -h "$file"; } >/dev/null 2>&1 ||
-        test -f "$file"; then
-       :
-      elif test -d "$file"; then
-       exit_status=1
-       continue
-      elif test "$rmforce" = yes; then
-       continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-       # Possibly a libtool archive, so verify it.
-       if func_lalib_p "$file"; then
-         func_source $dir/$name
-
-         # Delete the libtool libraries and symlinks.
-         for n in $library_names; do
-           func_append rmfiles " $odir/$n"
-         done
-         test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-         case "$opt_mode" in
-         clean)
-           case " $library_names " in
-           *" $dlname "*) ;;
-           *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-           esac
-           test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-           ;;
-         uninstall)
-           if test -n "$library_names"; then
-             # Do each command in the postuninstall commands.
-             func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-           fi
-
-           if test -n "$old_library"; then
-             # Do each command in the old_postuninstall commands.
-             func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-           fi
-           # FIXME: should reinstall the best remaining shared library.
-           ;;
-         esac
-       fi
-       ;;
-
-      *.lo)
-       # Possibly a libtool object, so verify it.
-       if func_lalib_p "$file"; then
-
-         # Read the .lo file
-         func_source $dir/$name
-
-         # Add PIC object to the list of files to remove.
-         if test -n "$pic_object" &&
-            test "$pic_object" != none; then
-           func_append rmfiles " $dir/$pic_object"
-         fi
-
-         # Add non-PIC object to the list of files to remove.
-         if test -n "$non_pic_object" &&
-            test "$non_pic_object" != none; then
-           func_append rmfiles " $dir/$non_pic_object"
-         fi
-       fi
-       ;;
-
-      *)
-       if test "$opt_mode" = clean ; then
-         noexename=$name
-         case $file in
-         *.exe)
-           func_stripname '' '.exe' "$file"
-           file=$func_stripname_result
-           func_stripname '' '.exe' "$name"
-           noexename=$func_stripname_result
-           # $file with .exe has already been added to rmfiles,
-           # add $file without .exe
-           func_append rmfiles " $file"
-           ;;
-         esac
-         # Do a test to see if this is a libtool program.
-         if func_ltwrapper_p "$file"; then
-           if func_ltwrapper_executable_p "$file"; then
-             func_ltwrapper_scriptname "$file"
-             relink_command=
-             func_source $func_ltwrapper_scriptname_result
-             func_append rmfiles " $func_ltwrapper_scriptname_result"
-           else
-             relink_command=
-             func_source $dir/$noexename
-           fi
-
-           # note $name still contains .exe if it was in $file originally
-           # as does the version of $file that was added into $rmfiles
-           func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-           if test "$fast_install" = yes && test -n "$relink_command"; then
-             func_append rmfiles " $odir/lt-$name"
-           fi
-           if test "X$noexename" != "X$name" ; then
-             func_append rmfiles " $odir/lt-${noexename}.c"
-           fi
-         fi
-       fi
-       ;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-       func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644 (file)
index 0000000..55eaa80
--- /dev/null
@@ -0,0 +1,6 @@
+intltool.m4
+libtool.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
diff --git a/m4/intltool.m4 b/m4/intltool.m4
deleted file mode 100644 (file)
index 07af68b..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-##         Kenneth Christiansen <kenneth@gnu.org>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
-    1.[01234])
-       AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-    ;;
-    *)
-    ;;
-esac
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    ]
-    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-       AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
-   AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
-   AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
-   AC_MSG_CHECKING([for XML::Parser])
-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       AC_MSG_RESULT([ok])
-   else
-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-   fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
-  AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([[]],
-                     [[extern int _nl_msg_cat_cntr;
-                       return _nl_msg_cat_cntr]])],
-    [DATADIRNAME=share],
-    [case $host in
-    *-*-solaris*)
-    dnl On Solaris, if bind_textdomain_codeset is in libc,
-    dnl GNU format message catalog is always supported,
-    dnl since both are added to the libc all together.
-    dnl Hence, we'd like to go with DATADIRNAME=share
-    dnl in this case.
-    AC_CHECK_FUNC(bind_textdomain_codeset,
-      [DATADIRNAME=share], [DATADIRNAME=lib])
-    ;;
-    *)
-    [DATADIRNAME=lib]
-    ;;
-    esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
-  AC_CONFIG_COMMANDS([$1/stamp-it], [
-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-    fi
-    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-    >"$1/stamp-it.tmp"
-    [sed '/^#/d
-        s/^[[].*] *//
-        /^[    ]*$/d
-       '"s|^|  $ac_top_srcdir/|" \
-      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-    ]
-    [sed '/^POTFILES =/,/[^\\]$/ {
-               /^POTFILES =/!d
-               r $1/POTFILES
-         }
-        ' "$1/Makefile.in" >"$1/Makefile"]
-    rm -f "$1/Makefile.tmp"
-    mv "$1/stamp-it.tmp" "$1/stamp-it"
-  ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
diff --git a/m4/libtool.m4 b/m4/libtool.m4
deleted file mode 100644 (file)
index 56666f0..0000000
+++ /dev/null
@@ -1,7986 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-                  [m4_fatal([Libtool version $1 or higher is required],
-                            63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\    *)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-       [m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-       [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-       [tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-          m4_quote(lt_decl_varnames),
-       m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-                       lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-                                          [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-       dnl If the libtool generation code has been placed in $CONFIG_LT,
-       dnl instead of duplicating it all over again into config.status,
-       dnl then we will have config.status run $CONFIG_LT later, so it
-       dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to <bug-libtool@gnu.org>."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],                 [_LT_LANG(C)],
-  [C++],               [_LT_LANG(CXX)],
-  [Go],                        [_LT_LANG(GO)],
-  [Java],              [_LT_LANG(GCJ)],
-  [Fortran 77],                [_LT_LANG(F77)],
-  [Fortran],           [_LT_LANG(FC)],
-  [Windows Resource],  [_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-       [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-       [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-       [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-       # By default we will add the -single_module flag. You can override
-       # by either setting the environment variable LT_MULTI_MODULE
-       # non-empty at configure time, or by adding -multi_module to the
-       # link flags.
-       rm -rf libconftest.dylib*
-       echo "int foo(void){return 1;}" > conftest.c
-       echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-       $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-         -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-       # If there is a non-empty error log, and "single_module"
-       # appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-         cat conftest.err >&AS_MESSAGE_LOG_FD
-       # Otherwise, if the output was created with a 0 exit code from
-       # the compiler, it worked.
-       elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-         lt_cv_apple_cc_single_mod=yes
-       else
-         cat conftest.err >&AS_MESSAGE_LOG_FD
-       fi
-       rm -rf libconftest.dylib*
-       rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-       [lt_cv_ld_exported_symbols_list=yes],
-       [lt_cv_ld_exported_symbols_list=no])
-       LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-       cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-       lt_cv_ld_force_load=yes
-      else
-       cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-       10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-       10.[[012]]*)
-         _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-       10.*)
-         _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-         /^0/ {
-             s/^0  *\([^ ]*\) *$/\1/
-             p
-         }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-       HPUX_IA64_MODE="32"
-       ;;
-      *ELF-64*)
-       HPUX_IA64_MODE="64"
-       ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-       *32-bit*)
-         LD="${LD-ld} -melf32bsmip"
-         ;;
-       *N32*)
-         LD="${LD-ld} -melf32bmipn32"
-         ;;
-       *64-bit*)
-         LD="${LD-ld} -melf64bmip"
-       ;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-       *32-bit*)
-         LD="${LD-ld} -32"
-         ;;
-       *N32*)
-         LD="${LD-ld} -n32"
-         ;;
-       *64-bit*)
-         LD="${LD-ld} -64"
-         ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_i386_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
-         ppc64-*linux*|powerpc64-*linux*)
-           LD="${LD-ld} -m elf32ppclinux"
-           ;;
-         s390x-*linux*)
-           LD="${LD-ld} -m elf_s390"
-           ;;
-         sparc64-*linux*)
-           LD="${LD-ld} -m elf32_sparc"
-           ;;
-       esac
-       ;;
-      *64-bit*)
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-           ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
-         ppc*-*linux*|powerpc*-*linux*)
-           LD="${LD-ld} -m elf64ppc"
-           ;;
-         s390*-*linux*|s390*-*tpf*)
-           LD="${LD-ld} -m elf64_s390"
-           ;;
-         sparc*-*linux*)
-           LD="${LD-ld} -m elf64_sparc"
-           ;;
-       esac
-       ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-       if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-         LD="${LD-ld} -64"
-       fi
-       ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-       # Ensure the archiver fails upon bogus file names.
-       rm -f conftest.$ac_objext libconftest.a
-       AC_TRY_EVAL([lt_ar_try])
-       if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#              [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536      # usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[        ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-                = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-             test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL          RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL                DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL                0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW           RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW         DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW       RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW     DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW     0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-         if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-       }
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-         [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-           [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-       [AC_CHECK_FUNC([dlopen],
-             [lt_cv_dlopen="dlopen"],
-         [AC_CHECK_LIB([dl], [dlopen],
-               [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-           [AC_CHECK_LIB([svld], [dlopen],
-                 [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-             [AC_CHECK_LIB([dld], [dld_link],
-                   [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-             ])
-           ])
-         ])
-       ])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-         lt_cv_dlopen_self, [dnl
-         _LT_TRY_DLOPEN_SELF(
-           lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-           lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-         lt_cv_dlopen_self_static, [dnl
-         _LT_TRY_DLOPEN_SELF(
-           lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-           lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-        [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-        [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-        [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-       [Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-       [], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-          echo ' yes '
-          echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-       :
-      else
-       can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-       if test "$lt_cv_prog_gnu_ld" = yes; then
-               version_type=linux # correct to gnu/linux during the next big refactor
-       else
-               version_type=irix
-       fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-        LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-        [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-       shlibpath_overrides_runpath=no
-       ;;
-      *)
-       shlibpath_overrides_runpath=yes
-       ;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-       ;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-       case $deplibs_check_method in
-       "file_magic "*)
-         file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-         MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-         if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-           $EGREP "$file_magic_regex" > /dev/null; then
-           :
-         else
-           cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-         fi ;;
-       esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-        [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-       [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-       ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-       test "$with_gnu_ld" != no && break
-       ;;
-      *)
-       test "$with_gnu_ld" != yes && break
-       ;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-_LT_PATH_LD_GNU
-AC_SUBST([LD])
-
-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-])# LT_PATH_LD
-
-# Old names:
-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_LD], [])
-dnl AC_DEFUN([AC_PROG_LD], [])
-
-
-# _LT_PATH_LD_GNU
-#- --------------
-m4_defun([_LT_PATH_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# _LT_PATH_LD_GNU
-
-
-# _LT_CMD_RELOAD
-# --------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-m4_defun([_LT_CMD_RELOAD],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
-# _LT_CHECK_MAGIC_METHOD
-# ----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_MAGIC_METHOD],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-AC_CACHE_CHECK([how to recognize dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[[4-9]]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[[45]]*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-       # Check to see if the nm accepts a BSD-compat flag.
-       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-       #   nm: unknown option "B" ignored
-       # Tru64's nm complains that /dev/null is an invalid object file
-       case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-       */dev/null* | *'Invalid file or object type'*)
-         lt_cv_path_NM="$tmp_nm -B"
-         break
-         ;;
-       *)
-         case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-         */dev/null*)
-           lt_cv_path_NM="$tmp_nm -p"
-           break
-           ;;
-         *)
-           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-           continue # so that we can try to find one that supports BSD flags
-           ;;
-         esac
-         ;;
-       esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-       [Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[    ]]\($symcode$symcode*\)[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-       mv -f "$nlist"T "$nlist"
-      else
-       rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-       if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-         cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-         # Now generate the symbol file.
-         eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-         cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-         $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-         cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-         # Now try linking the two files.
-         mv conftest.$ac_objext conftstm.$ac_objext
-         lt_globsym_save_LIBS=$LIBS
-         lt_globsym_save_CFLAGS=$CFLAGS
-         LIBS="conftstm.$ac_objext"
-         CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-         if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-           pipe_works=yes
-         fi
-         LIBS=$lt_globsym_save_LIBS
-         CFLAGS=$lt_globsym_save_CFLAGS
-       else
-         echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-       fi
-      else
-       echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-       # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
-         # AIX 5 now supports IA64 processor
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       else
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-       fi
-       ;;
-      chorus*)
-       case $cc_basename in
-       cxch68*)
-         # Green Hills C++ Compiler
-         # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-         ;;
-       esac
-       ;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       m4_if([$1], [GCJ], [],
-         [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
-      dgux*)
-       case $cc_basename in
-         ec++*)
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           ;;
-         ghcx*)
-           # Green Hills C++ Compiler
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      freebsd* | dragonfly*)
-       # FreeBSD uses GNU C++
-       ;;
-      hpux9* | hpux10* | hpux11*)
-       case $cc_basename in
-         CC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-           if test "$host_cpu" != ia64; then
-             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-           fi
-           ;;
-         aCC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-           case $host_cpu in
-           hppa*64*|ia64*)
-             # +Z the default
-             ;;
-           *)
-             _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-             ;;
-           esac
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      interix*)
-       # This is c89, which is MS Visual C++ (no shared libs)
-       # Anyone wants to do a port?
-       ;;
-      irix5* | irix6* | nonstopux*)
-       case $cc_basename in
-         CC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           # CC pic flag -KPIC is the default.
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
-         KCC*)
-           # KAI C++ Compiler
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-           ;;
-         ecpc* )
-           # old Intel C++ for x86_64 which still supported -KPIC.
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;;
-         icpc* )
-           # Intel C++, used to be incompatible with GCC.
-           # ICC 10 doesn't accept -KPIC any more.
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-           ;;
-         pgCC* | pgcpp*)
-           # Portland Group C++ compiler
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-         cxx*)
-           # Compaq C++
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           ;;
-         xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-           # IBM XL 8.0, 9.0 on PPC and BlueGene
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-           ;;
-         *)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*)
-             # Sun C++ 5.9
-             _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-             _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-             _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-             ;;
-           esac
-           ;;
-       esac
-       ;;
-      lynxos*)
-       ;;
-      m88k*)
-       ;;
-      mvs*)
-       case $cc_basename in
-         cxx*)
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      netbsd*)
-       ;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-       case $cc_basename in
-         KCC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           ;;
-         RCC*)
-           # Rational C++ 2.4.1
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         cxx*)
-           # Digital/Compaq C++
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           # Make sure the PIC flag is empty.  It appears that all Alpha
-           # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      psos*)
-       ;;
-      solaris*)
-       case $cc_basename in
-         CC* | sunCC*)
-           # Sun C++ 4.2, 5.x and Centerline C++
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-           ;;
-         gcx*)
-           # Green Hills C++ Compiler
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      sunos4*)
-       case $cc_basename in
-         CC*)
-           # Sun C++ 4.x
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-         lcc*)
-           # Lucid
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-       case $cc_basename in
-         CC*)
-           _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           ;;
-       esac
-       ;;
-      tandem*)
-       case $cc_basename in
-         NCC*)
-           # NonStop-UX NCC 3.20
-           _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           ;;
-         *)
-           ;;
-       esac
-       ;;
-      vxworks*)
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-       ;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-       # +Z the default
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       ;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-       # AIX 5 now supports IA64 processor
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-       [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-       # +Z the default
-       ;;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-       ;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-       ;;
-      nagfor*)
-       # NAG Fortran compiler
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       ;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-       # which looks to be a dead project)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-       # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-       ;;
-      *)
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-         # Sun Fortran 8.3 passes all unrecognized flags to the linker
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-         ;;
-       *Sun\ F* | *Sun*Fortran*)
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-         ;;
-       *Sun\ C*)
-         # Sun C 5.9
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         ;;
-        *Intel*\ [[CF]]*Compiler*)
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-         ;;
-       *Portland\ Group*)
-         _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-         _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-         _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-         ;;
-       esac
-       ;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-       [Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-       [How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-       [Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-       # The AIX port of GNU ld has always aspired to compatibility
-       # with the native linker.  However, as the warning in the GNU ld
-       # block says, versions before 2.19.5* couldn't really create working
-       # shared libraries, regardless of the interface used.
-       case `$LD -v 2>&1` in
-         *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-         *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-         *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-         *)
-           lt_use_gnu_ld_interface=yes
-           ;;
-       esac
-       ;;
-      *)
-       lt_use_gnu_ld_interface=yes
-       ;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-       # support --undefined.  This deserves some investigation.  FIXME
-       _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-       # If the export-symbols file already is a .def file (1st line
-       # is EXPORTS), use it as is; otherwise, prepend...
-       _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname.def;
-       else
-         echo EXPORTS > $output_objdir/$soname.def;
-         cat $export_symbols >> $output_objdir/$soname.def;
-       fi~
-       $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-       case $cc_basename in
-         diet\ *) tmp_diet=yes;;       # linux-dietlibc with static linking (!diet-dyn)
-       esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-        && test "$tmp_diet" = no
-      then
-       tmp_addflag=' $pic_flag'
-       tmp_sharedflag='-shared'
-       case $cc_basename,$host_cpu in
-        pgcc*)                         # Portland Group C compiler
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag'
-         ;;
-       pgf77* | pgf90* | pgf95* | pgfortran*)
-                                       # Portland Group f77 and f90 compilers
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         tmp_addflag=' $pic_flag -Mnomain' ;;
-       ecc*,ia64* | icc*,ia64*)        # Intel C compiler on ia64
-         tmp_addflag=' -i_dynamic' ;;
-       efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
-         tmp_addflag=' -i_dynamic -nofor_main' ;;
-       ifc* | ifort*)                  # Intel Fortran compiler
-         tmp_addflag=' -nofor_main' ;;
-       lf95*)                          # Lahey Fortran 8.1
-         _LT_TAGVAR(whole_archive_flag_spec, $1)=
-         tmp_sharedflag='--shared' ;;
-       xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-         tmp_sharedflag='-qmkshrobj'
-         tmp_addflag= ;;
-       nvcc*)  # Cuda Compiler Driver 2.2
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         _LT_TAGVAR(compiler_needs_object, $1)=yes
-         ;;
-       esac
-       case `$CC -V 2>&1 | sed 5q` in
-       *Sun\ C*)                       # Sun C 5.9
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-         _LT_TAGVAR(compiler_needs_object, $1)=yes
-         tmp_sharedflag='-G' ;;
-       *Sun\ F*)                       # Sun Fortran 8.3
-         tmp_sharedflag='-G' ;;
-       esac
-       _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-           cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-           echo "local: *; };" >> $output_objdir/$libname.ver~
-           $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-       case $cc_basename in
-       xlf* | bgf* | bgxlf* | mpixlf*)
-         # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-         _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-         if test "x$supports_anon_versioning" = xyes; then
-           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-             echo "local: *; };" >> $output_objdir/$libname.ver~
-             $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-         fi
-         ;;
-       esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-       wlarc=
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-       ;;
-       *)
-         # For security reasons, it is highly recommended that you always
-         # use absolute paths for naming shared libraries, and exclude the
-         # DT_RUNPATH tag from executables and libraries.  But doing so
-         # requires that you compile everything twice, which is a pain.
-         if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-         else
-           _LT_TAGVAR(ld_shlibs, $1)=no
-         fi
-       ;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-       # Neither direct hardcoding nor static linking is supported with a
-       # broken collect2.
-       _LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-       aix_use_runtimelinking=no
-       exp_sym_flag='-Bexport'
-       no_entry_flag=""
-      else
-       # If we're using GNU nm, then we don't want the "-C" option.
-       # -C means demangle to AIX nm, but means don't demangle with GNU nm
-       # Also, AIX nm treats weak defined symbols like other global
-       # defined symbols, whereas GNU nm marks them as "W".
-       if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-         _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-       else
-         _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-       fi
-       aix_use_runtimelinking=no
-
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
-       case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-         for ld_flag in $LDFLAGS; do
-         if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-           aix_use_runtimelinking=yes
-           break
-         fi
-         done
-         ;;
-       esac
-
-       exp_sym_flag='-bexport'
-       no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-       case $host_os in aix4.[[012]]|aix4.[[012]].*)
-       # We only want to do this on AIX 4.2 and lower, the check
-       # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" &&
-          strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-         then
-         # We have reworked collect2
-         :
-         else
-         # We have old collect2
-         _LT_TAGVAR(hardcode_direct, $1)=unsupported
-         # It fails to find uninstalled libraries when the uninstalled
-         # path is not listed in the libpath.  Setting hardcode_minus_L
-         # to unsupported forces relinking
-         _LT_TAGVAR(hardcode_minus_L, $1)=yes
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=
-         fi
-         ;;
-       esac
-       shared_flag='-shared'
-       if test "$aix_use_runtimelinking" = yes; then
-         shared_flag="$shared_flag "'${wl}-G'
-       fi
-      else
-       # not using gcc
-       if test "$host_cpu" = ia64; then
-       # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-       # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-       else
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag='${wl}-G'
-         else
-           shared_flag='${wl}-bM:SRE'
-         fi
-       fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-       # Warning - without using the other runtime loading flags (-brtl),
-       # -berok will link without error, but may produce a broken library.
-       _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-       if test "$host_cpu" = ia64; then
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-         _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-       else
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-         # Warning - without using the other run time loading flags,
-         # -berok will link without error, but may produce a broken library.
-         _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-         _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-         if test "$with_gnu_ld" = yes; then
-           # We only use this code for GNU lds that support --whole-archive.
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-         else
-           # Exported symbols can be pulled into shared objects from archives
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-         fi
-         _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-         # This is similar to how AIX traditionally builds its shared libraries.
-         _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-       # Native MSVC
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_TAGVAR(always_export_symbols, $1)=yes
-       _LT_TAGVAR(file_list_spec, $1)='@'
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
-       shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-       _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-           sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-         else
-           sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-         fi~
-         $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-         linknames='
-       # The linker will not automatically build a static lib if we build a DLL.
-       # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-       # Don't use ranlib
-       _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-       _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-         lt_tool_outputfile="@TOOL_OUTPUT@"~
-         case $lt_outputfile in
-           *.exe|*.EXE) ;;
-           *)
-             lt_outputfile="$lt_outputfile.exe"
-             lt_tool_outputfile="$lt_tool_outputfile.exe"
-             ;;
-         esac~
-         if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-           $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-           $RM "$lt_outputfile.manifest";
-         fi'
-       ;;
-      *)
-       # Assume MSVC wrapper
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
-       shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-       # The linker will automatically build a .lib file if we build a DLL.
-       _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-       # FIXME: Should let the user specify the lib program.
-       _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       ;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       # hardcode_minus_L: Not really in the search PATH,
-       # but as the default location of the library.
-       _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-       case $host_cpu in
-       hppa*64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       esac
-      else
-       case $host_cpu in
-       hppa*64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       ia64*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-       m4_if($1, [], [
-         # Older versions of the 11.00 compiler do not understand -b yet
-         # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-         _LT_LINKER_OPTION([if $CC understands -b],
-           _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-           [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-           [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-         [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-         ;;
-       esac
-      fi
-      if test "$with_gnu_ld" = no; then
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-       case $host_cpu in
-       hppa*64*|ia64*)
-         _LT_TAGVAR(hardcode_direct, $1)=no
-         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-         ;;
-       *)
-         _LT_TAGVAR(hardcode_direct, $1)=yes
-         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         _LT_TAGVAR(hardcode_minus_L, $1)=yes
-         ;;
-       esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       # Try to use the -exported_symbol ld option, if it does not
-       # work, assume that -exports_file does not work either and
-       # implicitly export all symbols.
-       # This should be the same for all languages, so no per-tag cache variable.
-       AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-         [lt_cv_irix_exported_symbol],
-         [save_LDFLAGS="$LDFLAGS"
-          LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-          AC_LINK_IFELSE(
-            [AC_LANG_SOURCE(
-               [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-                             [C++], [[int foo (void) { return 0; }]],
-                             [Fortran 77], [[
-      subroutine foo
-      end]],
-                             [Fortran], [[
-      subroutine foo
-      end]])])],
-             [lt_cv_irix_exported_symbol=yes],
-             [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-       if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-       fi
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-       _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
-         case $host_os in
-          openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-            _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-            ;;
-          *)
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-            ;;
-         esac
-       fi
-      else
-       _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)     # as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-       _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-       $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-       # Both c and cxx compiler support -rpath directly
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-       wlarc='${wl}'
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-       case `$CC -V 2>&1` in
-       *"Compilers 5.0"*)
-         wlarc=''
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-         ;;
-       *)
-         wlarc='${wl}'
-         _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-         $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-         ;;
-       esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-       # The compiler driver will combine and reorder linker options,
-       # but understands `-z linker_flag'.  GCC discards it without `$wl',
-       # but is careful enough not to reorder.
-       # Supported since Solaris 2.6 (maybe 2.5.1?)
-       if test "$GCC" = yes; then
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-       else
-         _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-       fi
-       ;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-       # Use $CC to link under sequent, because it throws in some extra .o
-       # files that make .init and .fini sections work.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-       sni)
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-       ;;
-       siemens)
-         ## LD is ld it makes a PLAMLIB
-         ## CC just makes a GrossModule.
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-         _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-       motorola)
-         _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-         _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-       ;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-       _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       runpath_var=LD_RUN_PATH
-       hardcode_runpath_var=yes
-       _LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-       _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-       ;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-       [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-       [$RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-         deplibs=
-         wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-         pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-         output_objdir=.
-         libname=conftest
-         lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-         _LT_TAGVAR(allow_undefined_flag, $1)=
-         if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-         then
-           lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-         else
-           lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-         fi
-         _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-       else
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
-       ])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-         $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-           for ld_flag in $LDFLAGS; do
-             case $ld_flag in
-             *-brtl*)
-               aix_use_runtimelinking=yes
-               break
-               ;;
-             esac
-           done
-           ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-         collect2name=`${CC} -print-prog-name=collect2`
-         if test -f "$collect2name" &&
-            strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-         then
-           # We have reworked collect2
-           :
-         else
-           # We have old collect2
-           _LT_TAGVAR(hardcode_direct, $1)=unsupported
-           # It fails to find uninstalled libraries when the uninstalled
-           # path is not listed in the libpath.  Setting hardcode_minus_L
-           # to unsupported forces relinking
-           _LT_TAGVAR(hardcode_minus_L, $1)=yes
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-           _LT_TAGVAR(hardcode_libdir_separator, $1)=
-         fi
-          esac
-          shared_flag='-shared'
-         if test "$aix_use_runtimelinking" = yes; then
-           shared_flag="$shared_flag "'${wl}-G'
-         fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-         # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-         # chokes on -Wl,-G. The following line is correct:
-         shared_flag='-G'
-          else
-           if test "$aix_use_runtimelinking" = yes; then
-             shared_flag='${wl}-G'
-           else
-             shared_flag='${wl}-bM:SRE'
-           fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-       # export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-           _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-           # Determine the default libpath from the value encoded in an
-           # empty executable.
-           _LT_SYS_MODULE_PATH_AIX([$1])
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-           # Warning - without using the other run time loading flags,
-           # -berok will link without error, but may produce a broken library.
-           _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-           _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-           if test "$with_gnu_ld" = yes; then
-             # We only use this code for GNU lds that support --whole-archive.
-             _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-           else
-             # Exported symbols can be pulled into shared objects from archives
-             _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-           fi
-           _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-           # This is similar to how AIX traditionally builds its shared
-           # libraries.
-           _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-         # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-         # support --undefined.  This deserves some investigation.  FIXME
-         _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       else
-         _LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-         # FIXME: insert proper C++ library support
-         _LT_TAGVAR(ld_shlibs, $1)=no
-         ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-       case $GXX,$cc_basename in
-       ,cl* | no,cl*)
-         # Native MSVC
-         # hardcode_libdir_flag_spec is actually meaningless, as there is
-         # no search path for DLLs.
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-         _LT_TAGVAR(always_export_symbols, $1)=yes
-         _LT_TAGVAR(file_list_spec, $1)='@'
-         # Tell ltmain to make .lib files, not .a files.
-         libext=lib
-         # Tell ltmain to make .dll files, not .so files.
-         shrext_cmds=".dll"
-         # FIXME: Setting linknames here is a bad hack.
-         _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-         _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-             $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-           else
-             $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-           fi~
-           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-           linknames='
-         # The linker will not automatically build a static lib if we build a DLL.
-         # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-         # Don't use ranlib
-         _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-         _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-           lt_tool_outputfile="@TOOL_OUTPUT@"~
-           case $lt_outputfile in
-             *.exe|*.EXE) ;;
-             *)
-               lt_outputfile="$lt_outputfile.exe"
-               lt_tool_outputfile="$lt_tool_outputfile.exe"
-               ;;
-           esac~
-           func_to_tool_file "$lt_outputfile"~
-           if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-             $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-             $RM "$lt_outputfile.manifest";
-           fi'
-         ;;
-       *)
-         # g++
-         # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-         # as there is no search path for DLLs.
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-         _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-         _LT_TAGVAR(always_export_symbols, $1)=no
-         _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-         if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-           # If the export-symbols file already is a .def file (1st line
-           # is EXPORTS), use it as is; otherwise, prepend...
-           _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-             cp $export_symbols $output_objdir/$soname.def;
-           else
-             echo EXPORTS > $output_objdir/$soname.def;
-             cat $export_symbols >> $output_objdir/$soname.def;
-           fi~
-           $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-         else
-           _LT_TAGVAR(ld_shlibs, $1)=no
-         fi
-         ;;
-       esac
-       ;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-       ;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          ghcx*)
-           # Green Hills C++ Compiler
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-       # switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-                                            # but as the default
-                                            # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-             _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-                                                # but as the default
-                                                # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          aCC*)
-           case $host_cpu in
-             hppa*64*)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-               ;;
-             ia64*)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-               ;;
-             *)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-               ;;
-           esac
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           #
-           # There doesn't appear to be a way to prevent this compiler from
-           # explicitly linking system object files so we need to strip them
-           # from the output so that they don't get included in the library
-           # dependencies.
-           output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-           ;;
-          *)
-           if test "$GXX" = yes; then
-             if test $with_gnu_ld = no; then
-               case $host_cpu in
-                 hppa*64*)
-                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                   ;;
-                 ia64*)
-                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                   ;;
-                 *)
-                   _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-                   ;;
-               esac
-             fi
-           else
-             # FIXME: insert proper C++ library support
-             _LT_TAGVAR(ld_shlibs, $1)=no
-           fi
-           ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-       _LT_TAGVAR(hardcode_direct, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-       # Instead, shared libraries are loaded at an image base (0x10000000 by
-       # default) and relocated if they conflict, which is a slow very memory
-       # consuming and fragmenting process.  To avoid this, we pick a random,
-       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-           # SGI C++
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-           # Archives containing C++ object files must be created using
-           # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-           # necessary to make sure instantiated templates are included
-           # in the archive.
-           _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-           ;;
-          *)
-           if test "$GXX" = yes; then
-             if test "$with_gnu_ld" = no; then
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-             else
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-             fi
-           fi
-           _LT_TAGVAR(link_all_deplibs, $1)=yes
-           ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-        case $cc_basename in
-          KCC*)
-           # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-           # KCC will only create a shared library if the output file
-           # ends with ".so" (or ".sl" for HP-UX), so rename the library
-           # to its proper name (with version) after linking.
-           _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           #
-           # There doesn't appear to be a way to prevent this compiler from
-           # explicitly linking system object files so we need to strip them
-           # from the output so that they don't get included in the library
-           # dependencies.
-           output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-           # Archives containing C++ object files must be created using
-           # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-           _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-           ;;
-         icpc* | ecpc* )
-           # Intel C++
-           with_gnu_ld=yes
-           # version 8.0 and above of icpc choke on multiply defined symbols
-           # if we add $predep_objects and $postdep_objects, however 7.1 and
-           # earlier do not add the objects themselves.
-           case `$CC -V 2>&1` in
-             *"Version 7."*)
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-               ;;
-             *)  # Version 8.0 or newer
-               tmp_idyn=
-               case $host_cpu in
-                 ia64*) tmp_idyn=' -i_dynamic';;
-               esac
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-               ;;
-           esac
-           _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-           ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-           case `$CC -V` in
-           *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-             _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-             _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-               $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-               $RANLIB $oldlib'
-             _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-             _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-               rm -rf $tpldir~
-               $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-               $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-             ;;
-           *) # Version 6 and above use weak symbols
-             _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-             ;;
-           esac
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-         cxx*)
-           # Compaq C++
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-           runpath_var=LD_RUN_PATH
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           #
-           # There doesn't appear to be a way to prevent this compiler from
-           # explicitly linking system object files so we need to strip them
-           # from the output so that they don't get included in the library
-           # dependencies.
-           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-           ;;
-         xl* | mpixl* | bgxl*)
-           # IBM XL 8.0 on PPC, with GNU ld
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-           _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-           if test "x$supports_anon_versioning" = xyes; then
-             _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-               cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-               echo "local: *; };" >> $output_objdir/$libname.ver~
-               $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-           fi
-           ;;
-         *)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*)
-             # Sun C++ 5.9
-             _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-             _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-             _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-             _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-             _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-             # Not sure whether something based on
-             # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-             # would be better.
-             output_verbose_link_cmd='func_echo_all'
-
-             # Archives containing C++ object files must be created using
-             # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-             # necessary to make sure instantiated templates are included
-             # in the archive.
-             _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-             ;;
-           esac
-           ;;
-       esac
-       ;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-         *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-       esac
-       ;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-         _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-         wlarc=
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-         _LT_TAGVAR(hardcode_direct, $1)=yes
-         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       fi
-       # Workaround some broken pre-1.5 toolchains
-       output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-       ;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-       ;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-
-      openbsd*)
-       if test -f /usr/libexec/ld.so; then
-         _LT_TAGVAR(hardcode_direct, $1)=yes
-         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-         _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-         if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-           _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-           _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-         fi
-         output_verbose_link_cmd=func_echo_all
-       else
-         _LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-           # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-           # KCC will only create a shared library if the output file
-           # ends with ".so" (or ".sl" for HP-UX), so rename the library
-           # to its proper name (with version) after linking.
-           _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-           # Archives containing C++ object files must be created using
-           # the KAI C++ compiler.
-           case $host in
-             osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-             *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-           esac
-           ;;
-          RCC*)
-           # Rational C++ 2.4.1
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          cxx*)
-           case $host in
-             osf3*)
-               _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-               ;;
-             *)
-               _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-                 echo "-hidden">> $lib.exp~
-                 $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-                 $RM $lib.exp'
-               _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-               ;;
-           esac
-
-           _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-           # Commands to make compiler produce verbose output that lists
-           # what "hidden" libraries, object files and flags are used when
-           # linking a shared library.
-           #
-           # There doesn't appear to be a way to prevent this compiler from
-           # explicitly linking system object files so we need to strip them
-           # from the output so that they don't get included in the library
-           # dependencies.
-           output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-           ;;
-         *)
-           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-             _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-             case $host in
-               osf3*)
-                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-                 ;;
-               *)
-                 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-                 ;;
-             esac
-
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-             _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-             # Commands to make compiler produce verbose output that lists
-             # what "hidden" libraries, object files and flags are used when
-             # linking a shared library.
-             output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-           else
-             # FIXME: insert proper C++ library support
-             _LT_TAGVAR(ld_shlibs, $1)=no
-           fi
-           ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-           # Sun C++ 4.x
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          lcc*)
-           # Lucid
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-           # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-           _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-           _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-             $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-           _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-           case $host_os in
-             solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-             *)
-               # The compiler driver will combine and reorder linker options,
-               # but understands `-z linker_flag'.
-               # Supported since Solaris 2.6 (maybe 2.5.1?)
-               _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-               ;;
-           esac
-           _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-           output_verbose_link_cmd='func_echo_all'
-
-           # Archives containing C++ object files must be created using
-           # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-           # necessary to make sure instantiated templates are included
-           # in the archive.
-           _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-           ;;
-          gcx*)
-           # Green Hills C++ Compiler
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-           # The C++ compiler must be used to create the archive.
-           _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-           ;;
-          *)
-           # GNU C++ compiler with Solaris linker
-           if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-             _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-             if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-               _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                 $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-               # Commands to make compiler produce verbose output that lists
-               # what "hidden" libraries, object files and flags are used when
-               # linking a shared library.
-               output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-             else
-               # g++ 2.7 appears to require `-G' NOT `-shared' on this
-               # platform.
-               _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-               _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-                 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-               # Commands to make compiler produce verbose output that lists
-               # what "hidden" libraries, object files and flags are used when
-               # linking a shared library.
-               output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-             fi
-
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-             case $host_os in
-               solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-               *)
-                 _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-                 ;;
-             esac
-           fi
-           ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-       *)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-         ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-       # Note: We can NOT use -z defs as we might desire, because we do not
-       # link with -lc, and that would cause any symbols used from libc to
-       # always be unresolved, which means just about no library would
-       # ever link correctly.  If we're not using GNU ld we use -z text
-       # though, which does catch some bad symbols but isn't as heavy-handed
-       # as -z defs.
-       _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-       _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-       _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-       runpath_var='LD_RUN_PATH'
-
-       case $cc_basename in
-          CC*)
-           _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-             '"$_LT_TAGVAR(old_archive_cmds, $1)"
-           _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-             '"$_LT_TAGVAR(reload_cmds, $1)"
-           ;;
-         *)
-           _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-           ;;
-       esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-           # NonStop-UX NCC 3.20
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-          *)
-           # FIXME: insert proper C++ library support
-           _LT_TAGVAR(ld_shlibs, $1)=no
-           ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-        prev=$p
-        continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-        case ${prev} in
-        -L | -R)
-          # Internal compiler library paths should come after those
-          # provided the user.  The postdeps already come after the
-          # user supplied libs so there is no need to process them.
-          if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-            _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-          else
-            _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-          fi
-          ;;
-        # The "-l" case would never come before the object being
-        # linked, so don't bother handling this case.
-        esac
-       else
-        if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-          _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-        else
-          _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-        fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-        pre_test_object_deps_done=yes
-        continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-        if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-          _LT_TAGVAR(predep_objects, $1)="$p"
-        else
-          _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-        fi
-       else
-        if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-          _LT_TAGVAR(postdep_objects, $1)="$p"
-        else
-          _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-        fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-       if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-         test "$enable_shared" = yes && enable_static=no
-       fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-       if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-         test "$enable_shared" = yes && enable_static=no
-       fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([    ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
deleted file mode 100644 (file)
index 5d9acd8..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-           [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-                     [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-                  [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-       [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_shared=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-       [Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-       [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_static=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-       [Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-       IFS="$lt_save_ifs"
-       if test "X$pkg" = "X$p"; then
-         enable_fast_install=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-        [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-       [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-       IFS="$lt_save_ifs"
-       if test "X$lt_pkg" = "X$lt_p"; then
-         pic_mode=yes
-       fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-                [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-                [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-                [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-                [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-                [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
deleted file mode 100644 (file)
index 9000a05..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-          m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-            [m4_foreach([_Lt_suffix],
-               ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-       [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-         [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-                [lt_append([$1], [$2], [$3])$4],
-                [$5])],
-         [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-       m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-       [$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-                     [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
deleted file mode 100644 (file)
index 07a8602..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers                      -*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
deleted file mode 100644 (file)
index c573da9..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],  [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],             [AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],        [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],         [AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],    [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],           [AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],             [AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],    [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],           [AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],       [AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],               [AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],        [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],    [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],    [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],         [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],            [AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],  [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],             [AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],            [AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],    [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],   [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],          [AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],            [AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],           [AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],  [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],    [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],          [AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],          [AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],                [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],     [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],          [AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],   [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],           [AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],           [AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],           [AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],  [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],      [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],    [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],    [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],        [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],    [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],     [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],         [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],       [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],        [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],                [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],        [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],   [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],              [AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],               [AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],              [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644 (file)
index 0000000..b127cf1
--- /dev/null
@@ -0,0 +1,2 @@
+systemd.special.7.in
+systemd.special.html.in
diff --git a/man/Makefile b/man/Makefile
new file mode 120000 (symlink)
index 0000000..bd10475
--- /dev/null
@@ -0,0 +1 @@
+../src/Makefile
\ No newline at end of file
diff --git a/man/binfmt.d.5 b/man/binfmt.d.5
deleted file mode 100644 (file)
index 600a6de..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-'\" t
-.\"     Title: binfmt.d
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: binfmt.d
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "BINFMT\&.D" "5" "02/15/2012" "systemd" "binfmt.d"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-binfmt.d \- Configure additional binary formats at boot
-.SH "SYNOPSIS"
-.PP
-/usr/lib/binfmt\&.d/*\&.conf
-.PP
-/etc/binfmt\&.d/*\&.conf
-.PP
-/run/binfmt\&.d/*\&.conf
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\fR
-uses files from the above directories to configure additional binary formats to register during boot in the kernel\&.
-.SH "CONFIGURATION FORMAT"
-.PP
-Each file contains a list of binfmt_misc kernel binary format rules\&. Consult
-\m[blue]\fBbinfmt_misc\&.txt\fR\m[]\&\s-2\u[1]\d\s+2
-for more information on registration of additional binary formats and how to write rules\&.
-.PP
-Empty lines and lines beginning with ; and # are ignored\&. Note that this means you may not use ; and # as delimiter in binary format rules\&.
-.PP
-Each configuration file is named in the style of
-<program>\&.conf\&. Files in
-/etc/
-overwrite files with the same name in
-/usr/lib/\&. Files in
-/run
-overwrite files with the same name in
-/etc/
-and
-/usr/lib/\&. Packages should install their configuration files in
-/usr/lib/, files in
-/etc/
-are reserved for the local administration, which possibly decides to overwrite the configurations installed from packages\&. All files are sorted by filename in alphabetical order, regardless in which of the directories they reside, to ensure that a specific configuration file takes precedence over another file with an alphabetically later name\&.
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&/etc/binfmt.d/wine.conf example:\fR
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-# Start WINE on Windows executables
-:DOSWin:M::MZ::/usr/bin/wine:
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBwine\fR(8)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-binfmt_misc.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/binfmt_misc.txt
-.RE
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
deleted file mode 100644 (file)
index 2d2f458..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
-
-<!-- Switch things to UTF-8, ISO-8859-1 is soo yesteryear -->
-<xsl:output method="html" encoding="UTF-8" indent="no"/>
-
-</xsl:stylesheet>
diff --git a/man/daemon.7 b/man/daemon.7
deleted file mode 100644 (file)
index 5faf5f5..0000000
+++ /dev/null
@@ -1,787 +0,0 @@
-'\" t
-.\"     Title: daemon
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: daemon
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "DAEMON" "7" "02/15/2012" "systemd" "daemon"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-daemon \- Writing and Packaging System Daemons
-.SH "DESCRIPTION"
-.PP
-A daemon is a service process that runs in the background and supervises the system or provides functionality to other processes\&. Traditionally, daemons are implemented following a scheme originating in SysV Unix\&. Modern daemons should follow a simpler yet more powerful scheme (here called "new\-style" daemons), as implemented by
-\fBsystemd\fR(1)\&. This manual page covers both schemes, and in particular includes recommendations for daemons that shall be included in the systemd init system\&.
-.SS "SysV Daemons"
-.PP
-When a traditional SysV daemon starts, it should execute the following steps as part of the initialization\&. Note that these steps are unnecessary for new\-style daemons (see below), and should only be implemented if compatibility with SysV is essential\&.
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-Close all open file descriptors except STDIN, STDOUT, STDERR (i\&.e\&. the first three file descriptors 0, 1, 2)\&. This ensures that no accidentally passed file descriptor stays around in the daemon process\&. On Linux this is best implemented by iterating through
-/proc/self/fd, with a fallback of iterating from file descriptor 3 to the value returned by
-\fBgetrlimit()\fR
-for RLIMIT_NOFILE\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-Reset all signal handlers to their default\&. This is best done by iterating through the available signals up to the limit of _NSIG and resetting them to SIG_DFL\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-Reset the signal mask using
-\fBsigprocmask()\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 4.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  4." 4.2
-.\}
-Sanitize the environment block, removing or resetting environment variables that might negatively impact daemon runtime\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 5.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  5." 4.2
-.\}
-Call
-\fBfork()\fR, to create a background process\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 6.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  6." 4.2
-.\}
-In the child, call
-\fBsetsid()\fR
-to detach from any terminal and create an independent session\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 7.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  7." 4.2
-.\}
-In the child, call
-\fBfork()\fR
-again, to ensure the daemon can never re\-acquire a terminal again\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 8.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  8." 4.2
-.\}
-Call
-\fBexit()\fR
-in the first child, so that only the second child (the actual daemon process) stays around\&. This ensures that the daemon process is reparented to init/PID 1, as all daemons should be\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 9.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  9." 4.2
-.\}
-In the daemon process, connect
-/dev/null
-to STDIN, STDOUT, STDERR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'10.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "10." 4.2
-.\}
-In the daemon process, reset the umask to 0, so that the file modes passed to
-\fBopen()\fR,
-\fBmkdir()\fR
-and suchlike directly control the access mode of the created files and directories\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'11.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "11." 4.2
-.\}
-In the daemon process, change the current directory to the root directory (/), in order to avoid that the daemon involuntarily blocks mount points from being unmounted\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'12.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "12." 4.2
-.\}
-In the daemon process, write the daemon PID (as returned by
-\fBgetpid()\fR) to a PID file, for example
-/var/run/foobar\&.pid
-(for a hypothetical daemon "foobar"), to ensure that the daemon cannot be started more than once\&. This must be implemented in race\-free fashion so that the PID file is only updated when at the same time it is verified that the PID previously stored in the PID file no longer exists or belongs to a foreign process\&. Commonly some kind of file locking is employed to implement this logic\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'13.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "13." 4.2
-.\}
-In the daemon process, drop privileges, if possible and applicable\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'14.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "14." 4.2
-.\}
-From the daemon process notify the original process started that initialization is complete\&. This can be implemented via an unnamed pipe or similar communication channel that is created before the first
-\fBfork()\fR
-and hence available in both the original and the daemon process\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'15.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "15." 4.2
-.\}
-Call
-\fBexit()\fR
-in the original process\&. The process that invoked the daemon must be able to rely that this
-\fBexit()\fR
-happens after initialization is complete and all external communication channels established and accessible\&.
-.RE
-.PP
-The BSD
-\fBdaemon()\fR
-function should not be used, as it implements only a subset of these steps\&.
-.PP
-A daemon that needs to provide compatibility with SysV systems should implement the scheme pointed out above\&. However, it is recommended to make this behaviour optional and configurable via a command line argument, to ease debugging as well as to simplify integration into systems using systemd\&.
-.SS "New\-Style Daemons"
-.PP
-Modern services for Linux should be implemented as new\-style daemons\&. This makes it easier to supervise and control them at runtime and simplifies their implementation\&.
-.PP
-For developing a new\-style daemon none of the initialization steps recommended for SysV daemons need to be implemented\&. New\-style init systems such as systemd make all of them redundant\&. Moreover, since some of these steps interfere with process monitoring, file descriptor passing and other functionality of the init system it is recommended not to execute them when run as new\-style service\&.
-.PP
-Note that new\-style init systems guarantee execution of daemon processes in clean process contexts: it is guaranteed that the environment block is sanitized, that the signal handlers and mask is reset and that no left\-over file descriptors are passed\&. Daemons will be executed in their own session, and STDIN/STDOUT/STDERR connected to
-/dev/null
-unless otherwise configured\&. The umask is reset\&.
-.PP
-It is recommended for new\-style daemons to implement the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-If SIGTERM is received, shut down the daemon and exit cleanly\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-If SIGHUP is received, reload the configuration files, if this applies\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-Provide a correct exit code from the main daemon process, as this is used by the init system to detect service errors and problems\&. It is recommended to follow the exit code scheme as defined in the
-\m[blue]\fBLSB recommendations for SysV init scripts\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 4.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  4." 4.2
-.\}
-If possible and applicable expose the daemon\*(Aqs control interface via the D\-Bus IPC system and grab a bus name as last step of initialization\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 5.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  5." 4.2
-.\}
-For integration in systemd, provide a
-\&.service
-unit file that carries information about starting, stopping and otherwise maintaining the daemon\&. See
-\fBsystemd.service\fR(5)
-for details\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 6.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  6." 4.2
-.\}
-As much as possible, rely on the init systemd\*(Aqs functionality to limit the access of the daemon to files, services and other resources\&. i\&.e\&. in the case of systemd, rely on systemd\*(Aqs resource limit control instead of implementing your own, rely on systemd\*(Aqs privilege dropping code instead of implementing it in the daemon, and similar\&. See
-\fBsystemd.exec\fR(5)
-for the available controls\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 7.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  7." 4.2
-.\}
-If D\-Bus is used, make your daemon bus\-activatable, via supplying a D\-Bus service activation configuration file\&. This has multiple advantages: your daemon may be started lazily on\-demand; it may be started in parallel to other daemons requiring it \-\- which maximizes parallelization and boot\-up speed; your daemon can be restarted on failure, without losing any bus requests, as the bus queues requests for activatable services\&. See below for details\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 8.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  8." 4.2
-.\}
-If your daemon provides services to other local processes or remote clients via a socket, it should be made socket\-activatable following the scheme pointed out below\&. Like D\-Bus activation this enables on\-demand starting of services as well as it allows improved parallelization of service start\-up\&. Also, for state\-less protocols (such as syslog, DNS) a daemon implementing socket\-based activation can be restarted without losing a single request\&. See below for details\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 9.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  9." 4.2
-.\}
-If applicable a daemon should notify the init system about startup completion or status updates via the
-\fBsd_notify\fR(3)
-interface\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'10.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "10." 4.2
-.\}
-Instead of using the
-\fBsyslog()\fR
-call to log directly to the system syslog service, a new\-style daemon may choose to simply log to STDERR via
-\fBfprintf()\fR, which is then forwarded to syslog by the init system\&. If log priorities are necessary these can be encoded by prefixing individual log lines with strings like "<4>" (for log priority 4 "WARNING" in the syslog priority scheme), following a similar style as the Linux kernel\*(Aqs
-\fBprintk()\fR
-priority system\&. In fact, using this style of logging also enables the init system to optionally direct all application logging to the kernel log buffer (kmsg), as accessible via
-\fBdmesg\fR(1)\&. This kind of logging may be enabled by setting
-\fIStandardError=syslog\fR
-in the service unit file\&. For details see
-\fBsd-daemon\fR(7)
-and
-\fBsystemd.exec\fR(5)\&.
-.RE
-.PP
-These recommendations are similar but not identical to the
-\m[blue]\fBApple MacOS X Daemon Requirements\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.SH "ACTIVATION"
-.PP
-New\-style init systems provide multiple additional mechanisms to activate services, as detailed below\&. It is common that services are configured to be activated via more than one mechanism at the same time\&. An example for systemd:
-bluetoothd\&.service
-might get activated either when Bluetooth hardware is plugged in, or when an application accesses its programming interfaces via D\-Bus\&. Or, a print server daemon might get activated when traffic arrives at an IPP port, or when a printer is plugged in, or when a file is queued in the printer spool directory\&. Even for services that are intended to be started on system bootup unconditionally it is a good idea to implement some of the various activation schemes outlined below, in order to maximize parallelization: if a daemon implements a D\-Bus service or listening socket, implementing the full bus and socket activation scheme allows starting of the daemon with its clients in parallel (which speeds up boot\-up), since all its communication channels are established already, and no request is lost because client requests will be queued by the bus system (in case of D\-Bus) or the kernel (in case of sockets), until the activation is completed\&.
-.SS "Activation on Boot"
-.PP
-Old\-style daemons are usually activated exclusively on boot (and manually by the administrator) via SysV init scripts, as detailed in the
-\m[blue]\fBLSB Linux Standard Base Core Specification\fR\m[]\&\s-2\u[1]\d\s+2\&. This method of activation is supported ubiquitously on Linux init systems, both old\-style and new\-style systems\&. Among other issues SysV init scripts have the disadvantage of involving shell scripts in the boot process\&. New\-style init systems generally employ updated versions of activation, both during boot\-up and during runtime and using more minimal service description files\&.
-.PP
-In systemd, if the developer or administrator wants to make sure a service or other unit is activated automatically on boot it is recommended to place a symlink to the unit file in the
-\&.wants/
-directory of either
-multi\-user\&.target
-or
-graphical\&.target, which are normally used as boot targets at system startup\&. See
-\fBsystemd.unit\fR(5)
-for details about the
-\&.wants/
-directories, and
-\fBsystemd.special\fR(7)
-for details about the two boot targets\&.
-.SS "Socket\-Based Activation"
-.PP
-In order to maximize the possible parallelization and robustness and simplify configuration and development, it is recommended for all new\-style daemons that communicate via listening sockets to employ socket\-based activation\&. In a socket\-based activation scheme the creation and binding of the listening socket as primary communication channel of daemons to local (and sometimes remote) clients is moved out of the daemon code and into the init system\&. Based on per\-daemon configuration the init system installs the sockets and then hands them off to the spawned process as soon as the respective daemon is to be started\&. Optionally activation of the service can be delayed until the first inbound traffic arrives at the socket, to implement on\-demand activation of daemons\&. However, the primary advantage of this scheme is that all providers and all consumers of the sockets can be started in parallel as soon as all sockets are established\&. In addition to that daemons can be restarted with losing only a minimal number of client transactions or even any client request at all (the latter is particularly true for state\-less protocols, such as DNS or syslog), because the socket stays bound and accessible during the restart, and all requests are queued while the daemon cannot process them\&.
-.PP
-New\-style daemons which support socket activation must be able to receive their sockets from the init system, instead of of creating and binding them themselves\&. For details about the programming interfaces for this scheme provided by systemd see
-\fBsd_listen_fds\fR(3)
-and
-\fBsd-daemon\fR(7)\&. For details about porting existing daemons to socket\-based activation see below\&. With minimal effort it is possible to implement socket\-based activation in addition to traditional internal socket creation in the same codebase in order to support both new\-style and old\-style init systems from the same daemon binary\&.
-.PP
-systemd implements socket\-based activation via
-\&.socket
-units, which are described in
-\fBsystemd.socket\fR(5)\&. When configuring socket units for socket\-based activation it is essential that all listening sockets are pulled in by the special target unit
-sockets\&.target\&. It is recommended to place a
-\fIWantedBy=sockets\&.target\fR
-directive in the
-[Install]
-section, to automatically add such a dependency on installation of a socket unit\&. Unless
-\fIDefaultDependencies=no\fR
-is set the necessary ordering dependencies are implicitly created for all socket units\&. For more information about
-sockets\&.target
-see
-\fBsystemd.special\fR(7)\&. It is not necessary or recommended to place any additional dependencies on socket units (for example from
-multi\-user\&.target
-or suchlike) when one is installed in
-sockets\&.target\&.
-.SS "Bus\-Based Activation"
-.PP
-When the D\-Bus IPC system is used for communication with clients, new\-style daemons should employ bus activation so that they are automatically activated when a client application accesses their IPC interfaces\&. This is configured in D\-Bus service files (not to be confused with systemd service unit files!)\&. To ensure that D\-Bus uses systemd to start\-up and maintain the daemon use the
-\fISystemdService=\fR
-directive in these service files, to configure the matching systemd service for a D\-Bus service\&. e\&.g\&.: for a D\-Bus service whose D\-Bus activation file is named
-org\&.freedesktop\&.RealtimeKit\&.service, make sure to set
-\fISystemdService=rtkit\-daemon\&.service\fR
-in that file, to bind it to the systemd service
-rtkit\-daemon\&.service\&. This is needed to make sure that the daemon is started in a race\-free fashion when activated via multiple mechanisms simultaneously\&.
-.SS "Device\-Based Activation"
-.PP
-Often, daemons that manage a particular type of hardware should be activated only when the hardware of the respective kind is plugged in or otherwise becomes available\&. In a new\-style init system it is possible to bind activation to hardware plug/unplug events\&. In systemd, kernel devices appearing in the sysfs/udev device tree can be exposed as units if they are tagged with the string "systemd"\&. Like any other kind of unit they may then pull in other units when activated (i\&.e\&. Plugged in) and thus implement device\-based activation\&. Systemd dependencies may be encoded in the udev database via the
-\fISYSTEMD_WANTS=\fR
-property\&. See
-\fBsystemd.device\fR(5)
-for details\&. Often it is nicer to pull in services from devices only indirectly via dedicated targets\&. Example: instead of pulling in
-bluetoothd\&.service
-from all the various bluetooth dongles and other hardware available, pull in bluetooth\&.target from them and
-bluetoothd\&.service
-from that target\&. This provides for nicer abstraction and gives administrators the option to enable
-bluetoothd\&.service
-via controlling a
-bluetooth\&.target\&.wants/
-symlink uniformly with a command like
-\fBenable\fR
-of
-\fBsystemctl\fR(1)
-instead of manipulating the udev ruleset\&.
-.SS "Path\-Based Activation"
-.PP
-Often, runtime of daemons processing spool files or directories (such as a printing system) can be delayed until these file system objects change state, or become non\-empty\&. New\-style init systems provide a way to bind service activation to file system changes\&. systemd implements this scheme via path\-based activation configured in
-\&.path
-units, as outlined in
-\fBsystemd.path\fR(5)\&.
-.SS "Timer\-Based Activation"
-.PP
-Some daemons that implement clean\-up jobs that are intended to be executed in regular intervals benefit from timer\-based activation\&. In systemd, this is implemented via
-\&.timer
-units, as described in
-\fBsystemd.timer\fR(5)\&.
-.SS "Other Forms of Activation"
-.PP
-Other forms of activation have been suggested and implemented in some systems\&. However, often there are simpler or better alternatives, or they can be put together of combinations of the schemes above\&. Example: sometimes it appears useful to start daemons or
-\&.socket
-units when a specific IP address is configured on a network interface, because network sockets shall be bound to the address\&. However, an alternative to implement this is by utilizing the Linux IP_FREEBIND socket option, as accessible via
-\fIFreeBind=yes\fR
-in systemd socket files (see
-\fBsystemd.socket\fR(5)
-for details)\&. This option, when enabled, allows sockets to be bound to a non\-local, not configured IP address, and hence allows bindings to a particular IP address before it actually becomes available, making such an explicit dependency to the configured address redundant\&. Another often suggested trigger for service activation is low system load\&. However, here too, a more convincing approach might be to make proper use of features of the operating system: in particular, the CPU or IO scheduler of Linux\&. Instead of scheduling jobs from userspace based on monitoring the OS scheduler, it is advisable to leave the scheduling of processes to the OS scheduler itself\&. systemd provides fine\-grained access to the CPU and IO schedulers\&. If a process executed by the init system shall not negatively impact the amount of CPU or IO bandwidth available to other processes, it should be configured with
-\fICPUSchedulingPolicy=idle\fR
-and/or
-\fIIOSchedulingClass=idle\fR\&. Optionally, this may be combined with timer\-based activation to schedule background jobs during runtime and with minimal impact on the system, and remove it from the boot phase itself\&.
-.SH "INTEGRATION WITH SYSTEMD"
-.SS "Writing Systemd Unit Files"
-.PP
-When writing systemd unit files, it is recommended to consider the following suggestions:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-If possible do not use the
-\fIType=forking\fR
-setting in service files\&. But if you do, make sure to set the PID file path using
-\fIPIDFile=\fR\&. See
-\fBsystemd.service\fR(5)
-for details\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-If your daemon registers a D\-Bus name on the bus, make sure to use
-\fIType=dbus\fR
-in the service file if possible\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-Make sure to set a good human\-readable description string with
-\fIDescription=\fR\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 4.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  4." 4.2
-.\}
-Do not disable
-\fIDefaultDependencies=\fR, unless you really know what you do and your unit is involved in early boot or late system shutdown\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 5.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  5." 4.2
-.\}
-Normally, little if any dependencies should need to be defined explicitly\&. However, if you do configure explicit dependencies, only refer to unit names listed on
-\fBsystemd.special\fR(7)
-or names introduced by your own package to keep the unit file operating system\-independent\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 6.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  6." 4.2
-.\}
-Make sure to include an
-[Install]
-section including installation information for the unit file\&. See
-\fBsystemd.unit\fR(5)
-for details\&. To activate your service on boot make sure to add a
-\fIWantedBy=multi\-user\&.target\fR
-or
-\fIWantedBy=graphical\&.target\fR
-directive\&. To activate your socket on boot, make sure to add
-\fIWantedBy=sockets\&.target\fR\&. Usually you also want to make sure that when your service is installed your socket is installed too, hence add
-\fIAlso=foo\&.socket\fR
-in your service file
-foo\&.service, for a hypothetical program
-foo\&.
-.RE
-.SS "Installing Systemd Service Files"
-.PP
-At the build installation time (e\&.g\&.
-\fBmake install\fR
-during package build) packages are recommended to install their systemd unit files in the directory returned by
-\fBpkg\-config systemd \-\-variable=systemdsystemunitdir\fR
-(for system services), resp\&.
-\fBpkg\-config systemd \-\-variable=systemduserunitdir\fR
-(for user services)\&. This will make the services available in the system on explicit request but not activate them automatically during boot\&. Optionally, during package installation (e\&.g\&.
-\fBrpm \-i\fR
-by the administrator) symlinks should be created in the systemd configuration directories via the
-\fBenable\fR
-command of the
-\fBsystemctl\fR(1)
-tool, to activate them automatically on boot\&.
-.PP
-Packages using
-\fBautoconf\fR(1)
-are recommended to use a configure script excerpt like the following to determine the unit installation path during source configuration:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-PKG_PROG_PKG_CONFIG
-AC_ARG_WITH([systemdsystemunitdir],
-        AS_HELP_STRING([\-\-with\-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-        [], [with_systemdsystemunitdir=$($PKG_CONFIG \-\-variable=systemdsystemunitdir systemd)])
-if test "x$with_systemdsystemunitdir" != xno; then
-        AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-AM_CONDITIONAL(HAVE_SYSTEMD, [test \-n "$with_systemdsystemunitdir" \-a "x$with_systemdsystemunitdir" != xno ])
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-This snippet allows automatic installation of the unit files on systemd machines, and optionally allows their installation even on machines lacking systemd\&. (Modification of this snippet for the user unit directory is left as an exercise for the reader\&.)
-.PP
-Additionally, to ensure that
-\fBmake distcheck\fR
-continues to work, it is recommended to add the following to the top\-level
-Makefile\&.am
-file in
-\fBautomake\fR(1)\-based projects:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-DISTCHECK_CONFIGURE_FLAGS = \e
-        \-\-with\-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Finally, unit files should be installed in the system with an automake excerpt like the following:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-if HAVE_SYSTEMD
-systemdsystemunit_DATA = \e
-        foobar\&.socket \e
-        foobar\&.service
-endif
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-In the
-\fBrpm\fR(8)
-\&.spec
-file use a snippet like the following to enable/disable the service during installation/deinstallation\&. Consult the packaging guidelines of your distribution for details and the equivalent for other package managers:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-%post
-if [ $1 \-eq 1 ]; then
-        # On install (not upgrade), enable (but don\*(Aqt start) the
-        # units by default
-        /bin/systemctl enable foobar\&.service foobar\&.socket >/dev/null 2>&1 || :
-
-        # Alternatively, just call
-        # /bin/systemctl daemon\-reload >/dev/null 2>&1 || :
-        # here, if the daemon should not be enabled by default on
-        # installation
-fi
-
-%preun
-if [ $1 \-eq 0 ]; then
-        # On uninstall (not upgrade), disable and stop the units
-        /bin/systemctl \-\-no\-reload disable foobar\&.service foobar\&.socket >/dev/null 2>&1 || :
-        /bin/systemctl stop foobar\&.service foobar\&.socket >/dev/null 2>&1 || :
-fi
-
-%postun
-# Reload init system configuration, to make systemd honour changed
-# or deleted unit files
-/bin/systemctl daemon\-reload >/dev/null 2>&1 || :
-if [ $1 \-ge 1 ] ; then
-        # On upgrade (not uninstall), optionally, restart the daemon
-        /bin/systemctl try\-restart foobar\&.service >/dev/null 2>&1 || :
-fi
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Depending on whether your service should or should not be started/stopped/restarted during package installation, deinstallation or upgrade, a different set of commands may be specified\&. See
-\fBsystemctl\fR(1)
-for details\&.
-.PP
-To facilitate upgrades from a package version that shipped only SysV init scripts to a package version that ships both a SysV init script and a native systemd service file, use a fragment like the following:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-%triggerun \-\- foobar < 0\&.47\&.11\-1
-if /sbin/chkconfig \-\-level 5 foobar ; then
-        /bin/systemctl \-\-no\-reload enable foobar\&.service foobar\&.socket >/dev/null 2>&1 || :
-fi
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-Where 0\&.47\&.11\-1 is the first package version that includes the native unit file\&. This fragment will ensure that the first time the unit file is installed it will be enabled if and only if the SysV init script is enabled, thus making sure that the enable status is not changed\&. Note that
-\fBchkconfig\fR
-is a command specific to Fedora which can be used to check whether a SysV init script is enabled\&. Other operating systems will have to use different commands here\&.
-.SH "PORTING EXISTING DAEMONS"
-.PP
-Since new\-style init systems such as systemd are compatible with traditional SysV init systems it is not strictly necessary to port existing daemons to the new style\&. However doing so offers additional functionality to the daemons as well as simplifying integration into new\-style init systems\&.
-.PP
-To port an existing SysV compatible daemon the following steps are recommended:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-If not already implemented, add an optional command line switch to the daemon to disable daemonization\&. This is useful not only for using the daemon in new\-style init systems, but also to ease debugging\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-If the daemon offers interfaces to other software running on the local system via local AF_UNIX sockets, consider implementing socket\-based activation (see above)\&. Usually a minimal patch is sufficient to implement this: Extend the socket creation in the daemon code so that
-\fBsd_listen_fds\fR(3)
-is checked for already passed sockets first\&. If sockets are passed (i\&.e\&. when
-\fBsd_listen_fds()\fR
-returns a positive value), skip the socket creation step and use the passed sockets\&. Secondly, ensure that the file\-system socket nodes for local AF_UNIX sockets used in the socket\-based activation are not removed when the daemon shuts down, if sockets have been passed\&. Third, if the daemon normally closes all remaining open file descriptors as part of its initialization, the sockets passed from the init system must be spared\&. Since new\-style init systems guarantee that no left\-over file descriptors are passed to executed processes, it might be a good choice to simply skip the closing of all remaining open file descriptors if sockets are passed\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-Write and install a systemd unit file for the service (and the sockets if socket\-based activation is used, as well as a path unit file, if the daemon processes a spool directory), see above for details\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 4.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  4." 4.2
-.\}
-If the daemon exposes interfaces via D\-Bus, write and install a D\-Bus activation file for the service, see above for details\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-daemon\fR(7),
-\fBsd_listen_fds\fR(3),
-\fBsd_notify\fR(3),
-\fBdaemon\fR(3),
-\fBsystemd.service\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-LSB recommendations for SysV init scripts
-.RS 4
-\%http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
-.RE
-.IP " 2." 4
-Apple MacOS X Daemon Requirements
-.RS 4
-\%http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPSystemStartup/Articles/LaunchOnDemandDaemons.html#//apple_ref/doc/uid/TP40001762-104738
-.RE
diff --git a/man/halt.8 b/man/halt.8
deleted file mode 100644 (file)
index cbe4eb3..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-'\" t
-.\"     Title: halt
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: halt
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "HALT" "8" "02/15/2012" "systemd" "halt"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-halt, poweroff, reboot \- Halt, power\-off or reboot the machine
-.SH "SYNOPSIS"
-.HP \w'\fBhalt\ \fR\fB[OPTIONS...]\fR\ 'u
-\fBhalt \fR\fB[OPTIONS...]\fR
-.HP \w'\fBpoweroff\ \fR\fB[OPTIONS...]\fR\ 'u
-\fBpoweroff \fR\fB[OPTIONS...]\fR
-.HP \w'\fBreboot\ \fR\fB[OPTIONS...]\fR\ 'u
-\fBreboot \fR\fB[OPTIONS...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBhalt\fR,
-\fBpoweroff\fR,
-\fBreboot\fR
-may be used to halt, power\-off or reboot the machine\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-halt\fR
-.RS 4
-Halt the machine, regardless which one of the three commands is invoked\&.
-.RE
-.PP
-\fB\-p\fR, \fB\-\-poweroff\fR
-.RS 4
-Power\-off the machine, regardless which one of the three commands is invoked\&.
-.RE
-.PP
-\fB\-\-reboot\fR
-.RS 4
-Reboot the machine, regardless which one of the three commands is invoked\&.
-.RE
-.PP
-\fB\-f\fR, \fB\-\-force\fR
-.RS 4
-Force immediate halt, power\-off, reboot\&. Don\*(Aqt contact the init system\&.
-.RE
-.PP
-\fB\-w\fR, \fB\-\-wtmp\-only\fR
-.RS 4
-Only write wtmp shutdown entry, don\*(Aqt actually halt, power\-off, reboot\&.
-.RE
-.PP
-\fB\-d\fR, \fB\-\-no\-wtmp\fR
-.RS 4
-Don\*(Aqt write wtmp shutdown entry\&.
-.RE
-.PP
-\fB\-n\fR, \fB\-\-no\-sync\fR
-.RS 4
-Don\*(Aqt sync hard disks/storage media before halt, power\-off, reboot\&.
-.RE
-.PP
-\fB\-\-no\-wall\fR
-.RS 4
-Don\*(Aqt send wall message before halt, power\-off, reboot\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "NOTES"
-.PP
-These are legacy commands available for compatibility only\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBshutdown\fR(8),
-\fBwall\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/hostname.5 b/man/hostname.5
deleted file mode 100644 (file)
index 35ef7f8..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-'\" t
-.\"     Title: hostname
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: /etc/hostname
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "HOSTNAME" "5" "02/15/2012" "systemd" "/etc/hostname"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-hostname \- Local host name configuration file
-.SH "SYNOPSIS"
-.PP
-/etc/hostname
-.SH "DESCRIPTION"
-.PP
-The
-/etc/hostname
-file configures the name of the local system that is set during boot, with the
-\fBsethostname\fR(2)
-system call\&. It should contain a single newline\-terminated host name string\&. The host name may be a free\-form string up to 64 characters in length, however it is recommended that it consists only of 7bit ASCII lower\-case characters and no spaces or dots, and limits itself to the format allowed for DNS domain name labels, even though this is not a strict requirement\&.
-.PP
-Depending on the operating system other configuration files might be checked for configuration of the host name as well, however only as fallback\&.
-.SH "HISTORY"
-.PP
-The simple configuration file format of
-/etc/hostname
-originates from Debian GNU/Linux\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsethostname\fR(2),
-\fBhostname\fR(1),
-\fBhostname\fR(7),
-\fBmachine-id\fR(5),
-\fBmachine-info\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 1acda1a..b8b05c8 100644 (file)
@@ -86,7 +86,7 @@
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>sethostname</refentrytitle><manvolnum>2</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                   </para>
diff --git a/man/init.1 b/man/init.1
deleted file mode 100644 (file)
index 166bbc2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man1/systemd.1
diff --git a/man/locale.conf.5 b/man/locale.conf.5
deleted file mode 100644 (file)
index 281baa7..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-'\" t
-.\"     Title: locale.conf
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: locale.conf
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "LOCALE\&.CONF" "5" "02/15/2012" "systemd" "locale.conf"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-locale.conf \- configuration file for locale settings
-.SH "SYNOPSIS"
-.PP
-/etc/locale\&.conf
-.SH "DESCRIPTION"
-.PP
-The
-/etc/locale\&.conf
-file configures system\-wide locale settings\&.
-.PP
-The basic file format of
-locale\&.conf
-is a newline\-separated list of environment\-like shell\-compatible variable assignments\&. It is possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported, allowing applications to read the file without implementing a shell compatible execution engine\&.
-.PP
-Note that the kernel command line options
-\fIlocale\&.LANG=\fR,
-\fIlocale\&.LANGUAGE=\fR,
-\fIlocale\&.LC_CTYPE=\fR,
-\fIlocale\&.LC_NUMERIC=\fR,
-\fIlocale\&.LC_TIME=\fR,
-\fIlocale\&.LC_COLLATE=\fR,
-\fIlocale\&.LC_MONETARY=\fR,
-\fIlocale\&.LC_MESSAGES=\fR,
-\fIlocale\&.LC_PAPER=\fR,
-\fIlocale\&.LC_NAME=\fR,
-\fIlocale\&.LC_ADDRESS=\fR,
-\fIlocale\&.LC_TELEPHONE=\fR,
-\fIlocale\&.LC_MEASUREMENT=\fR,
-\fIlocale\&.LC_IDENTIFICATION=\fR
-may be used to override the locale settings at boot\&.
-.PP
-The locale settings configured in
-/etc/locale\&.conf
-are system\-wide and are inherited by every service or user, unless overridden or unset by individual programs or individual users\&.
-.PP
-Depending on the operating system other configuration files might be checked for locale configuration as well, however only as fallback\&.
-.SH "OPTIONS"
-.PP
-The following locale settings may be set using
-/etc/locale\&.conf:
-\fILANG=\fR,
-\fILANGUAGE=\fR,
-\fILC_CTYPE=\fR,
-\fILC_NUMERIC=\fR,
-\fILC_TIME=\fR,
-\fILC_COLLATE=\fR,
-\fILC_MONETARY=\fR,
-\fILC_MESSAGES=\fR,
-\fILC_PAPER=\fR,
-\fILC_NAME=\fR,
-\fILC_ADDRESS=\fR,
-\fILC_TELEPHONE=\fR,
-\fILC_MEASUREMENT=\fR,
-\fILC_IDENTIFICATION=\fR\&. Note that
-\fILC_ALL\fR
-may not be be configured in this file\&. For details about the meaning and semantics of these settings, refer to
-\fBlocale\fR(7)\&.
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&German locale with English messages\fR
-.PP
-/etc/locale\&.conf:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-LANG=de_DE\&.UTF\-8
-LC_MESSAGES=C
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBlocale\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/machine-id.5 b/man/machine-id.5
deleted file mode 100644 (file)
index 4c70542..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-'\" t
-.\"     Title: machine-id
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: /etc/machine-id
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "MACHINE\-ID" "5" "02/15/2012" "systemd" "/etc/machine-id"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-machine-id \- local machine ID configuration file
-.SH "SYNOPSIS"
-.PP
-/etc/machine\-id
-.SH "DESCRIPTION"
-.PP
-The
-/etc/machine\-id
-file contains the unique machine id of the local system that is set during installation\&. The machine ID is a single newline\-terminated, hexadecimal, lowercase 32 character machine ID string\&. (When decoded from hexadecimal this corresponds with a 16 byte/128 bit string\&.)
-.PP
-The machine ID is usually generated from a random source during system installation and stays constant for all subsequent boots\&. Optionally, for stateless systems it is generated during runtime at boot if it is found to be empty\&.
-.PP
-The machine ID does not change based on user configuration, or when hardware is replaced\&.
-.PP
-This machine ID adheres to the same format and logic as the D\-Bus machine ID\&.
-.PP
-Programs may use this ID to identify the host with a globally unique ID in the network, that does not change even if the local network configuration changes\&. Due to this and its greater length it is a more useful replacement for the
-\fBgethostid\fR(3)
-call POSIX specifies\&.
-.SH "RELATION TO OSF UUIDS"
-.PP
-Note that the machine ID historically is not an OSF UUID as defined by
-\m[blue]\fBRFC 4122\fR\m[]\&\s-2\u[1]\d\s+2, nor a Microsoft GUID\&. Starting with systemd v30 newly generated machine IDs however do qualify as v4 UUIDs\&.
-.PP
-In order to maintain compatibility with existing installations, an application requiring a UUID should decode the machine ID, and then apply the following operations to turn it into a valid OSF v4 UUID\&. With
-id
-being an unsigned character array:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-/* Set UUID version to 4 \-\-\- truly random generation */
-id[6] = (id[6] & 0x0F) | 0x40;
-/* Set the UUID variant to DCE */
-id[8] = (id[8] & 0x3F) | 0x80;
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-(This code is inspired by
-generate_random_uuid()
-of
-drivers/char/random\&.c
-from the kernel sources\&.)
-.SH "HISTORY"
-.PP
-The simple configuration file format of
-/etc/machine\-id
-originates in the
-/var/lib/dbus/machine\-id
-file introduced by D\-Bus\&. In fact this latter file might be a symlink to
-\fI/etc/machine\-id\fR\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBgethostid\fR(3),
-\fBhostname\fR(5),
-\fBmachine-info\fR(5),
-\fBos-release\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-RFC 4122
-.RS 4
-\%http://tools.ietf.org/html/rfc4122
-.RE
diff --git a/man/machine-info.5 b/man/machine-info.5
deleted file mode 100644 (file)
index dc629ef..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-'\" t
-.\"     Title: machine-info
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: machine-info
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "MACHINE\-INFO" "5" "02/15/2012" "systemd" "machine-info"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-machine-info \- Local machine information file
-.SH "SYNOPSIS"
-.PP
-/etc/machine\-info
-.SH "DESCRIPTION"
-.PP
-The
-/etc/machine\-info
-file contains machine meta data\&.
-.PP
-The basic file format of
-machine\-info
-is a newline\-separated list of environment\-like shell\-compatible variable assignments\&. It is possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported, allowing applications to read the file without implementing a shell compatible execution engine\&.
-.PP
-/etc/machine\-info
-contains meta data about the machine that is set by the user or administrator\&.
-.PP
-Depending on the operating system other configuration files might be checked for machine information as well, however only as fallback\&.
-.SH "OPTIONS"
-.PP
-The following machine meta data parameters may be set using
-/etc/machine\-info:
-.PP
-\fIPRETTY_HOSTNAME=\fR
-.RS 4
-A pretty human\-readable UTF8 machine identifier string\&. This should contain a name like
-Lennart\*(Aqs Laptop
-which is useful to present to the user and does not suffer by the syntax limitations of internet domain names\&. If possible the internet host name as configured in
-/etc/hostname
-should be kept similar to this one\&. Example: if this value is
-Lennart\*(Aqs Computer
-an Internet host name of
-lennarts\-computer
-might be a good choice\&. If this parameter is not set an application should fall back to the Internet host name for presentation purposes\&.
-.RE
-.PP
-\fIICON_NAME=\fR
-.RS 4
-An icon identifying this machine according to the
-\m[blue]\fBXDG Icon Naming Specification\fR\m[]\&\s-2\u[1]\d\s+2\&. If this parameter is not set an application should fall back to
-computer
-or a similar icon name\&.
-.RE
-.SH "EXAMPLE"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-PRETTY_NAME="Lennart\*(Aqs Computer"
-ICON_NAME=computer\-laptop
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBos-release\fR(5),
-\fBhostname\fR(5),
-\fBmachine-id\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-XDG Icon Naming Specification
-.RS 4
-\%http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-.RE
diff --git a/man/modules-load.d.5 b/man/modules-load.d.5
deleted file mode 100644 (file)
index 51031e0..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-'\" t
-.\"     Title: modules-load.d
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: modules-load.d
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "MODULES\-LOAD\&.D" "5" "02/15/2012" "systemd" "modules-load.d"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-modules-load.d \- Configure kernel modules to load at boot
-.SH "SYNOPSIS"
-.PP
-/usr/lib/modules\-load\&.d/*\&.conf
-.PP
-/etc/modules\-load\&.d/*\&.conf
-.PP
-/run/modules\-load\&.d/*\&.conf
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\fR
-uses files from the above directories to configure kernel modules to load during boot in a static list\&. Each configuration file is named in the style of
-/etc/modules\-load\&.d/<program>\&.conf\&. Note that it is usually a better idea to use the automatic module loading by PCI ID, by DMI ID or similar triggers configured in the kernel modules themselves instead of relying on static configuration like this\&.
-.SH "CONFIGURATION FORMAT"
-.PP
-The configuration files should simply contain a list of kernel module names to load, separated by newlines\&. Empty lines and lines whose first non\-whitespace character is # or ; are ignored\&.
-.PP
-Each configuration file is named in the style of
-<program>\&.conf\&. Files in
-/etc/
-overwrite files with the same name in
-/usr/lib/\&. Files in
-/run
-overwrite files with the same name in
-/etc/
-and
-/usr/lib/\&. Packages should install their configuration files in
-/usr/lib/, files in
-/etc/
-are reserved for the local administration, which possibly decides to overwrite the configurations installed from packages\&. All files are sorted by filename in alphabetical order, regardless in which of the directories they reside, to ensure that a specific configuration file takes precedence over another file with an alphabetically later name\&.
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&/etc/modules-load.d/virtio-net.conf example:\fR
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-# Load virtio\-net\&.ko at boot
-virtio\-net
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBmodprobe\fR(8)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/os-release.5 b/man/os-release.5
deleted file mode 100644 (file)
index b400086..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-'\" t
-.\"     Title: os-release
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: os-release
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "OS\-RELEASE" "5" "02/15/2012" "systemd" "os-release"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-os-release \- Operating system identification
-.SH "SYNOPSIS"
-.PP
-/etc/os\-release
-.SH "DESCRIPTION"
-.PP
-The
-/etc/os\-release
-file contains operating system identification data\&.
-.PP
-The basic file format of
-os\-release
-is a newline\-separated list of environment\-like shell\-compatible variable assignments\&. It is possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported (this means variable expansion is explicitly not supported), allowing applications to read the file without implementing a shell compatible execution engine\&. Variable assignment values should be enclosed in double or single quotes if they include spaces, semicolons or other special characters outside of A\-Z, a\-z, 0\-9\&. All strings should be in UTF\-8 format, and non\-printable characters should not be used\&. If double or single quotes or backslashes are to be used within variable assignments they should be escaped with backslashes, following shell style\&. It is not supported to concatenate multiple individually quoted strings\&. Lines beginning with "#" shall be ignored as comments\&.
-.PP
-/etc/os\-release
-contains data that is defined by the operating system vendor and should not be changed by the administrator\&.
-.PP
-As this file only encodes names and identifiers it should not be localized\&.
-.PP
-For a longer rationale for
-/etc/os\-release
-please refer to the
-\m[blue]\fBAnnouncement of /etc/os\-release\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.SH "OPTIONS"
-.PP
-The following OS identifications parameters may be set using
-/etc/os\-release:
-.PP
-\fINAME=\fR
-.RS 4
-A string identifying the operating system, without a version component, and suitable for presentation to the user\&. If not set defaults to
-NAME=Linux\&. Example:
-NAME=Fedora
-or
-NAME="Debian GNU/Linux"\&.
-.RE
-.PP
-\fIVERSION=\fR
-.RS 4
-A string identifying the operating system version, excluding any OS name information, possibly including a release code name, and suitable for presentation to the user\&. This field is optional\&. Example:
-VERSION=17
-or
-VERSION="17 (Beefy Miracle)"\&.
-.RE
-.PP
-\fIID=\fR
-.RS 4
-A lower\-case string (no spaces or other characters outside of 0\-9, a\-z, "\&.", "_" and "\-") identifying the operating system, excluding any version information and suitable for processing by scripts or usage in generated file names\&. If not set defaults to
-ID=linux\&. Example:
-ID=fedora
-or
-ID=debian\&.
-.RE
-.PP
-\fIVERSION_ID=\fR
-.RS 4
-A lower\-case string (mostly numeric, no spaces or other characters outside of 0\-9, a\-z, "\&.", "_" and "\-") identifying the operating system version, excluding any OS name information or release code name, and suitable for processing by scripts or usage in generated file names\&. This field is optional\&. Example:
-VERSION_ID=17
-or
-VERSION_ID=11\&.04\&.
-.RE
-.PP
-\fIPRETTY_NAME=\fR
-.RS 4
-A pretty operating system name in a format suitable for presentation to the user\&. May or may not contain a release code name or OS version of some kind, as suitable\&. If not set defaults to
-PRETTY_NAME="Linux"\&. Example:
-PRETTY_NAME="Fedora 17 (Beefy Miracle)"\&.
-.RE
-.PP
-\fIANSI_COLOR=\fR
-.RS 4
-A suggested presentation color when showing the distribution name on the console\&. This should be specified as string suitable for inclusion in the ESC [ m ANSI/ECMA\-48 escape code for setting graphical rendition\&. This field is optional\&. Example:
-ANSI_COLOR="0;31"
-for red, or
-ANSI_COLOR="1;34"
-for light blue\&.
-.RE
-.PP
-\fICPE_NAME=\fR
-.RS 4
-A CPE name for the operating system, following the
-\m[blue]\fBCommon Platform Enumeration Specification\fR\m[]\&\s-2\u[2]\d\s+2
-as proposed by the MITRE Corporation\&. This field is optional\&. Example:
-CPE_NAME="cpe:/o:fedoraproject:fedora:17"
-.RE
-.PP
-If you are reading this file from C code or a shell script to determine the OS or a specific version of it, use the ID and VERSION_ID fields\&. When looking for an OS identification string for presentation to the user use the PRETTY_NAME field\&.
-.PP
-Note that operating system vendors may choose not to provide version information, for example to accommodate for rolling releases\&. In this case VERSION and VERSION_ID may be unset\&. Applications should not rely on these fields to be set\&.
-.SH "EXAMPLE"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-NAME=Fedora
-VERSION="17 (Beefy Miracle)"
-ID=fedora
-VERSION_ID=17
-PRETTY_NAME="Fedora 17 (Beefy Miracle)"
-ANSI_COLOR="0;34"
-CPE_NAME="cpe:/o:fedoraproject:fedora:17"
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBlsb_release\fR(1),
-\fBhostname\fR(5),
-\fBmachine-id\fR(5),
-\fBmachine-info\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-Announcement of /etc/os-release
-.RS 4
-\%http://0pointer.de/blog/projects/os-release
-.RE
-.IP " 2." 4
-Common Platform Enumeration Specification
-.RS 4
-\%http://cpe.mitre.org/specification/
-.RE
index 7d79972..f85119d 100644 (file)
                 contains operating system identification data.</para>
 
                 <para>The basic file format of
-                <filename>os-release</filename> is a newline-separated
-                list of environment-like shell-compatible variable
-                assignments. It is possible to source the
-                configuration from shell scripts, however, beyond mere
-                variable assignments no shell features are supported
-                (this means variable expansion is explicitly not
-                supported), allowing applications to read the file
-                without implementing a shell compatible execution
-                engine. Variable assignment values should be enclosed
-                in double or single quotes if they include spaces,
-                semicolons or other special characters outside of A-Z,
-                a-z, 0-9. All strings should be in UTF-8 format, and
-                non-printable characters should not be used. If double
-                or single quotes or backslashes are to be used within
-                variable assignments they should be escaped with
-                backslashes, following shell style. It is not
-                supported to concatenate multiple individually quoted
-                strings. Lines beginning with "#" shall be ignored as
-                comments.</para>
+                <filename>os-release</filename> is a
+                newline-separated list of environment-like
+                shell-compatible variable assignments. It is possible
+                to source the configuration from shell scripts,
+                however, beyond mere variable assignments no shell
+                features are supported, allowing applications to read
+                the file without implementing a shell compatible
+                execution engine.</para>
 
                 <para><filename>/etc/os-release</filename> contains
                 data that is defined by the operating system vendor
                 and should not be changed by the administrator.</para>
 
-                <para>As this file only encodes names and identifiers
-                it should not be localized.</para>
-
-                <para>For a longer rationale for
-                <filename>/etc/os-release</filename> please refer to
-                the <ulink
-                url="http://0pointer.de/blog/projects/os-release">Announcement of <filename>/etc/os-release</filename></ulink>.</para>
+                <para>Depending on the operating system other
+                configuration files might be checked for OS
+                identification as well, however only as
+                fallback.</para>
         </refsect1>
 
         <refsect1>
 
                                 <listitem><para>A string identifying
                                 the operating system, without a
-                                version component, and suitable for
-                                presentation to the user. If not set
-                                defaults to
-                                <literal>NAME=Linux</literal>. Example:
+                                version string, and not necessarily
+                                suitable for presentation to the
+                                user. If not set defaults to
+                                <literal>Linux</literal>. Example:
                                 <literal>NAME=Fedora</literal> or
                                 <literal>NAME="Debian
                                 GNU/Linux"</literal>.</para></listitem>
 
                                 <listitem><para>A string identifying
                                 the operating system version,
-                                excluding any OS name information,
-                                possibly including a release code
-                                name, and suitable for presentation to
-                                the user. This field is
-                                optional. Example:
-                                <literal>VERSION=17</literal> or
-                                <literal>VERSION="17 (Beefy
-                                Miracle)"</literal>.</para></listitem>
+                                excluding any name information and
+                                suitable for presentation to the
+                                user. Example:
+                                <literal>VERSION=15</literal> or
+                                <literal>VERSION="15
+                                (Rawhide)"</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><varname>ID=</varname></term>
 
                                 <listitem><para>A lower-case string
-                                (no spaces or other characters outside
-                                of 0-9, a-z, ".", "_" and "-")
-                                identifying the operating system,
-                                excluding any version information and
-                                suitable for processing by scripts or
-                                usage in generated file names. If not
-                                set defaults to
-                                <literal>ID=linux</literal>. Example:
-                                <literal>ID=fedora</literal> or
-                                <literal>ID=debian</literal>.</para></listitem>
+                                (no spaces) identifying the operating
+                                system, excluding any version
+                                information and suitable for
+                                processing by scripts or usage in
+                                generated file names. If not set
+                                defaults to
+                                <literal>linux</literal>. Example:
+                                <literal>ID=fedora</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <term><varname>VERSION_ID=</varname></term>
 
                                 <listitem><para>A lower-case string
-                                (mostly numeric, no spaces or other
-                                characters outside of 0-9, a-z, ".",
-                                "_" and "-") identifying the operating
-                                system version, excluding any OS name
-                                information or release code name, and
-                                suitable for processing by scripts or
-                                usage in generated file names. This
-                                field is optional. Example:
-                                <literal>VERSION_ID=17</literal> or
-                                <literal>VERSION_ID=11.04</literal>.</para></listitem>
+                                (mostly numeric, no spaces) identifying the
+                                operating system version, excluding
+                                any name information and suitable for
+                                processing by scripts or usage in generated file names. Example:
+                                <literal>VERSION_ID=15</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <listitem><para>A pretty operating
                                 system name in a format suitable for
                                 presentation to the user. May or may
-                                not contain a release code name or OS
-                                version of some kind, as suitable. If
-                                not set defaults to
-                                <literal>PRETTY_NAME="Linux"</literal>. Example:
-                                <literal>PRETTY_NAME="Fedora 17 (Beefy
-                                Miracle)"</literal>.</para></listitem>
+                                not contain an OS version of some
+                                kind, as suitable. If not set defaults
+                                to <literal>Linux</literal>. Example:
+                                <literal>PRETTY_NAME=Fedora 15
+                                (Rawhide)</literal>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 should be specified as string suitable
                                 for inclusion in the ESC [ m
                                 ANSI/ECMA-48 escape code for setting
-                                graphical rendition. This field is
-                                optional. Example:
-                                <literal>ANSI_COLOR="0;31"</literal>
-                                for red, or
-                                <literal>ANSI_COLOR="1;34"</literal>
-                                for light blue.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><varname>CPE_NAME=</varname></term>
-
-                                <listitem><para>A CPE name for the
-                                operating system, following the <ulink
-                                url="http://cpe.mitre.org/specification/">Common
-                                Platform Enumeration
-                                Specification</ulink> as proposed by
-                                the MITRE Corporation. This field
-                                is optional. Example:
-                                <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
-                                </para></listitem>
+                                graphical rendition. Example:
+                                <literal>ANSI_COLOR=0;31</literal> for
+                                red, or
+                                <literal>ANSI_COLOR=1;34</literal> for
+                                light blue.</para></listitem>
                         </varlistentry>
                 </variablelist>
 
-                <para>If you are reading this file from code or a
+                <para>If you are reading this file from code or a
                 shell script to determine the OS or a specific version
                 of it, use the ID and VERSION_ID fields. When looking
                 for an OS identification string for presentation to
                 <title>Example</title>
 
                 <programlisting>NAME=Fedora
-VERSION="17 (Beefy Miracle)"
+VERSION="15 (Rawhide)"
 ID=fedora
-VERSION_ID=17
-PRETTY_NAME="Fedora 17 (Beefy Miracle)"
-ANSI_COLOR="0;34"
-CPE_NAME="cpe:/o:fedoraproject:fedora:17"</programlisting>
+VERSION_ID=15
+PRETTY_NAME="Fedora 15 (Rawhide)"
+ANSI_COLOR=0;34</programlisting>
         </refsect1>
 
         <refsect1>
diff --git a/man/pam_systemd.8 b/man/pam_systemd.8
deleted file mode 100644 (file)
index 0c3da26..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-'\" t
-.\"     Title: pam_systemd
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: pam_systemd
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "PAM_SYSTEMD" "8" "02/15/2012" "systemd" "pam_systemd"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-pam_systemd \- Register user sessions in the systemd control group hierarchy
-.SH "SYNOPSIS"
-.HP \w'\fBpam_systemd\&.so\fR\ 'u
-\fBpam_systemd\&.so\fR
-.SH "DESCRIPTION"
-.PP
-\fBpam_systemd\fR
-registers user sessions in the systemd control group hierarchy\&.
-.PP
-On login, this module ensures the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-If it does not exist yet, the user runtime directory
-/run/user/$USER
-is created and its ownership changed to the user that is logging in\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-The
-\fI$XDG_SESSION_ID\fR
-environment variable is initialized\&. If auditing is available and
-\fBpam_loginuid\&.so\fR
-run before this module (which is highly recommended), the variable is initialized from the auditing session id (/proc/self/sessionid)\&. Otherwise an independent session counter is used\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-A new control group
-/user/$USER/$XDG_SESSION_ID
-is created and the login process moved into it\&.
-.RE
-.PP
-On logout, this module ensures the following:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-If
-\fI$XDG_SESSION_ID\fR
-is set and
-\fBkill\-session\-processes=1\fR
-specified, all remaining processes in the
-/user/$USER/$XDG_SESSION_ID
-control group are killed and the control group is removed\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-If last subgroup of the
-/user/$USER
-control group was removed the
-\fI$XDG_RUNTIME_DIR\fR
-directory and all its contents are removed, too\&.
-.RE
-.PP
-If the system was not booted up with systemd as init system, this module does nothing and immediately returns PAM_SUCCESS\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fBkill\-session\-processes=\fR
-.RS 4
-Takes a boolean argument\&. If true, all processes created by the user during his session and from his session will be terminated when he logs out from his session\&.
-.RE
-.PP
-\fBkill\-only\-users=\fR
-.RS 4
-Takes a comma separated list of user names or numeric user ids as argument\&. If this option is used the effect of the
-\fBkill\-session\-processes=\fR
-options will apply only to the listed users\&. If this option is not used the option applies to all local users\&. Note that
-\fBkill\-exclude\-users=\fR
-takes precedence over this list and is hence subtracted from the list specified here\&.
-.RE
-.PP
-\fBkill\-exclude\-users=\fR
-.RS 4
-Takes a comma separated list of user names or numeric user ids as argument\&. Users listed in this argument will not be subject to the effect of
-\fBkill\-session\-processes=\fR\&. Note that that this option takes precedence over
-\fBkill\-only\-users=\fR, and hence whatever is listed for
-\fBkill\-exclude\-users=\fR
-is guaranteed to never be killed by this PAM module, independent of any other configuration setting\&.
-.RE
-.PP
-\fBcontrollers=\fR
-.RS 4
-Takes a comma separated list of control group controllers in which hierarchies a user/session control group will be created by default for each user logging in, in addition to the control group in the named \*(Aqname=systemd\*(Aq hierarchy\&. If omitted, defaults to an empty list\&.
-.RE
-.PP
-\fBreset\-controllers=\fR
-.RS 4
-Takes a comma separated list of control group controllers in which hierarchies the logged in processes will be reset to the root control group\&.
-.RE
-.PP
-\fBdebug=\fR
-.RS 4
-Takes a boolean argument\&. If yes, the module will log debugging information as it operates\&.
-.RE
-.PP
-Note that setting
-\fIkill\-session\-processes=1\fR
-will break tools like
-\fBscreen\fR(1)\&.
-.PP
-Note that
-\fIkill\-session\-processes=1\fR
-is a stricter version of
-\fIKillUserProcesses=1\fR
-which may be configured system\-wide in
-\fBsystemd-logind.conf\fR(5)\&. The former kills processes of a session as soon as it ends, the latter kills processes as soon as the last session of the user ends\&.
-.PP
-If the options are omitted they default to
-\fBkill\-session\-processes=0\fR,
-\fBkill\-only\-users=\fR,
-\fBkill\-exclude\-users=\fR,
-\fBcontrollers=\fR,
-\fBreset\-controllers=\fR,
-\fBdebug=no\fR\&.
-.SH "MODULE TYPES PROVIDED"
-.PP
-Only
-\fBsession\fR
-is provided\&.
-.SH "ENVIRONMENT"
-.PP
-The following environment variables are set for the processes of the user\*(Aqs session:
-.PP
-\fI$XDG_SESSION_ID\fR
-.RS 4
-A session identifier, suitable to be used in file names\&. The string itself should be considered opaque, although often it is just the audit session ID as reported by
-/proc/self/sessionid\&. Each ID will be assigned only once during machine uptime\&. It may hence be used to uniquely label files or other resources of this session\&.
-.RE
-.PP
-\fI$XDG_RUNTIME_DIR\fR
-.RS 4
-Path to a user\-private user\-writable directory that is bound to the user login time on the machine\&. It is automatically created the first time a user logs in and removed on his final logout\&. If a user logs in twice at the same time, both sessions will see the same
-\fI$XDG_RUNTIME_DIR\fR
-and the same contents\&. If a user logs in once, then logs out again, and logs in again, the directory contents will have been lost in between, but applications should not rely on this behaviour and must be able to deal with stale files\&. To store session\-private data in this directory the user should include the value of
-\fI$XDG_SESSION_ID\fR
-in the filename\&. This directory shall be used for runtime file system objects such as AF_UNIX sockets, FIFOs, PID files and similar\&. It is guaranteed that this directory is local and offers the greatest possible file system feature set the operating system provides\&.
-.RE
-.SH "EXAMPLE"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-#%PAM\-1\&.0
-auth       required     pam_unix\&.so
-auth       required     pam_nologin\&.so
-account    required     pam_unix\&.so
-password   required     pam_unix\&.so
-session    required     pam_unix\&.so
-session    required     pam_loginuid\&.so
-session    required     pam_systemd\&.so kill\-session\-processes=1
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBpam.conf\fR(5),
-\fBpam.d\fR(5),
-\fBpam\fR(8),
-\fBpam_loginuid\fR(8),
-\fBsystemd-logind.conf\fR(5),
-\fBsystemd\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/poweroff.8 b/man/poweroff.8
deleted file mode 100644 (file)
index 41c02c1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/halt.8
diff --git a/man/reboot.8 b/man/reboot.8
deleted file mode 100644 (file)
index 41c02c1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man8/halt.8
diff --git a/man/runlevel.8 b/man/runlevel.8
deleted file mode 100644 (file)
index ba6ced7..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-'\" t
-.\"     Title: runlevel
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: runlevel
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "RUNLEVEL" "8" "02/15/2012" "systemd" "runlevel"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-runlevel \- Print previous and current SysV runlevel
-.SH "SYNOPSIS"
-.HP \w'\fBrunlevel\ \fR\fB[options...]\fR\ 'u
-\fBrunlevel \fR\fB[options...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBrunlevel\fR
-prints the previous and current SysV runlevel if they are known\&.
-.PP
-The two runlevel characters are separated by a single space character\&. If a runlevel cannot be determined, N is printed instead\&. If neither can be determined, the word "unknown" is printed\&.
-.PP
-Unless overridden in the environment, this will check the utmp database for recent runlevel changes\&.
-.SH "OPTIONS"
-.PP
-The following option is understood:
-.PP
-\fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-If one or both runlevels could be determined, 0 is returned, a non\-zero failure code otherwise\&.
-.SH "ENVIRONMENT"
-.PP
-\fI$RUNLEVEL\fR
-.RS 4
-If
-\fI$RUNLEVEL\fR
-is set,
-\fBrunlevel\fR
-will print this value as current runlevel and ignore utmp\&.
-.RE
-.PP
-\fI$PREVLEVEL\fR
-.RS 4
-If
-\fI$PREVLEVEL\fR
-is set
-\fBrunlevel\fR
-will print this value as previous runlevel and ignore utmp\&.
-.RE
-.SH "FILES"
-.PP
-\fI/var/run/utmp\fR
-.RS 4
-The utmp database
-\fBrunlevel\fR
-reads the previous and current runlevel from\&.
-.RE
-.SH "NOTES"
-.PP
-This is a legacy command available for compatibility only\&. It should not be used anymore, as the concept of runlevels is obsolete\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd-daemon.7 b/man/sd-daemon.7
deleted file mode 100644 (file)
index d1df345..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-'\" t
-.\"     Title: sd-daemon
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd-daemon
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD\-DAEMON" "7" "02/15/2012" "systemd" "sd-daemon"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd-daemon \- Reference implementation of APIs for new\-style daemons
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-daemon\&.h>
-.fi
-.ft
-.HP \w'\fBpkg\-config\ \-\-cflags\ \-\-libs\ libsystemd\-daemon\fR\ 'u
-\fBpkg\-config \-\-cflags \-\-libs libsystemd\-daemon\fR
-.SH "DESCRIPTION"
-.PP
-sd\-daemon\&.c
-and
-sd\-daemon\&.h
-provide a reference implementation of various APIs for new\-style daemons, as implemented by the
-\fBsystemd\fR(1)
-init system\&.
-.PP
-See
-\fBsd_listen_fds\fR(3),
-\fBsd_notify\fR(3),
-\fBsd_booted\fR(3),
-\fBsd_is_fifo\fR(3)
-for more information about the functions implemented\&. In addition to these functions a couple of logging prefixes are defined as macros:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-#define SD_EMERG   "<0>"  /* system is unusable */
-#define SD_ALERT   "<1>"  /* action must be taken immediately */
-#define SD_CRIT    "<2>"  /* critical conditions */
-#define SD_ERR     "<3>"  /* error conditions */
-#define SD_WARNING "<4>"  /* warning conditions */
-#define SD_NOTICE  "<5>"  /* normal but significant condition */
-#define SD_INFO    "<6>"  /* informational */
-#define SD_DEBUG   "<7>"  /* debug\-level messages */
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-These prefixes are intended to be used in conjunction with STDERR\-based logging as implemented by systemd\&. If a systemd service definition file is configured with
-\fIStandardError=syslog\fR
-or
-\fIStandardError=kmsg\fR
-these prefixes can be used to encode a log level in lines printed\&. This is similar to the kernel
-\fBprintk()\fR\-style logging\&. See
-\fBklogctl\fR(2)
-for more information\&.
-.PP
-The log levels are identical to
-\fBsyslog\fR(3)\*(Aqs log level system\&. To use these prefixes simply prefix every line with one of these strings\&. A line that is not prefixed will be logged at the default log level SD_INFO\&.
-.PP
-\fBExample\ \&1.\ \&Hello World\fR
-.PP
-A daemon may log with the log level NOTICE by issuing this call:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-fprintf(stderr, SD_NOTICE "Hello World!\en");
-.fi
-.if n \{\
-.RE
-.\}
-.SH "NOTES"
-.PP
-These interfaces are provided by the reference implementation of APIs for new\-style daemons and distributed with the systemd package\&. The algorithms they implement are simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&. See the respective function man pages for details\&.
-.PP
-In addition, for details about the algorithms check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h\fR\m[]
-.PP
-These APIs are implemented in the reference implementation\*(Aqs
-sd\-daemon\&.c
-and
-sd\-daemon\&.h
-files\&. These interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-daemon
-\fBpkg-config\fR(1)
-file\&. Alternatively, applications consuming these APIs may copy the implementation into their source tree, either verbatim or in excerpts\&.
-.PP
-The functions directly related to new\-style daemons become NOPs when \-DDISABLE_SYSTEMD is set during compilation and the reference implementation is used as drop\-in files\&. In addition, if
-sd\-daemon\&.c
-is compiled on non\-Linux systems they become NOPs\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd_listen_fds\fR(3),
-\fBsd_notify\fR(3),
-\fBsd_booted\fR(3),
-\fBsd_is_fifo\fR(3),
-\fBdaemon\fR(7),
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5),
-\fBfprintf\fR(3),
-\fBsd-readahead\fR(7),
-\fBpkg-config\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 4ea88e4..cd67d99 100644 (file)
@@ -50,7 +50,7 @@
 
         <refsynopsisdiv>
                 <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
+                        <funcsynopsisinfo>#include "sd-daemon.h"</funcsynopsisinfo>
                 </funcsynopsis>
 
                 <cmdsynopsis>
                 <para>In addition, for details about the algorithms
                 check the liberally licensed reference implementation
                 sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
-                resp. <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c"/>
+                resp. <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.h"/></para>
 
                 <para>These APIs are implemented in the reference
                 implementation's <filename>sd-daemon.c</filename> and
diff --git a/man/sd-login.7 b/man/sd-login.7
deleted file mode 100644 (file)
index b3b64c0..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-'\" t
-.\"     Title: sd-login
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd-login
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD\-LOGIN" "7" "02/15/2012" "systemd" "sd-login"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd-login \- APIs for tracking logins
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'\fBpkg\-config\ \-\-cflags\ \-\-libs\ libsystemd\-login\fR\ 'u
-\fBpkg\-config \-\-cflags \-\-libs libsystemd\-login\fR
-.SH "DESCRIPTION"
-.PP
-sd\-login\&.h
-provides APIs to introspect and monitor seat, login session and user status information on the local system\&.
-.PP
-See
-\m[blue]\fBMulti\-Seat on Linux\fR\m[]\&\s-2\u[1]\d\s+2
-for an introduction into multi\-seat support on Linux, the background for this set of APIs\&.
-.PP
-Note that these APIs only allow purely passive access and monitoring of seats, sessions and users\&. To actively make changes to the seat configuration, terminate login sessions, or switch session on a seat you need to utilize the D\-Bus API of systemd\-logind, instead\&.
-.PP
-These functions synchronously access data in
-/proc,
-/sys/fs/cgroup
-and
-/run\&. All of these are virtual file systems, hence the runtime cost of the accesses is relatively cheap\&.
-.PP
-It is possible (and often a very good choice) to mix calls to the synchronous interface of
-sd\-login\&.h
-with the asynchronous D\-Bus interface of systemd\-logind\&. However, if this is done you need to think a bit about possible races since the stream of events from D\-Bus and from
-sd\-login\&.h
-interfaces such as the login monitor are asynchronous and not ordered against each other\&.
-.PP
-If the functions return string arrays, these are generally NULL terminated and need to be freed by the caller with the libc
-\fBfree\fR(3)
-call after use, including the strings referenced therein\&. Similar, individual strings returned need to be freed, as well\&.
-.PP
-As a special exception, instead of an empty string array NULL may be returned, which should be treated equivalent to an empty string array\&.
-.PP
-See
-\fBsd_pid_get_session\fR(3),
-\fBsd_uid_get_state\fR(3),
-\fBsd_session_is_active\fR(3),
-\fBsd_seat_get_active\fR(3),
-\fBsd_get_seats\fR(3),
-\fBsd_login_monitor_new\fR(3)
-for more information about the functions implemented\&.
-.SH "NOTES"
-.PP
-These APIs are implemented as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd_pid_get_session\fR(3),
-\fBsd_uid_get_state\fR(3),
-\fBsd_session_is_active\fR(3),
-\fBsd_seat_get_active\fR(3),
-\fBsd_get_seats\fR(3),
-\fBsd_login_monitor_new\fR(3),
-\fBsd-daemon\fR(7),
-\fBsd-readahead\fR(7),
-\fBpkg-config\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-Multi-Seat on Linux
-.RS 4
-\%http://www.freedesktop.org/wiki/Software/systemd/multiseat
-.RE
diff --git a/man/sd-login.xml b/man/sd-login.xml
deleted file mode 100644 (file)
index 3fc0e16..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd-login">
-
-        <refentryinfo>
-                <title>sd-login</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd-login</refentrytitle>
-                <manvolnum>7</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd-login</refname>
-                <refpurpose>APIs for
-                tracking logins</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-                </funcsynopsis>
-
-                <cmdsynopsis>
-                        <command>pkg-config --cflags --libs libsystemd-login</command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><filename>sd-login.h</filename> provides APIs to
-                introspect and monitor seat, login session and user
-                status information on the local system. </para>
-
-                <para>See <ulink
-                url="http://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat
-                on Linux</ulink> for an introduction into multi-seat
-                support on Linux, the background for this set of APIs.</para>
-
-                <para>Note that these APIs only allow purely passive access
-                and monitoring of seats, sessions and users. To
-                actively make changes to the seat configuration,
-                terminate login sessions, or switch session on a seat
-                you need to utilize the D-Bus API of
-                systemd-logind, instead.</para>
-
-                <para>These functions synchronously access data in
-                <filename>/proc</filename>,
-                <filename>/sys/fs/cgroup</filename> and
-                <filename>/run</filename>. All of these are virtual
-                file systems, hence the runtime cost of the accesses
-                is relatively cheap.</para>
-
-                <para>It is possible (and often a very good choice) to
-                mix calls to the synchronous interface of
-                <filename>sd-login.h</filename> with the asynchronous
-                D-Bus interface of systemd-logind. However, if this is
-                done you need to think a bit about possible races
-                since the stream of events from D-Bus and from
-                <filename>sd-login.h</filename> interfaces such as the
-                login monitor are asynchronous and not ordered against
-                each other.</para>
-
-                <para>If the functions return string arrays, these are
-                generally NULL terminated and need to be freed by the
-                caller with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use, including the strings referenced
-                therein. Similar, individual strings returned need to
-                be freed, as well.</para>
-
-                <para>As a special exception, instead of an empty
-                string array NULL may be returned, which should be
-                treated equivalent to an empty string array.</para>
-
-                <para>See
-                <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>sd_uid_get_state</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>sd_seat_get_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                <citerefentry><refentrytitle>sd_login_monitor_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                for more information about the functions
-                implemented.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>These APIs are implemented as shared library,
-                which can be compiled and linked to with the
-                <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_uid_get_state</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_seat_get_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_login_monitor_new</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-daemon</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-readahead</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd-readahead.7 b/man/sd-readahead.7
deleted file mode 100644 (file)
index 0cc3914..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-'\" t
-.\"     Title: sd-readahead
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd-readahead
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD\-READAHEAD" "7" "02/15/2012" "systemd" "sd-readahead"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd-readahead \- Reference implementation of APIs for controlling boot\-time read\-ahead
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include "sd\-readahead\&.h"
-.fi
-.ft
-.SH "DESCRIPTION"
-.PP
-sd\-readahead\&.c
-and
-sd\-readahead\&.h
-provide a reference implementation for APIs for controlling boot\-time read\-ahead, as implemented by the read\-ahead subsystem of the
-\fBsystemd\fR(1)
-init system\&.
-.PP
-See
-\fBsd_readahead\fR(3)
-for more information about the function implemented\&.
-.SH "NOTES"
-.PP
-This interface is provided by the reference implementation of APIs for controlling boot\-time read\-ahead and distributed with the systemd package\&. The algorithms it implements are simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&. See the respective function man pages for details\&.
-.PP
-In addition, for details about the algorithms check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h\fR\m[]
-.PP
-These APIs are implemented in the reference implementation\*(Aqs drop\-in
-sd\-readahead\&.c
-and
-sd\-readahead\&.h
-files\&. It is recommended that applications consuming these APIs copy the implementation into their source tree, either verbatim or in excerpts\&. These interfaces are currently not available in a dynamic library\&.
-.PP
-The functions provided by this interface become NOPs when \-DDISABLE_SYSTEMD is set during compilation\&. In addition, if
-sd\-readhead\&.c
-is compiled on non\-Linux systems it becomes NOPs\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd_readahead\fR(3),
-\fBsd-daemon\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 7fb8634..819691e 100644 (file)
@@ -86,8 +86,8 @@
                 <para>In addition, for details about the algorithms
                 check the liberally licensed reference implementation
                 sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c"/>
-                resp. <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h"/></para>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-readahead.c"/>
+                resp. <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-readahead.h"/></para>
 
                 <para>These APIs are implemented in the reference
                 implementation's drop-in
diff --git a/man/sd_booted.3 b/man/sd_booted.3
deleted file mode 100644 (file)
index c6ba5d9..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-'\" t
-.\"     Title: sd_booted
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_booted
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_BOOTED" "3" "02/15/2012" "systemd" "sd_booted"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_booted \- Test whether the system is running the systemd init system\&.
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-daemon\&.h>
-.fi
-.ft
-.HP \w'int\ sd_booted('u
-.BI "int sd_booted(void);"
-.SH "DESCRIPTION"
-.PP
-\fBsd_booted()\fR
-checks whether the system was booted up using the systemd init system\&.
-.SH "RETURN VALUE"
-.PP
-On failure, this call returns a negative errno\-style error code\&. If the system was booted up with systemd as init system, this call returns a positive return value, zero otherwise\&.
-.SH "NOTES"
-.PP
-This function is provided by the reference implementation of APIs for new\-style daemons and distributed with the systemd package\&. The algorithm it implements is simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&.
-.PP
-Internally, this function checks whether the
-/sys/fs/cgroup/systemd
-virtual file system is mounted, by comparing the st_dev value of the
-\fBstat()\fR
-data of
-/sys/fs/cgroup
-and
-/sys/fs/cgroup/systemd\&.
-.PP
-For details about the algorithm check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h\fR\m[]
-.PP
-\fBsd_booted()\fR
-is implemented in the reference implementation\*(Aqs
-sd\-daemon\&.c
-and
-sd\-daemon\&.h
-files\&. These interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-daemon
-\fBpkg-config\fR(1)
-file\&. Alternatively, applications consuming these APIs may copy the implementation into their source tree\&. For more details about the reference implementation see
-\fBsd_daemon\fR(7)\&.
-.PP
-If the reference implementation is used as drop\-in files and \-DDISABLE_SYSTEMD is set during compilation this function will always return 0 and otherwise become a NOP\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd_daemon\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 141625d..ebcde36 100644 (file)
@@ -49,7 +49,7 @@
 
         <refsynopsisdiv>
                 <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
+                        <funcsynopsisinfo>#include "sd-daemon.h"</funcsynopsisinfo>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_booted</function></funcdef>
@@ -93,9 +93,9 @@
 
                 <para>For details about the algorithm check the
                 liberally licensed reference implementation sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c"/>
                 resp. <ulink
-                url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
+                url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.h"/></para>
 
                 <para><function>sd_booted()</function> is implemented
                 in the reference implementation's
diff --git a/man/sd_get_seats.3 b/man/sd_get_seats.3
deleted file mode 100644 (file)
index 7a933ec..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-'\" t
-.\"     Title: sd_get_seats
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_get_seats
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_GET_SEATS" "3" "02/15/2012" "systemd" "sd_get_seats"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_get_seats, sd_get_sessions, sd_get_uids \- Determine available seats, sessions and logged in users
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'int\ sd_get_seats('u
-.BI "int sd_get_seats(char***\ " "seats" ");"
-.HP \w'int\ sd_get_sessions('u
-.BI "int sd_get_sessions(char***\ " "sessions" ");"
-.HP \w'int\ sd_get_uids('u
-.BI "int sd_get_uids(char***\ " "sessions" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_get_seats()\fR
-may be used to determine all currently available local seats\&. Returns a NULL terminated array of seat identifiers\&. The returned array and all strings it references need to be freed with the libc
-\fBfree\fR(3)
-call after use\&. Note that instead of an empty array NULL may be returned and should be considered equivalent to an empty array\&.
-.PP
-Similar,
-\fBsd_get_sessions()\fR
-may be used to determine all current login sessions\&.
-.PP
-Similar,
-\fBsd_get_uids()\fR
-may be used to determine all Unix users who currently have login sessions\&.
-.SH "RETURN VALUE"
-.PP
-On success
-\fBsd_get_seats()\fR,
-\fBsd_get_sessions()\fR
-and
-\fBsd_get_uids()\fR
-return the number of entries in the arrays\&. On failure, these calls return a negative errno\-style error code\&.
-.SH "NOTES"
-.PP
-The
-\fBsd_get_seats()\fR,
-\fBsd_get_sessions()\fR
-and
-\fBsd_get_uids()\fR
-interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-login\fR(7),
-\fBsd_session_get_seat\fR(3)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd_get_seats.xml b/man/sd_get_seats.xml
deleted file mode 100644 (file)
index 2ac7650..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd_get_seats">
-
-        <refentryinfo>
-                <title>sd_get_seats</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd_get_seats</refentrytitle>
-                <manvolnum>3</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd_get_seats</refname>
-                <refname>sd_get_sessions</refname>
-                <refname>sd_get_uids</refname>
-                <refpurpose>Determine available seats, sessions and logged in users</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_get_seats</function></funcdef>
-                                <paramdef>char*** <parameter>seats</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_get_sessions</function></funcdef>
-                                <paramdef>char*** <parameter>sessions</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_get_uids</function></funcdef>
-                                <paramdef>char*** <parameter>sessions</parameter></paramdef>
-                        </funcprototype>
-
-                </funcsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><function>sd_get_seats()</function> may be used
-                to determine all currently available local
-                seats. Returns a NULL terminated array of seat
-                identifiers. The returned array and all strings it
-                references need to be freed with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use. Note that instead of an empty array
-                NULL may be returned and should be considered
-                equivalent to an empty array.</para>
-
-                <para>Similar, <function>sd_get_sessions()</function> may
-                be used to determine all current login sessions.</para>
-
-                <para>Similar, <function>sd_get_uids()</function> may
-                be used to determine all Unix users who currently have login sessions.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Return Value</title>
-
-                <para>On success <function>sd_get_seats()</function>,
-                <function>sd_get_sessions()</function> and
-                <function>sd_get_uids()</function> return the number
-                of entries in the arrays. On failure, these calls
-                return a negative errno-style error code.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>The <function>sd_get_seats()</function>,
-                <function>sd_get_sessions()</function> and
-                <function>sd_get_uids()</function> interfaces
-                are available as shared library, which can be compiled
-                and linked to with the
-                <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_session_get_seat</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd_get_sessions.3 b/man/sd_get_sessions.3
deleted file mode 100644 (file)
index e7cdc2d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_get_seats.3
diff --git a/man/sd_get_uids.3 b/man/sd_get_uids.3
deleted file mode 100644 (file)
index e7cdc2d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_get_seats.3
diff --git a/man/sd_is_fifo.3 b/man/sd_is_fifo.3
deleted file mode 100644 (file)
index 7602e43..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-'\" t
-.\"     Title: sd_is_fifo
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_is_fifo
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_IS_FIFO" "3" "02/15/2012" "systemd" "sd_is_fifo"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_is_fifo, sd_is_socket, sd_is_socket_inet, sd_is_socket_unix, sd_is_mq \- Check the type of a file descriptor
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-daemon\&.h>
-.fi
-.ft
-.HP \w'int\ sd_is_fifo('u
-.BI "int sd_is_fifo(int\ " "fd" ", const\ char\ *" "path" ");"
-.HP \w'int\ sd_is_socket('u
-.BI "int sd_is_socket(int\ " "fd" ", int\ " "family" ", int\ " "type" ", int\ " "listening" ");"
-.HP \w'int\ sd_is_socket_inet('u
-.BI "int sd_is_socket_inet(int\ " "fd" ", int\ " "family" ", int\ " "type" ", int\ " "listening" ", uint16_t\ " "port" ");"
-.HP \w'int\ sd_is_socket_unix('u
-.BI "int sd_is_socket_unix(int\ " "fd" ", int\ " "type" ", int\ " "listening" ", const\ char*\ " "path" ", size_t\ " "length" ");"
-.HP \w'int\ sd_is_mq('u
-.BI "int sd_is_mq(int\ " "fd" ", const\ char\ *" "path" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_is_fifo()\fR
-may be called to check whether the specified file descriptor refers to a FIFO or pipe\&. If the
-\fIpath\fR
-parameter is not NULL, it is checked whether the FIFO is bound to the specified file system path\&.
-.PP
-\fBsd_is_socket()\fR
-may be called to check whether the specified file descriptor refers to a socket\&. It the
-\fIfamily\fR
-parameter is not AF_UNSPEC it is checked whether the socket is of the specified family (AF_UNIX, AF_INET, \&.\&.\&.)\&. If the
-\fItype\fR
-parameter is not 0 it is checked whether the socket is of the specified type (SOCK_STREAM, SOCK_DGRAM, \&.\&.\&.)\&. If the
-\fIlistening\fR
-parameter is positive it is checked whether the socket is in accepting mode, i\&.e\&.
-\fBlisten()\fR
-has been called for it\&. If
-\fIlistening\fR
-is 0, it is checked whether the socket is not in this mode\&. If the parameter is negative, no such check is made\&. The
-\fIlistening\fR
-parameter should only be used for stream sockets and should be set to a negative value otherwise\&.
-.PP
-\fBsd_is_socket_inet()\fR
-is similar to
-\fBsd_is_socket()\fR, but optionally checks the IPv4 or IPv6 port number the socket is bound to, unless
-\fIport\fR
-is zero\&. For this call
-\fIfamily\fR
-must be passed as either AF_UNSPEC, AF_INET or AF_INET6\&.
-.PP
-\fBsd_is_socket_unix()\fR
-is similar to
-\fBsd_is_socket()\fR, but optionally checks the AF_UNIX path the socket is bound to, unless the
-\fIpath\fR
-parameter is NULL\&. For normal file system AF_UNIX sockets set the
-\fIlength\fR
-parameter to 0\&. For Linux abstract namespace sockets set the
-\fIlength\fR
-to the size of the address, including the initial 0 byte and set
-\fIpath\fR
-to the initial 0 byte of the socket address\&.
-.PP
-\fBsd_is_mq()\fR
-may be called to check whether the specified file descriptor refers to a POSIX message queue\&. If the
-\fIpath\fR
-parameter is not NULL, it is checked whether the message queue is bound to the specified name\&.
-.SH "RETURN VALUE"
-.PP
-On failure, these calls return a negative errno\-style error code\&. If the file descriptor is of the specified type and bound to the specified address a positive return value is returned, otherwise zero\&.
-.SH "NOTES"
-.PP
-These functions are provided by the reference implementation of APIs for new\-style daemons and distributed with the systemd package\&. The algorithms they implement are simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&.
-.PP
-Internally, these function use a combination of
-fstat()
-and
-getsockname()
-to check the file descriptor type and where it is bound to\&.
-.PP
-For details about the algorithms check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h\fR\m[]
-.PP
-\fBsd_is_fifo()\fR
-and the related functions are implemented in the reference implementation\*(Aqs
-sd\-daemon\&.c
-and
-sd\-daemon\&.h
-files\&. These interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-daemon
-\fBpkg-config\fR(1)
-file\&. Alternatively, applications consuming these APIs may copy the implementation into their source tree\&. For more details about the reference implementation see
-\fBsd_daemon\fR(7)\&.
-.PP
-These functions continue to work as described, even if \-DDISABLE_SYSTEMD is set during compilation\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-daemon\fR(7),
-\fBsd_listen_fds\fR(3),
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 4db5120..f6fafab 100644 (file)
@@ -53,7 +53,7 @@
 
         <refsynopsisdiv>
                 <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
+                        <funcsynopsisinfo>#include "sd-daemon.h"</funcsynopsisinfo>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_is_fifo</function></funcdef>
 
                 <para>For details about the algorithms check the
                 liberally licensed reference implementation sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c"/>
                 resp. <ulink
-                url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
+                url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.h"/></para>
 
                 <para><function>sd_is_fifo()</function> and the
                 related functions are implemented in the reference
diff --git a/man/sd_is_mq.3 b/man/sd_is_mq.3
deleted file mode 100644 (file)
index daadb93..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_is_fifo.3
diff --git a/man/sd_is_socket.3 b/man/sd_is_socket.3
deleted file mode 100644 (file)
index daadb93..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_is_fifo.3
diff --git a/man/sd_is_socket_inet.3 b/man/sd_is_socket_inet.3
deleted file mode 100644 (file)
index daadb93..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_is_fifo.3
diff --git a/man/sd_is_socket_unix.3 b/man/sd_is_socket_unix.3
deleted file mode 100644 (file)
index daadb93..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_is_fifo.3
diff --git a/man/sd_listen_fds.3 b/man/sd_listen_fds.3
deleted file mode 100644 (file)
index 425ee6c..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-'\" t
-.\"     Title: sd_listen_fds
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_listen_fds
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_LISTEN_FDS" "3" "02/15/2012" "systemd" "sd_listen_fds"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_listen_fds \- Check for file descriptors passed by the init system\&.
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-daemon\&.h>
-.fi
-.ft
-.sp
-.ft B
-.nf
-#define SD_LISTEN_FDS_START 3
-.fi
-.ft
-.HP \w'int\ sd_listen_fds('u
-.BI "int sd_listen_fds(int\ " "unset_environment" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_listen_fds()\fR
-shall be called by a daemon to check for file descriptors passed by the init system as part of the socket\-based activation logic\&.
-.PP
-If the
-\fIunset_environment\fR
-parameter is non\-zero
-\fBsd_listen_fds()\fR
-will unset the
-\fI$LISTEN_FDS\fR/\fI$LISTEN_PID\fR
-environment variables before returning (regardless whether the function call itself succeeded or not)\&. Further calls to
-\fBsd_listen_fds()\fR
-will then fail, but the variables are no longer inherited by child processes\&.
-.PP
-If a daemon receives more than one file descriptor, they will be passed in the same order as configured in the systemd socket definition file\&. Nonetheless it is recommended to verify the correct socket types before using them\&. To simplify this checking the functions
-\fBsd_is_fifo\fR(3),
-\fBsd_is_socket\fR(3),
-\fBsd_is_socket_inet\fR(3),
-\fBsd_is_socket_unix\fR(3)
-are provided\&. In order to maximize flexibility it is recommended to make these checks as loose as possible without allowing incorrect setups\&. i\&.e\&. often the actual port number a socket is bound to matters little for the service to work, hence it should not be verified\&. On the other hand, whether a socket is a datagram or stream socket matters a lot for the most common program logics and should be checked\&.
-.PP
-This function call will set the FD_CLOEXEC flag for all passed file descriptors to avoid further inheritance to children of the calling process\&.
-.SH "RETURN VALUE"
-.PP
-On failure, this call returns a negative errno\-style error code\&. If
-\fI$LISTEN_FDS\fR/\fI$LISTEN_PID\fR
-was not set or was not correctly set for this daemon and hence no file descriptors were received, 0 is returned\&. Otherwise the number of file descriptors passed is returned\&. The application may find them starting with file descriptor SD_LISTEN_FDS_START, i\&.e\&. file descriptor 3\&.
-.SH "NOTES"
-.PP
-This function is provided by the reference implementation of APIs for new\-style daemons and distributed with the systemd package\&. The algorithm it implements is simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&.
-.PP
-Internally, this function checks whether the
-\fI$LISTEN_PID\fR
-environment variable equals the daemon PID\&. If not, it returns immediately\&. Otherwise it parses the number passed in the
-\fI$LISTEN_FDS\fR
-environment variable, then sets the FD_CLOEXEC flag for the parsed number of file descriptors starting from SD_LISTEN_FDS_START\&. Finally it returns the parsed number\&.
-.PP
-For details about the algorithm check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h\fR\m[]
-.PP
-\fBsd_listen_fds()\fR
-is implemented in the reference implementation\*(Aqs
-sd\-daemon\&.c
-and
-sd\-daemon\&.h
-files\&. These interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-daemon
-\fBpkg-config\fR(1)
-file\&. Alternatively, applications consuming these APIs may copy the implementation into their source tree\&. For more details about the reference implementation see
-\fBsd-daemon\fR(7)\&.
-.PP
-If the reference implementation is used as drop\-in files and \-DDISABLE_SYSTEMD is set during compilation this function will always return 0 and otherwise become a NOP\&.
-.SH "ENVIRONMENT"
-.PP
-\fI$LISTEN_PID\fR, \fI$LISTEN_FDS\fR
-.RS 4
-Set by the init system for supervised processes that use socket\-based activation\&. This environment variable specifies the data
-\fBsd_listen_fds()\fR
-parses\&. See above for details\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-daemon\fR(7),
-\fBsd_is_fifo\fR(3),
-\fBsd_is_socket\fR(3),
-\fBsd_is_socket_inet\fR(3),
-\fBsd_is_socket_unix\fR(3),
-\fBdaemon\fR(7),
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index c3c70a0..3276aff 100644 (file)
@@ -49,7 +49,7 @@
 
         <refsynopsisdiv>
                 <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
+                        <funcsynopsisinfo>#include "sd-daemon.h"</funcsynopsisinfo>
 
                         <funcsynopsisinfo>#define SD_LISTEN_FDS_START 3</funcsynopsisinfo>
 
 
                 <para>For details about the algorithm check the
                 liberally licensed reference implementation sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c"/>
                 resp. <ulink
-                url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
+                url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.h"/></para>
 
                 <para><function>sd_listen_fds()</function> is
                 implemented in the reference implementation's
diff --git a/man/sd_login_monitor_flush.3 b/man/sd_login_monitor_flush.3
deleted file mode 100644 (file)
index 6229cce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_login_monitor_new.3
diff --git a/man/sd_login_monitor_get_fd.3 b/man/sd_login_monitor_get_fd.3
deleted file mode 100644 (file)
index 6229cce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_login_monitor_new.3
diff --git a/man/sd_login_monitor_new.3 b/man/sd_login_monitor_new.3
deleted file mode 100644 (file)
index 28b8a7d..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-'\" t
-.\"     Title: sd_login_monitor_new
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_login_monitor_new
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_LOGIN_MONITOR_NEW" "3" "02/15/2012" "systemd" "sd_login_monitor_new"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_login_monitor_new, sd_login_monitor_unref, sd_login_monitor_flush, sd_login_monitor_get_fd \- Monitor login sessions, seats and users
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'int\ sd_login_monitor_new('u
-.BI "int sd_login_monitor_new(const\ char*\ " "category" ", sd_login_monitor**\ " "ret" ");"
-.HP \w'sd_login_monitor*\ sd_login_monitor_unref('u
-.BI "sd_login_monitor* sd_login_monitor_unref(sd_login_monitor*\ " "m" ");"
-.HP \w'int\ sd_login_monitor_flush('u
-.BI "int sd_login_monitor_flush(sd_login_monitor*\ " "m" ");"
-.HP \w'int\ sd_login_monitor_get_fd('u
-.BI "int sd_login_monitor_get_fd(sd_login_monitor*\ " "m" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_login_monitor_new()\fR
-may be used to monitor login session, users and seats\&. Via a monitor object a file descriptor can be integrated into an application defined event loop which is woken up each time a user logs in, logs out or a seat is added or removed, or a session, user, or seat changes state otherwise\&. The first parameter takes a string which can be either
-seat
-(to get only notifications about seats being added, removed or changed),
-session
-(to get only notifications about sessions being created or removed or changed) or
-uid
-(to get only notifications when a user changes state in respect to logins)\&. If notifications shall be generated in all these conditions, NULL may be passed\&. Note that in future additional categories may be defined\&. The second parameter returns a monitor object and needs to be freed with the
-\fBsd_login_monitor_unref()\fR
-call after use\&.
-.PP
-\fBsd_login_monitor_unref()\fR
-may be used to destroy a monitor object\&. Note that this will invalidate any file descriptor returned by
-\fBsd_login_monitor_get_fd()\fR\&.
-.PP
-\fBsd_login_monitor_flush()\fR
-may be used to reset the wakeup state of the monitor object\&. Whenever an event causes the monitor to wake up the event loop via the file descriptor this function needs to be called to reset the wake\-up state\&. If this call is not invoked the file descriptor will immediately wake up the event loop again\&.
-.PP
-\fBsd_login_monitor_get_fd()\fR
-may be used to retrieve the file descriptor of the monitor object that may be integrated in an application defined event loop, based around
-\fBpoll\fR(2)
-or a similar interface\&. The application should include the returned file descriptor as wake up source for POLLIN events\&. Whenever a wake\-up is triggered the file descriptor needs to be reset via
-\fBsd_login_monitor_flush()\fR\&. An application needs to reread the login state with a function like
-\fBsd_get_seats\fR(3)
-or similar to determine what changed\&.
-.SH "RETURN VALUE"
-.PP
-On success
-\fBsd_login_monitor_new()\fR
-and
-\fBsd_login_monitor_flush()\fR
-return 0 or a positive integer\&. On success
-\fBsd_login_monitor_get_fd()\fR
-returns a Unix file descriptor\&. On failure, these calls return a negative errno\-style error code\&.
-.PP
-\fBsd_login_monitor_unref()\fR
-always returns NULL\&.
-.SH "NOTES"
-.PP
-The
-\fBsd_login_monitor_new()\fR,
-\fBsd_login_monitor_unref()\fR,
-\fBsd_login_monitor_flush()\fR
-and
-\fBsd_login_monitor_get_fd()\fR
-interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-login\fR(7),
-\fBsd_get_seats\fR(3)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd_login_monitor_new.xml b/man/sd_login_monitor_new.xml
deleted file mode 100644 (file)
index de48432..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd_login_monitor_new">
-
-        <refentryinfo>
-                <title>sd_login_monitor_new</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd_login_monitor_new</refentrytitle>
-                <manvolnum>3</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd_login_monitor_new</refname>
-                <refname>sd_login_monitor_unref</refname>
-                <refname>sd_login_monitor_flush</refname>
-                <refname>sd_login_monitor_get_fd</refname>
-                <refpurpose>Monitor login sessions, seats and users</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_login_monitor_new</function></funcdef>
-                                <paramdef>const char* <parameter>category</parameter></paramdef>
-                                <paramdef>sd_login_monitor** <parameter>ret</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>sd_login_monitor* <function>sd_login_monitor_unref</function></funcdef>
-                                <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_login_monitor_flush</function></funcdef>
-                                <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_login_monitor_get_fd</function></funcdef>
-                                <paramdef>sd_login_monitor* <parameter>m</parameter></paramdef>
-                        </funcprototype>
-
-                </funcsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><function>sd_login_monitor_new()</function> may
-                be used to monitor login session, users and seats. Via
-                a monitor object a file descriptor can be integrated
-                into an application defined event loop which is woken
-                up each time a user logs in, logs out or a seat is
-                added or removed, or a session, user, or seat changes
-                state otherwise. The first parameter takes a string
-                which can be either <literal>seat</literal> (to get
-                only notifications about seats being added, removed or
-                changed), <literal>session</literal> (to get only
-                notifications about sessions being created or removed
-                or changed) or <literal>uid</literal> (to get only
-                notifications when a user changes state in respect to
-                logins). If notifications shall be generated in all
-                these conditions, NULL may be passed. Note that in
-                future additional categories may be defined. The
-                second parameter returns a monitor object and needs to
-                be freed with the
-                <function>sd_login_monitor_unref()</function> call
-                after use.</para>
-
-                <para><function>sd_login_monitor_unref()</function>
-                may be used to destroy a monitor object. Note that
-                this will invalidate any file descriptor returned by
-                <function>sd_login_monitor_get_fd()</function>.</para>
-
-                <para><function>sd_login_monitor_flush()</function>
-                may be used to reset the wakeup state of the monitor
-                object. Whenever an event causes the monitor to wake
-                up the event loop via the file descriptor this
-                function needs to be called to reset the wake-up
-                state. If this call is not invoked the file descriptor
-                will immediately wake up the event loop again.</para>
-
-                <para><function>sd_login_monitor_get_fd()</function>
-                may be used to retrieve the file descriptor of the
-                monitor object that may be integrated in an
-                application defined event loop, based around
-                <citerefentry><refentrytitle>poll</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                or a similar interface. The application should include
-                the returned file descriptor as wake up source for
-                POLLIN events. Whenever a wake-up is triggered the
-                file descriptor needs to be reset via
-                <function>sd_login_monitor_flush()</function>. An
-                application needs to reread the login state with a
-                function like
-                <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                or similar to determine what changed.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Return Value</title>
-
-                <para>On success
-                <function>sd_login_monitor_new()</function> and
-                <function>sd_login_monitor_flush()</function> return 0
-                or a positive integer. On success
-                <function>sd_login_monitor_get_fd()</function> returns
-                a Unix file descriptor. On failure, these calls return
-                a negative errno-style error code.</para>
-
-                <para><function>sd_login_monitor_unref()</function>
-                always returns NULL.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>The <function>sd_login_monitor_new()</function>,
-                <function>sd_login_monitor_unref()</function>, <function>sd_login_monitor_flush()</function> and
-                <function>sd_login_monitor_get_fd()</function> interfaces
-                are available as shared library, which can be compiled
-                and linked to with the
-                <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_get_seats</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd_login_monitor_unref.3 b/man/sd_login_monitor_unref.3
deleted file mode 100644 (file)
index 6229cce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_login_monitor_new.3
diff --git a/man/sd_notify.3 b/man/sd_notify.3
deleted file mode 100644 (file)
index ed159b9..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-'\" t
-.\"     Title: sd_notify
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_notify
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_NOTIFY" "3" "02/15/2012" "systemd" "sd_notify"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_notify, sd_notifyf \- Notify init system about start\-up completion and other daemon status changes
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-daemon\&.h>
-.fi
-.ft
-.HP \w'int\ sd_notify('u
-.BI "int sd_notify(int\ " "unset_environment" ", const\ char\ *" "state" ");"
-.HP \w'int\ sd_notifyf('u
-.BI "int sd_notifyf(int\ " "unset_environment" ", const\ char\ *" "format" ", \&.\&.\&.);"
-.SH "DESCRIPTION"
-.PP
-\fBsd_notify()\fR
-shall be called by a daemon to notify the init system about status changes\&. It can be used to send arbitrary information, encoded in an environment\-block\-like string\&. Most importantly it can be used for start\-up completion notification\&.
-.PP
-If the
-\fIunset_environment\fR
-parameter is non\-zero
-\fBsd_notify()\fR
-will unset the
-\fI$NOTIFY_SOCKET\fR
-environment variable before returning (regardless whether the function call itself succeeded or not)\&. Further calls to
-\fBsd_notify()\fR
-will then fail, but the variable is no longer inherited by child processes\&.
-.PP
-The
-\fIstate\fR
-parameter should contain an newline\-separated list of variable assignments, similar in style to an environment block\&. A trailing newline is implied if none is specified\&. The string may contain any kind of variable assignments, but the following shall be considered well\-known:
-.PP
-READY=1
-.RS 4
-Tells the init system that daemon startup is finished\&. This is only used by systemd if the service definition file has Type=notify set\&. The passed argument is a boolean "1" or "0"\&. Since there is little value in signalling non\-readiness, the only value daemons should send is "READY=1"\&.
-.RE
-.PP
-STATUS=\&.\&.\&.
-.RS 4
-Passes a single\-line status string back to the init system that describes the daemon state\&. This is free\-form and can be used for various purposes: general state feedback, fsck\-like programs could pass completion percentages and failing programs could pass a human readable error message\&. Example: "STATUS=Completed 66% of file system check\&.\&.\&."
-.RE
-.PP
-ERRNO=\&.\&.\&.
-.RS 4
-If a daemon fails, the errno\-style error code, formatted as string\&. Example: "ERRNO=2" for ENOENT\&.
-.RE
-.PP
-BUSERROR=\&.\&.\&.
-.RS 4
-If a daemon fails, the D\-Bus error\-style error code\&. Example: "BUSERROR=org\&.freedesktop\&.DBus\&.Error\&.TimedOut"
-.RE
-.PP
-MAINPID=\&.\&.\&.
-.RS 4
-The main pid of the daemon, in case the init system did not fork off the process itself\&. Example: "MAINPID=4711"
-.RE
-.PP
-WATCHDOG=1
-.RS 4
-Tells systemd to update the watchdog timestamp\&. Services using this feature should do this in regular intervals\&. A watchdog framework can use the timestamps to detect failed services\&.
-.RE
-.PP
-It is recommended to prefix variable names that are not shown in the list above with
-\fIX_\fR
-to avoid namespace clashes\&.
-.PP
-Note that systemd will accept status data sent from a daemon only if the
-\fINotifyAccess=\fR
-option is correctly set in the service definition file\&. See
-\fBsystemd.service\fR(5)
-for details\&.
-.PP
-\fBsd_notifyf()\fR
-is similar to
-\fBsd_notify()\fR
-but takes a
-\fBprintf()\fR\-like format string plus arguments\&.
-.SH "RETURN VALUE"
-.PP
-On failure, these calls return a negative errno\-style error code\&. If
-\fI$NOTIFY_SOCKET\fR
-was not set and hence no status data could be sent, 0 is returned\&. If the status was sent these functions return with a positive return value\&. In order to support both, init systems that implement this scheme and those which don\*(Aqt, it is generally recommended to ignore the return value of this call\&.
-.SH "NOTES"
-.PP
-These functions are provided by the reference implementation of APIs for new\-style daemons and distributed with the systemd package\&. The algorithms they implement are simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&.
-.PP
-Internally, these functions send a single datagram with the state string as payload to the AF_UNIX socket referenced in the
-\fI$NOTIFY_SOCKET\fR
-environment variable\&. If the first character of
-\fI$NOTIFY_SOCKET\fR
-is @ the string is understood as Linux abstract namespace socket\&. The datagram is accompanied by the process credentials of the sending daemon, using SCM_CREDENTIALS\&.
-.PP
-For details about the algorithms check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h\fR\m[]
-.PP
-\fBsd_notify()\fR
-and
-\fBsd_notifyf()\fR
-are implemented in the reference implementation\*(Aqs
-sd\-daemon\&.c
-and
-sd\-daemon\&.h
-files\&. These interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-daemon
-\fBpkg-config\fR(1)
-file\&. Alternatively, applications consuming these APIs may copy the implementation into their source tree\&. For more details about the reference implementation see
-\fBsd_daemon\fR(7)\&.
-.PP
-If the reference implementation is used as drop\-in files and \-DDISABLE_SYSTEMD is set during compilation these functions will always return 0 and otherwise become a NOP\&.
-.SH "ENVIRONMENT"
-.PP
-\fI$NOTIFY_SOCKET\fR
-.RS 4
-Set by the init system for supervised processes for status and start\-up completion notification\&. This environment variable specifies the socket
-\fBsd_notify()\fR
-talks to\&. See above for details\&.
-.RE
-.SH "EXAMPLES"
-.PP
-\fBExample\ \&1.\ \&Start-up Notification\fR
-.PP
-When a daemon finished starting up, it might issue the following call to notify the init system:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-sd_notify(0, "READY=1");
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-\fBExample\ \&2.\ \&Extended Start-up Notification\fR
-.PP
-A daemon could send the following after completing initialization:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-sd_notifyf(0, "READY=1\en"
-              "STATUS=Processing requests\&.\&.\&.\en"
-              "MAINPID=%lu",
-              (unsigned long) getpid());
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-\fBExample\ \&3.\ \&Error Cause Notification\fR
-.PP
-A daemon could send the following shortly before exiting, on failure
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-sd_notifyf(0, "STATUS=Failed to start up: %s\en"
-              "ERRNO=%i",
-              strerror(errno),
-              errno);
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd_daemon\fR(7),
-\fBdaemon\fR(7),
-\fBsystemd.service\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 9d9ea41..dd0ba93 100644 (file)
@@ -50,7 +50,7 @@
 
         <refsynopsisdiv>
                 <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-daemon.h&gt;</funcsynopsisinfo>
+                        <funcsynopsisinfo>#include "sd-daemon.h"</funcsynopsisinfo>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_notify</function></funcdef>
                                 itself. Example:
                                 "MAINPID=4711"</para></listitem>
                         </varlistentry>
-
-                        <varlistentry>
-                                <term>WATCHDOG=1</term>
-
-                                <listitem><para>Tells systemd to
-                                update the watchdog timestamp.
-                                Services using this feature should do
-                                this in regular intervals. A watchdog
-                                framework can use the timestamps to
-                                detect failed
-                                services.</para></listitem>
-                        </varlistentry>
                 </variablelist>
 
                 <para>It is recommended to prefix variable names that
                 for details.</para>
 
                 <para><function>sd_notifyf()</function> is similar to
-                <function>sd_notify()</function> but takes a
+                <function>sd_notifyf()</function> but takes a
                 <function>printf()</function>-like format string plus
                 arguments.</para>
         </refsect1>
 
                 <para>For details about the algorithms check the
                 liberally licensed reference implementation sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c"/>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.c"/>
                 resp. <ulink
-                url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h"/></para>
+                url="http://cgit.freedesktop.org/systemd/tree/src/sd-daemon.h"/></para>
 
                 <para><function>sd_notify()</function> and
                 <function>sd_notifyf()</function> are implemented in
diff --git a/man/sd_notifyf.3 b/man/sd_notifyf.3
deleted file mode 100644 (file)
index c6bfe96..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_notify.3
diff --git a/man/sd_pid_get_owner_uid.3 b/man/sd_pid_get_owner_uid.3
deleted file mode 100644 (file)
index 8561fee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_pid_get_session.3
diff --git a/man/sd_pid_get_session.3 b/man/sd_pid_get_session.3
deleted file mode 100644 (file)
index e8699fc..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-'\" t
-.\"     Title: sd_pid_get_session
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_pid_get_session
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_PID_GET_SESSION" "3" "02/15/2012" "systemd" "sd_pid_get_session"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_pid_get_session, sd_pid_get_unit, sd_pid_get_owner_uid \- Determine session, service or owner of a session of a specific PID
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'int\ sd_pid_get_session('u
-.BI "int sd_pid_get_session(pid_t\ " "pid" ", char**\ " "session" ");"
-.HP \w'int\ sd_pid_get_unit('u
-.BI "int sd_pid_get_unit(pid_t\ " "pid" ", char**\ " "unit" ");"
-.HP \w'int\ sd_pid_get_owner_uid('u
-.BI "int sd_pid_get_owner_uid(pid_t\ " "pid" ", uid_t*\ " "uid" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_pid_get_session()\fR
-may be used to determine the login session identifier of a process identified by the specified process identifier\&. The session identifier is a short string, suitable for usage in file system paths\&. Note that not all processes are part of a login session (e\&.g\&. system service processes, user processes that are shared between multiple sessions of the same user, or kernel threads)\&. For processes not being part of a login session this function will fail\&. The returned string needs to be freed with the libc
-\fBfree\fR(3)
-call after use\&.
-.PP
-\fBsd_pid_get_unit()\fR
-may be used to determine the systemd unit (i\&.e\&. system service) identifier of a process identified by the specified process identifier\&. The unit name is a short string, suitable for usage in file system paths\&. Note that not all processes are part of a unit/service (e\&.g\&. user processes, or kernel threads)\&. For processes not being part of a systemd unit/system service this function will fail\&. The returned string needs to be freed with the libc
-\fBfree\fR(3)
-call after use\&.
-.PP
-\fBsd_pid_get_owner_uid()\fR
-may be used to determine the Unix user identifier of the owner of the session of a process identified the specified PID\&. Note that this function will succeed for user processes which are shared between multiple login sessions of the same user, where
-\fBsd_pid_get_session()\fR
-will fail\&. For processes not being part of a login session and not being a shared process of a user this function will fail\&.
-.PP
-If the
-pid
-paramater of any of these functions is passed as 0 the operation is executed for the calling process\&.
-.SH "RETURN VALUE"
-.PP
-On success these calls return 0 or a positive integer\&. On failure, these calls return a negative errno\-style error code\&.
-.SH "NOTES"
-.PP
-The
-\fBsd_pid_get_session()\fR,
-\fBsd_pid_get_pid()\fR, and
-\fBsd_pid_get_owner_uid()\fR
-interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.PP
-Note that the login session identifier as returned by
-\fBsd_pid_get_session()\fR
-is completely unrelated to the process session identifier as returned by
-\fBgetsid\fR(2)\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-login\fR(7),
-\fBsd_session_is_active\fR(3),
-\fBgetsid\fR(2)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd_pid_get_session.xml b/man/sd_pid_get_session.xml
deleted file mode 100644 (file)
index 94f5330..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd_pid_get_session">
-
-        <refentryinfo>
-                <title>sd_pid_get_session</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd_pid_get_session</refentrytitle>
-                <manvolnum>3</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd_pid_get_session</refname>
-                <refname>sd_pid_get_unit</refname>
-                <refname>sd_pid_get_owner_uid</refname>
-                <refpurpose>Determine session, service or owner of a session of a specific PID</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_pid_get_session</function></funcdef>
-                                <paramdef>pid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>char** <parameter>session</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_pid_get_unit</function></funcdef>
-                                <paramdef>pid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>char** <parameter>unit</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_pid_get_owner_uid</function></funcdef>
-                                <paramdef>pid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>uid_t* <parameter>uid</parameter></paramdef>
-                        </funcprototype>
-                </funcsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><function>sd_pid_get_session()</function> may be
-                used to determine the login session identifier of a
-                process identified by the specified process
-                identifier. The session identifier is a short string,
-                suitable for usage in file system paths. Note that not
-                all processes are part of a login session (e.g. system
-                service processes, user processes that are shared
-                between multiple sessions of the same user, or kernel
-                threads). For processes not being part of a login
-                session this function will fail. The returned string
-                needs to be freed with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use.</para>
-
-                <para><function>sd_pid_get_unit()</function> may be
-                used to determine the systemd unit (i.e. system
-                service) identifier of a process identified by the
-                specified process identifier. The unit name is a short
-                string, suitable for usage in file system paths. Note
-                that not all processes are part of a unit/service
-                (e.g. user processes, or kernel threads). For
-                processes not being part of a systemd unit/system
-                service this function will fail. The returned string
-                needs to be freed with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use.</para>
-
-                <para><function>sd_pid_get_owner_uid()</function> may
-                be used to determine the Unix user identifier of the
-                owner of the session of a process identified the
-                specified PID. Note that this function will succeed
-                for user processes which are shared between multiple
-                login sessions of the same user, where
-                <function>sd_pid_get_session()</function> will
-                fail. For processes not being part of a login session
-                and not being a shared process of a user this function
-                will fail.</para>
-
-                <para>If the <literal>pid</literal> paramater of any
-                of these functions is passed as 0 the operation is
-                executed for the calling process.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Return Value</title>
-
-                <para>On success these calls return 0 or a positive
-                integer. On failure, these calls return a negative
-                errno-style error code.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>The <function>sd_pid_get_session()</function>,
-                <function>sd_pid_get_pid()</function>, and
-                <function>sd_pid_get_owner_uid()</function> interfaces
-                are available as shared library, which can be compiled
-                and linked to with the
-                <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-
-                <para>Note that the login session identifier as
-                returned by <function>sd_pid_get_session()</function>
-                is completely unrelated to the process session
-                identifier as returned by
-                <citerefentry><refentrytitle>getsid</refentrytitle><manvolnum>2</manvolnum></citerefentry>.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_session_is_active</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>getsid</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd_pid_get_unit.3 b/man/sd_pid_get_unit.3
deleted file mode 100644 (file)
index 8561fee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_pid_get_session.3
diff --git a/man/sd_readahead.3 b/man/sd_readahead.3
deleted file mode 100644 (file)
index c89de1d..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-'\" t
-.\"     Title: sd_readahead
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_readahead
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_READAHEAD" "3" "02/15/2012" "systemd" "sd_readahead"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_readahead \- Control ongoing disk boot\-time read\-ahead operations
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include "sd\-readahead\&.h"
-.fi
-.ft
-.HP \w'int\ sd_readahead('u
-.BI "int sd_readahead(const\ char\ *" "action" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_readahead()\fR
-may be called by programs involved with early boot\-up to control ongoing boot\-time disk read\-ahead operations\&. It may be used to terminate read\-ahead operations in case an uncommon disk access pattern is to be expected and hence read\-ahead replay or collection is unlikely to have the desired speed\-up effect on the current or future boot\-ups\&.
-.PP
-The
-\fIaction\fR
-should be one of the following strings:
-.PP
-cancel
-.RS 4
-Terminates read\-ahead data collection, and drops all read\-ahead data collected during this boot\-up\&.
-.RE
-.PP
-done
-.RS 4
-Terminates read\-ahead data collection, but keeps all read\-ahead data collected during this boot\-up around for use during subsequent boot\-ups\&.
-.RE
-.PP
-noreplay
-.RS 4
-Terminates read\-ahead replay\&.
-.RE
-.SH "RETURN VALUE"
-.PP
-On failure, these calls return a negative errno\-style error code\&. It is generally recommended to ignore the return value of this call\&.
-.SH "NOTES"
-.PP
-This function is provided by the reference implementation of APIs for controlling boot\-time read\-ahead and distributed with the systemd package\&. The algorithm it implements is simple, and can easily be reimplemented in daemons if it is important to support this interface without using the reference implementation\&.
-.PP
-Internally, this function creates a file in
-/run/systemd/readahead/
-which is then used as flag file to notify the read\-ahead subsystem\&.
-.PP
-For details about the algorithm check the liberally licensed reference implementation sources:
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c\fR\m[]
-resp\&.
-\m[blue]\fB\%http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h\fR\m[]
-.PP
-\fBsd_readahead()\fR
-is implemented in the reference implementation\*(Aqs drop\-in
-sd\-readahead\&.c
-and
-sd\-readahead\&.h
-files\&. It is recommended that applications consuming this API copy the implementation into their source tree\&. For more details about the reference implementation see
-\fBsd-readahead\fR(7)
-.PP
-If \-DDISABLE_SYSTEMD is set during compilation this function will always return 0 and otherwise become a NOP\&.
-.SH "EXAMPLES"
-.PP
-\fBExample\ \&1.\ \&Cancelling all read-ahead operations\fR
-.PP
-During boots where SELinux has to relabel the file system hierarchy, it will create a large amount of disk accesses that are not necessary during normal boots\&. Hence it is a good idea to disable both read\-ahead replay and read\-ahead collection\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-sd_readahead("cancel");
-sd_readahead("noreplay");
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-readahead\fR(7),
-\fBdaemon\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 2e7e09c..88b135b 100644 (file)
@@ -49,7 +49,7 @@
 
         <refsynopsisdiv>
                 <funcsynopsis>
-                        <funcsynopsisinfo>#include "sd-readahead.h"</funcsynopsisinfo>
+                        <funcsynopsisinfo>#include "sd-daemon.h"</funcsynopsisinfo>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_readahead</function></funcdef>
 
                 <para>For details about the algorithm check the
                 liberally licensed reference implementation sources:
-                <ulink url="http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c"/>
+                <ulink url="http://cgit.freedesktop.org/systemd/tree/src/sd-readahead.c"/>
                 resp. <ulink
-                url="http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h"/></para>
+                url="http://cgit.freedesktop.org/systemd/tree/src/sd-readahead.h"/></para>
 
                 <para><function>sd_readahead()</function> is
-                implemented in the reference implementation's drop-in
+                implemented in the reference implementation's
                 <filename>sd-readahead.c</filename> and
-                <filename>sd-readahead.h</filename> files. It is
-                recommended that applications consuming this API copy
-                the implementation into their source tree. For more
-                details about the reference implementation see
-                <citerefentry><refentrytitle>sd-readahead</refentrytitle><manvolnum>7</manvolnum></citerefentry></para>
-
-                <para>If -DDISABLE_SYSTEMD is set during compilation
-                this function will always return 0 and otherwise
-                become a NOP.</para>
+                <filename>sd-readahead.h</filename> files. These
+                interfaces are available as shared library, which can
+                be compiled and linked to with the
+                <literal>libsystemd-daemon</literal>
+                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                file. Alternatively, applications consuming this API
+                may copy the implementation into their source
+                tree. For more details about the reference
+                implementation see
+                <citerefentry><refentrytitle>sd-readahead</refentrytitle><manvolnum>7</manvolnum></citerefentry>.</para>
+
+                <para>If the reference implementation is used as
+                drop-in files and -DDISABLE_SYSTEMD is set during
+                compilation this function will always return 0 and
+                otherwise become a NOP.</para>
         </refsect1>
 
         <refsect1>
diff --git a/man/sd_seat_can_multi_session.3 b/man/sd_seat_can_multi_session.3
deleted file mode 100644 (file)
index 8d8b08d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_seat_get_active.3
diff --git a/man/sd_seat_get_active.3 b/man/sd_seat_get_active.3
deleted file mode 100644 (file)
index 4ddde6d..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-'\" t
-.\"     Title: sd_seat_get_active
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_seat_get_active
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_SEAT_GET_ACTIVE" "3" "02/15/2012" "systemd" "sd_seat_get_active"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_seat_get_active, sd_seat_get_sessions, sd_seat_can_multi_session \- Determine state of a specific seat
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'int\ sd_seat_get_active('u
-.BI "int sd_seat_get_active(const\ char*\ " "seat" ", char**\ " "session" ", uid_t*\ " "uid" ");"
-.HP \w'int\ sd_seat_get_sessions('u
-.BI "int sd_seat_get_sessions(const\ char*\ " "seat" ", char***\ " "sessions" ", uid_t**\ " "uid" ", unsigned*\ " "n_uids" ");"
-.HP \w'int\ sd_seat_can_multi_session('u
-.BI "int sd_seat_can_multi_session(const\ char*\ " "seat" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_seat_get_active()\fR
-may be used to determine which session is currently active on a seat, if there is any\&. Returns the session identifier and the user identifier of the Unix user the session is belonging to\&. Either the session or the user identifier parameter can be be passed NULL, in case only one of the parameters shall be queried\&. The returned string needs to be freed with the libc
-\fBfree\fR(3)
-call after use\&.
-.PP
-\fBsd_seat_get_sessions()\fR
-may be used to determine all sessions on the specified seat\&. Returns two arrays, one (NULL terminated) with the session identifiers of the sessions and one with the user identifiers of the Unix users the sessions belong to\&. An additional parameter may be used to return the number of entries in the latter array\&. The two arrays and the latter parameter may be passed as NULL in case these values need not to be determined\&. The arrays and the strings referenced by them need to be freed with the libc
-\fBfree\fR(3)
-call after use\&. Note that instead of an empty array NULL may be returned and should be considered equivalent to an empty array\&.
-.PP
-\fBsd_seat_can_multi_session()\fR
-may be used to determine whether a specific seat is capable of multi\-session, i\&.e\&. allows multiple login sessions in parallel (whith only one being active at a time)\&.
-.PP
-If the
-seat
-parameter of any of these functions is passed as NULL the operation is executed for the seat of the session of the calling process, if there is any\&.
-.SH "RETURN VALUE"
-.PP
-On success
-\fBsd_seat_get_active()\fR
-return return 0 or a positive integer\&. On success
-\fBsd_seat_get_sessions()\fR
-returns the number of entries in the session identifier array\&. If the test succeeds
-\fBsd_seat_can_multi_session\fR
-returns a positive integer, if it fails 0\&. On failure, these calls return a negative errno\-style error code\&.
-.SH "NOTES"
-.PP
-The
-\fBsd_seat_get_active()\fR,
-\fBsd_seat_get_sessions()\fR, and
-\fBsd_seat_can_multi_session()\fR
-interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-login\fR(7),
-\fBsd_session_get_seat\fR(3)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd_seat_get_active.xml b/man/sd_seat_get_active.xml
deleted file mode 100644 (file)
index acc6ee4..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd_seat_get_active">
-
-        <refentryinfo>
-                <title>sd_seat_get_active</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd_seat_get_active</refentrytitle>
-                <manvolnum>3</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd_seat_get_active</refname>
-                <refname>sd_seat_get_sessions</refname>
-                <refname>sd_seat_can_multi_session</refname>
-                <refpurpose>Determine state of a specific seat</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_seat_get_active</function></funcdef>
-                                <paramdef>const char* <parameter>seat</parameter></paramdef>
-                                <paramdef>char** <parameter>session</parameter></paramdef>
-                                <paramdef>uid_t* <parameter>uid</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_seat_get_sessions</function></funcdef>
-                                <paramdef>const char* <parameter>seat</parameter></paramdef>
-                                <paramdef>char*** <parameter>sessions</parameter></paramdef>
-                                <paramdef>uid_t** <parameter>uid</parameter></paramdef>
-                                <paramdef>unsigned* <parameter>n_uids</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_seat_can_multi_session</function></funcdef>
-                                <paramdef>const char* <parameter>seat</parameter></paramdef>
-                        </funcprototype>
-                </funcsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><function>sd_seat_get_active()</function> may be
-                used to determine which session is currently active on
-                a seat, if there is any. Returns the session
-                identifier and the user identifier of the Unix user
-                the session is belonging to. Either the session or the
-                user identifier parameter can be be passed NULL, in
-                case only one of the parameters shall be queried. The
-                returned string needs to be freed with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use.</para>
-
-                <para><function>sd_seat_get_sessions()</function> may
-                be used to determine all sessions on the specified
-                seat. Returns two arrays, one (NULL terminated) with
-                the session identifiers of the sessions and one with
-                the user identifiers of the Unix users the sessions
-                belong to. An additional parameter may be used to
-                return the number of entries in the latter array. The
-                two arrays and the latter parameter may be passed as
-                NULL in case these values need not to be
-                determined. The arrays and the strings referenced by
-                them need to be freed with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use. Note that instead of an empty array
-                NULL may be returned and should be considered
-                equivalent to an empty array.</para>
-
-                <para><function>sd_seat_can_multi_session()</function>
-                may be used to determine whether a specific seat is
-                capable of multi-session, i.e. allows multiple login
-                sessions in parallel (whith only one being active at a
-                time).</para>
-
-                <para>If the <literal>seat</literal> parameter of any
-                of these functions is passed as NULL the operation is
-                executed for the seat of the session of the calling
-                process, if there is any.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Return Value</title>
-
-                <para> On success
-                <function>sd_seat_get_active()</function> return
-                return 0 or a positive integer. On success
-                <function>sd_seat_get_sessions()</function> returns
-                the number of entries in the session identifier
-                array. If the test succeeds
-                <function>sd_seat_can_multi_session</function> returns
-                a positive integer, if it fails 0. On failure, these
-                calls return a negative errno-style error code.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>The <function>sd_seat_get_active()</function>,
-                <function>sd_seat_get_sessions()</function>, and
-                <function>sd_seat_can_multi_session()</function> interfaces
-                are available as shared library, which can be compiled
-                and linked to with the
-                <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_session_get_seat</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd_seat_get_sessions.3 b/man/sd_seat_get_sessions.3
deleted file mode 100644 (file)
index 8d8b08d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_seat_get_active.3
diff --git a/man/sd_session_get_seat.3 b/man/sd_session_get_seat.3
deleted file mode 100644 (file)
index b9ad5cd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_session_is_active.3
diff --git a/man/sd_session_get_uid.3 b/man/sd_session_get_uid.3
deleted file mode 100644 (file)
index b9ad5cd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_session_is_active.3
diff --git a/man/sd_session_is_active.3 b/man/sd_session_is_active.3
deleted file mode 100644 (file)
index 038cc64..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-'\" t
-.\"     Title: sd_session_is_active
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_session_is_active
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_SESSION_IS_ACTIVE" "3" "02/15/2012" "systemd" "sd_session_is_active"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_session_is_active, sd_session_get_uid, sd_session_get_seat, sd_session_get_service \- Determine state of a specific session
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'int\ sd_session_is_active('u
-.BI "int sd_session_is_active(const\ char*\ " "session" ");"
-.HP \w'int\ sd_session_get_uid('u
-.BI "int sd_session_get_uid(const\ char*\ " "session" ", uid_t*\ " "uid" ");"
-.HP \w'int\ sd_session_get_seat('u
-.BI "int sd_session_get_seat(const\ char*\ " "session" ", char**\ " "seat" ");"
-.HP \w'int\ sd_session_get_service('u
-.BI "int sd_session_get_service(const\ char*\ " "session" ", char**\ " "service" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_session_is_active()\fR
-may be used to determine whether the session identified by the specified session identifier is currently active (i\&.e\&. currently in the foreground and available for user input) or not\&.
-.PP
-\fBsd_session_get_uid()\fR
-may be used to determine the user identifier of the Unix user the session identified by the specified session identifier belongs to\&.
-.PP
-\fBsd_session_get_seat()\fR
-may be used to determine the seat identifier of the seat the session identified by the specified session identifier belongs to\&. Note that not all sessions are attached to a seat, this call will fail for them\&. The returned string needs to be freed with the libc
-\fBfree\fR(3)
-call after use\&.
-.PP
-\fBsd_session_get_service()\fR
-may be used to determine the name of the service (as passed during PAM session setup) that registered the session identified by the specified session identifier\&. The returned string needs to be freed with the libc
-\fBfree\fR(3)
-call after use\&.
-.PP
-If the
-session
-parameter of any of these functions is passed as NULL the operation is executed for the session the calling process is a member of, if there is any\&.
-.SH "RETURN VALUE"
-.PP
-If the test succeeds
-\fBsd_session_is_active()\fR
-returns a positive integer, if it fails 0\&. On success
-\fBsd_session_get_uid()\fR,
-\fBsd_session_get_service()\fR
-and
-\fBsd_session_get_seat()\fR
-return 0 or a positive integer\&. On failure, these calls return a negative errno\-style error code\&.
-.SH "NOTES"
-.PP
-The
-\fBsd_session_is_active()\fR,
-\fBsd_session_get_uid()\fR,
-\fBsd_session_get_service()\fR
-and
-\fBsd_session_get_seat()\fR
-interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-login\fR(7),
-\fBsd_pid_get_session\fR(3)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd_session_is_active.xml b/man/sd_session_is_active.xml
deleted file mode 100644 (file)
index 5db305d..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd_session_is_active">
-
-        <refentryinfo>
-                <title>sd_session_is_active</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd_session_is_active</refentrytitle>
-                <manvolnum>3</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd_session_is_active</refname>
-                <refname>sd_session_get_uid</refname>
-                <refname>sd_session_get_seat</refname>
-                <refname>sd_session_get_service</refname>
-                <refpurpose>Determine state of a specific session</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_session_is_active</function></funcdef>
-                                <paramdef>const char* <parameter>session</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_session_get_uid</function></funcdef>
-                                <paramdef>const char* <parameter>session</parameter></paramdef>
-                                <paramdef>uid_t* <parameter>uid</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_session_get_seat</function></funcdef>
-                                <paramdef>const char* <parameter>session</parameter></paramdef>
-                                <paramdef>char** <parameter>seat</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_session_get_service</function></funcdef>
-                                <paramdef>const char* <parameter>session</parameter></paramdef>
-                                <paramdef>char** <parameter>service</parameter></paramdef>
-                        </funcprototype>
-                </funcsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><function>sd_session_is_active()</function> may
-                be used to determine whether the session identified by
-                the specified session identifier is currently active
-                (i.e. currently in the foreground and available for
-                user input) or not.</para>
-
-                <para><function>sd_session_get_uid()</function> may be
-                used to determine the user identifier of the Unix user the session
-                identified by the specified session identifier belongs
-                to.</para>
-
-                <para><function>sd_session_get_seat()</function> may
-                be used to determine the seat identifier of the seat
-                the session identified by the specified session
-                identifier belongs to. Note that not all sessions are
-                attached to a seat, this call will fail for them. The
-                returned string needs to be freed with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use.</para>
-
-                <para><function>sd_session_get_service()</function>
-                may be used to determine the name of the service (as
-                passed during PAM session setup) that registered the
-                session identified by the specified session
-                identifier. The returned string needs to be freed with
-                the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use.</para>
-
-                <para>If the <literal>session</literal> parameter of
-                any of these functions is passed as NULL the operation
-                is executed for the session the calling process is a
-                member of, if there is any.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Return Value</title>
-
-                <para>If the test succeeds
-                <function>sd_session_is_active()</function> returns a
-                positive integer, if it fails 0.  On success
-                <function>sd_session_get_uid()</function>,
-                <function>sd_session_get_service()</function> and
-                <function>sd_session_get_seat()</function> return 0 or
-                a positive integer. On failure, these calls return a
-                negative errno-style error code.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>The <function>sd_session_is_active()</function>,
-                <function>sd_session_get_uid()</function>,
-                <function>sd_session_get_service()</function> and
-                <function>sd_session_get_seat()</function> interfaces
-                are available as shared library, which can be compiled
-                and linked to with the
-                <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_pid_get_session</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd_uid_get_seats.3 b/man/sd_uid_get_seats.3
deleted file mode 100644 (file)
index 616dee5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_uid_get_state.3
diff --git a/man/sd_uid_get_sessions.3 b/man/sd_uid_get_sessions.3
deleted file mode 100644 (file)
index 616dee5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_uid_get_state.3
diff --git a/man/sd_uid_get_state.3 b/man/sd_uid_get_state.3
deleted file mode 100644 (file)
index 467f4cd..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-'\" t
-.\"     Title: sd_uid_get_state
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sd_uid_get_state
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SD_UID_GET_STATE" "3" "02/15/2012" "systemd" "sd_uid_get_state"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sd_uid_get_state, sd_uid_is_on_seat, sd_uid_get_sessions, sd_uid_get_seats \- Determine login state of a specific Unix user ID
-.SH "SYNOPSIS"
-.sp
-.ft B
-.nf
-#include <systemd/sd\-login\&.h>
-.fi
-.ft
-.HP \w'int\ sd_uid_get_state('u
-.BI "int sd_uid_get_state(uid_t\ " "pid" ", char**\ " "state" ");"
-.HP \w'int\ sd_uid_is_on_seat('u
-.BI "int sd_uid_is_on_seat(uid_t\ " "pid" ", int\ " "require_active" ", const\ char*\ " "seat" ");"
-.HP \w'int\ sd_uid_get_sessions('u
-.BI "int sd_uid_get_sessions(uid_t\ " "pid" ", int\ " "require_active" ", char***\ " "sessions" ");"
-.HP \w'int\ sd_uid_get_seats('u
-.BI "int sd_uid_get_seats(uid_t\ " "pid" ", int\ " "require_active" ", char***\ " "seats" ");"
-.SH "DESCRIPTION"
-.PP
-\fBsd_uid_get_state()\fR
-may be used to determine the login state of a specific Unix user identifier\&. The following states are currently known:
-offline
-(user not logged in at all),
-lingering
-(user not logged in, but some user services running),
-online
-(user logged in, but not active),
-active
-(user logged in on an active seat)\&. In the future additional states might be defined, client code should be written to be robust in regards to additional state strings being returned\&. The returned string needs to be freed with the libc
-\fBfree\fR(3)
-call after use\&.
-.PP
-\fBsd_uid_is_on_seat()\fR
-may be used to determine whether a specific user is logged in or active on a specific seat\&. Accepts a Unix user identifier and a seat identifier string as parameters\&. The
-\fIrequire_active\fR
-parameter is a boolean\&. If non\-zero (true) this function will test if the user is active (i\&.e\&. has a session that is in the foreground and accepting user input) on the specified seat, otherwise (false) only if the user is logged in (and possibly inactive) on the specified seat\&.
-.PP
-\fBsd_uid_get_sessions()\fR
-may be used to determine the current sessions of the specified user\&. Acceptes a Unix user identifier as parameter\&. The
-\fIrequire_active\fR
-boolean parameter controls whether the returned list shall consist of only those sessions where the user is currently active (true) or where the user is currently logged in at all, possibly inactive (false)\&. The call returns a NULL terminated string array of session identifiers in
-\fIsessions\fR
-which needs to be freed by the caller with the libc
-\fBfree\fR(3)
-call after use, including all the strings referenced\&. If the string array parameter is passed as NULL the array will not be filled in, but the return code still indicates the number of current sessions\&. Note that instead of an empty array NULL may be returned and should be considered equivalent to an empty array\&.
-.PP
-Similar,
-\fBsd_uid_get_seats()\fR
-may be used to determine the list of seats on which the user currently has sessions\&. Similar semantics apply, however note that the user may have multiple sessions on the same seat as well as sessions with no attached seat and hence the number of entries in the returned array may differ from the one returned by
-\fBsd_uid_get_sessions()\fR\&.
-.SH "RETURN VALUE"
-.PP
-On success
-\fBsd_uid_get_state()\fR
-returns 0 or a positive integer\&. If the test succeeds
-\fBsd_uid_is_on_seat()\fR
-returns a positive integer, if it fails 0\&.
-\fBsd_uid_get_sessions()\fR
-and
-\fBsd_uid_get_seats()\fR
-return the number of entries in the returned arrays\&. On failure, these calls return a negative errno\-style error code\&.
-.SH "NOTES"
-.PP
-The
-\fBsd_uid_get_state()\fR,
-\fBsd_uid_is_on_seat()\fR,
-\fBsd_uid_get_sessions()\fR, and
-\fBsd_uid_get_seats()\fR
-interfaces are available as shared library, which can be compiled and linked to with the
-libsystemd\-login
-\fBpkg-config\fR(1)
-file\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsd-login\fR(7),
-\fBsd_pid_get_owner_uid\fR(3)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml
deleted file mode 100644 (file)
index 6777625..0000000
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="sd_uid_get_state">
-
-        <refentryinfo>
-                <title>sd_uid_get_state</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>sd_uid_get_state</refentrytitle>
-                <manvolnum>3</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>sd_uid_get_state</refname>
-                <refname>sd_uid_is_on_seat</refname>
-                <refname>sd_uid_get_sessions</refname>
-                <refname>sd_uid_get_seats</refname>
-                <refpurpose>Determine login state of a specific Unix user ID</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <funcsynopsis>
-                        <funcsynopsisinfo>#include &lt;systemd/sd-login.h&gt;</funcsynopsisinfo>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_uid_get_state</function></funcdef>
-                                <paramdef>uid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>char** <parameter>state</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_uid_is_on_seat</function></funcdef>
-                                <paramdef>uid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>int <parameter>require_active</parameter></paramdef>
-                                <paramdef>const char* <parameter>seat</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_uid_get_sessions</function></funcdef>
-                                <paramdef>uid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>int <parameter>require_active</parameter></paramdef>
-                                <paramdef>char*** <parameter>sessions</parameter></paramdef>
-                        </funcprototype>
-
-                        <funcprototype>
-                                <funcdef>int <function>sd_uid_get_seats</function></funcdef>
-                                <paramdef>uid_t <parameter>pid</parameter></paramdef>
-                                <paramdef>int <parameter>require_active</parameter></paramdef>
-                                <paramdef>char*** <parameter>seats</parameter></paramdef>
-                        </funcprototype>
-                </funcsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><function>sd_uid_get_state()</function> may be
-                used to determine the login state of a specific Unix
-                user identifier. The following states are currently
-                known: <literal>offline</literal> (user not logged in
-                at all), <literal>lingering</literal> (user not logged
-                in, but some user services running),
-                <literal>online</literal> (user logged in, but not
-                active), <literal>active</literal> (user logged in on
-                an active seat). In the future additional states might
-                be defined, client code should be written to be robust
-                in regards to additional state strings being
-                returned. The returned string needs to be freed with
-                the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use.</para>
-
-                <para><function>sd_uid_is_on_seat()</function> may be
-                used to determine whether a specific user is logged in
-                or active on a specific seat. Accepts a Unix user
-                identifier and a seat identifier string as
-                parameters. The <parameter>require_active</parameter>
-                parameter is a boolean. If non-zero (true) this
-                function will test if the user is active (i.e. has a
-                session that is in the foreground and accepting user
-                input) on the specified seat, otherwise (false) only
-                if the user is logged in (and possibly inactive) on
-                the specified seat.</para>
-
-                <para><function>sd_uid_get_sessions()</function> may
-                be used to determine the current sessions of the
-                specified user. Acceptes a Unix user identifier as
-                parameter. The <parameter>require_active</parameter>
-                boolean parameter controls whether the returned list
-                shall consist of only those sessions where the user is
-                currently active (true) or where the user is currently
-                logged in at all, possibly inactive (false). The call
-                returns a NULL terminated string array of session
-                identifiers in <parameter>sessions</parameter> which
-                needs to be freed by the caller with the libc
-                <citerefentry><refentrytitle>free</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                call after use, including all the strings
-                referenced. If the string array parameter is passed as
-                NULL the array will not be filled in, but the return
-                code still indicates the number of current
-                sessions. Note that instead of an empty array NULL may
-                be returned and should be considered equivalent to an
-                empty array.</para>
-
-                <para>Similar, <function>sd_uid_get_seats()</function>
-                may be used to determine the list of seats on which
-                the user currently has sessions. Similar semantics
-                apply, however note that the user may have
-                multiple sessions on the same seat as well as sessions
-                with no attached seat and hence the number of entries
-                in the returned array may differ from the one returned
-                by <function>sd_uid_get_sessions()</function>.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Return Value</title>
-
-                <para>On success
-                <function>sd_uid_get_state()</function> returns 0 or a
-                positive integer. If the test succeeds
-                <function>sd_uid_is_on_seat()</function> returns a
-                positive integer, if it fails
-                0. <function>sd_uid_get_sessions()</function> and
-                <function>sd_uid_get_seats()</function> return the
-                number of entries in the returned arrays. On failure,
-                these calls return a negative errno-style error
-                code.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Notes</title>
-
-                <para>The <function>sd_uid_get_state()</function>,
-                <function>sd_uid_is_on_seat()</function>,
-                <function>sd_uid_get_sessions()</function>, and
-                <function>sd_uid_get_seats()</function> interfaces are
-                available as shared library, which can be compiled and
-                linked to with the <literal>libsystemd-login</literal>
-                <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                file.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd-login</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>sd_pid_get_owner_uid</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/sd_uid_is_on_seat.3 b/man/sd_uid_is_on_seat.3
deleted file mode 100644 (file)
index 616dee5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-.so man3/sd_uid_get_state.3
diff --git a/man/shutdown.8 b/man/shutdown.8
deleted file mode 100644 (file)
index 8b84f08..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-'\" t
-.\"     Title: shutdown
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: shutdown
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SHUTDOWN" "8" "02/15/2012" "systemd" "shutdown"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-shutdown \- Halt, power\-off or reboot the machine
-.SH "SYNOPSIS"
-.HP \w'\fBshutdown\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[TIME]\fR\fB\ \fR\fB[WALL...]\fR\ 'u
-\fBshutdown \fR\fB[OPTIONS...]\fR\fB \fR\fB[TIME]\fR\fB \fR\fB[WALL...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBshutdown\fR
-may be used to halt, power\-off or reboot the machine\&.
-.PP
-The first argument may be a time string (which is usually
-now)\&. Optionally, this may be followed by a wall message to be sent to all logged\-in users before going down\&.
-.PP
-The time string may either be in the format
-hh:mm
-for hour/minutes specifying the time to execute the shutdown at, specified in 24h clock format\&. Alternatively it may be in the syntax
-+m
-referring to the specified number of minutes m from now\&.
-now
-is an alias for
-+0, i\&.e\&. for triggering an immediate shutdown\&. If no time argument is specified,
-+1
-is implied\&.
-.PP
-Note that to specify a wall message you must specify a time argument, too\&.
-.PP
-If the time argument is used, 5 minutes before the system goes down the
-/etc/nologin
-file is created to ensure that further logins shall not be allowed\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-H\fR, \fB\-\-halt\fR
-.RS 4
-Halt the machine\&.
-.RE
-.PP
-\fB\-P\fR, \fB\-\-poweroff\fR
-.RS 4
-Power\-off the machine (the default)\&.
-.RE
-.PP
-\fB\-r\fR, \fB\-\-reboot\fR
-.RS 4
-Reboot the machine\&.
-.RE
-.PP
-\fB\-h\fR
-.RS 4
-Equivalent to
-\fB\-\-poweroff\fR, unless
-\fB\-\-halt\fR
-is specified\&.
-.RE
-.PP
-\fB\-k\fR
-.RS 4
-Don\*(Aqt halt, power\-off, reboot, just write wall message\&.
-.RE
-.PP
-\fB\-\-no\-wall\fR
-.RS 4
-Don\*(Aqt send wall message before halt, power\-off, reboot\&.
-.RE
-.PP
-\fB\-c\fR
-.RS 4
-Cancel a pending shutdown\&. This may be used cancel the effect of an invocation of
-\fBshutdown\fR
-with a time argument that is not
-+0
-or
-now\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "NOTES"
-.PP
-This is a legacy command available for compatibility only\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBhalt\fR(8),
-\fBwall\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/sysctl.d.5 b/man/sysctl.d.5
deleted file mode 100644 (file)
index b8a28ce..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-'\" t
-.\"     Title: sysctl.d
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: sysctl.d
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSCTL\&.D" "5" "02/15/2012" "systemd" "sysctl.d"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-sysctl.d \- Configure kernel parameters at boot
-.SH "SYNOPSIS"
-.PP
-/usr/lib/sysctl\&.d/*\&.conf
-.PP
-/etc/sysctl\&.d/*\&.conf
-.PP
-/run/sysctl\&.d/*\&.conf
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\fR
-uses configuration files from the above directories to configure
-\fBsysctl\fR(8)
-kernel parameters to load during boot\&.
-.SH "CONFIGURATION FORMAT"
-.PP
-The configuration files should simply contain a list of variable assignments, separated by newlines\&. Empty lines and lines whose first non\-whitespace character is # or ; are ignored\&.
-.PP
-Note that both / and \&. are accepted as separators in sysctl variable names\&.
-.PP
-Each configuration file is named in the style of
-<program>\&.conf\&. Files in
-/etc/
-overwrite files with the same name in
-/usr/lib/\&. Files in
-/run
-overwrite files with the same name in
-/etc/
-and
-/usr/lib/\&. Packages should install their configuration files in
-/usr/lib/, files in
-/etc/
-are reserved for the local administration, which possibly decides to overwrite the configurations installed from packages\&. All files are sorted by filename in alphabetical order, regardless in which of the directories they reside, to ensure that a specific configuration file takes precedence over another file with an alphabetically later name\&.
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&/etc/sysctl.d/domain-name.conf example:\fR
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-# Set kernel YP domain name
-kernel\&.domainname=example\&.com
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsysctl\fR(8),
-\fBsysctl.conf\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemadm.1 b/man/systemadm.1
deleted file mode 100644 (file)
index 4787677..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-'\" t
-.\"     Title: systemadm
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemadm
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMADM" "1" "02/15/2012" "systemd" "systemadm"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemadm \- Graphical frontend for the systemd system and service manager
-.SH "SYNOPSIS"
-.HP \w'\fBsystemadm\ \fR\fB[OPTIONS...]\fR\ 'u
-\fBsystemadm \fR\fB[OPTIONS...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemadm\fR
-is a graphical frontend for the systemd system and service manager and allows introspection and control of systemd\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-h\fR, \fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-system\fR
-.RS 4
-Connect to the systemd system manager\&. (Default)
-.RE
-.PP
-\fB\-\-user\fR
-.RS 4
-Connect to the systemd manager of the calling user\&.
-.RE
-.PP
-In addition to this a number of parameters common to all Gtk+ programs are supported\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemctl.1 b/man/systemctl.1
deleted file mode 100644 (file)
index cc29490..0000000
+++ /dev/null
@@ -1,644 +0,0 @@
-'\" t
-.\"     Title: systemctl
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemctl
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMCTL" "1" "02/15/2012" "systemd" "systemctl"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemctl \- Control the systemd system and service manager
-.SH "SYNOPSIS"
-.HP \w'\fBsystemctl\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB{COMMAND}\fR\fB\ \fR\fB[NAME...]\fR\ 'u
-\fBsystemctl \fR\fB[OPTIONS...]\fR\fB \fR\fB{COMMAND}\fR\fB \fR\fB[NAME...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemctl\fR
-may be used to introspect and control the state of the
-\fBsystemd\fR(1)
-system and service manager\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-help\fR, \fB\-h\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-version\fR
-.RS 4
-Prints a short version string and exits\&.
-.RE
-.PP
-\fB\-\-type=\fR, \fB\-t\fR
-.RS 4
-When listing units, limit display to certain unit types\&. If not specified units of all types will be shown\&. The argument should be a unit type name such as
-\fBservice\fR,
-\fBsocket\fR
-and similar\&.
-.RE
-.PP
-\fB\-\-property=\fR, \fB\-p\fR
-.RS 4
-When showing unit/job/manager properties, limit display to certain properties as specified as argument\&. If not specified all set properties are shown\&. The argument should be a property name, such as
-MainPID\&. If specified more than once all properties with the specified names are shown\&.
-.RE
-.PP
-\fB\-\-all\fR, \fB\-a\fR
-.RS 4
-When listing units, show all units, regardless of their state, including inactive units\&. When showing unit/job/manager properties, show all properties regardless whether they are set or not\&.
-.RE
-.PP
-\fB\-\-failed\fR
-.RS 4
-When listing units, show only failed units\&. Do not confuse with
-\fB\-\-fail\fR\&.
-.RE
-.PP
-\fB\-\-full\fR
-.RS 4
-Do not ellipsize unit names and truncate unit descriptions in the output of
-\fBlist\-units\fR
-and
-\fBlist\-jobs\fR\&.
-.RE
-.PP
-\fB\-\-fail\fR
-.RS 4
-If the requested operation conflicts with a pending unfinished job, fail the command\&. If this is not specified the requested operation will replace the pending job, if necessary\&. Do not confuse with
-\fB\-\-failed\fR\&.
-.RE
-.PP
-\fB\-\-ignore\-dependencies\fR
-.RS 4
-When enqueuing a new job ignore all its dependencies and execute it immediately\&. If passed no required units of the unit passed will be pulled in, and no ordering dependencies will be honoured\&. This is mostly a debugging and rescue tool for the administrator and should not be used by applications\&.
-.RE
-.PP
-\fB\-\-quiet\fR, \fB\-q\fR
-.RS 4
-Suppress output to STDOUT in
-\fBsnapshot\fR,
-\fBis\-active\fR,
-\fBenable\fR
-and
-\fBdisable\fR\&.
-.RE
-.PP
-\fB\-\-no\-block\fR
-.RS 4
-Do not synchronously wait for the requested operation to finish\&. If this is not specified the job will be verified, enqueued and
-\fBsystemctl\fR
-will wait until it is completed\&. By passing this argument it is only verified and enqueued\&.
-.RE
-.PP
-\fB\-\-no\-legend\fR
-.RS 4
-Do not print a legend, i\&.e\&. the column headers and the footer with hints\&.
-.RE
-.PP
-\fB\-\-no\-pager\fR
-.RS 4
-Do not pipe output into a pager\&.
-.RE
-.PP
-\fB\-\-system\fR
-.RS 4
-Talk to the systemd system manager\&. (Default)
-.RE
-.PP
-\fB\-\-user\fR
-.RS 4
-Talk to the systemd manager of the calling user\&.
-.RE
-.PP
-\fB\-\-order\fR, \fB\-\-require\fR
-.RS 4
-When used in conjunction with the
-\fBdot\fR
-command (see below), selects which dependencies are shown in the dependency graph\&. If
-\fB\-\-order\fR
-is passed only dependencies of type
-\fIAfter=\fR
-or
-\fIBefore=\fR
-are shown\&. If
-\fB\-\-require\fR
-is passed only dependencies of type
-\fIRequires=\fR,
-\fIRequiresOverridable=\fR,
-\fIRequisite=\fR,
-\fIRequisiteOverridable=\fR,
-\fIWants=\fR
-and
-\fIConflicts=\fR
-are shown\&. If neither is passed, shows dependencies of all these types\&.
-.RE
-.PP
-\fB\-\-no\-wall\fR
-.RS 4
-Don\*(Aqt send wall message before halt, power\-off, reboot\&.
-.RE
-.PP
-\fB\-\-global\fR
-.RS 4
-When used with
-\fBenable\fR
-and
-\fBdisable\fR, operate on the global user configuration directory, thus enabling or disabling a unit file globally for all future logins of all users\&.
-.RE
-.PP
-\fB\-\-no\-reload\fR
-.RS 4
-When used with
-\fBenable\fR
-and
-\fBdisable\fR, do not implicitly reload daemon configuration after executing the changes\&.
-.RE
-.PP
-\fB\-\-no\-ask\-password\fR
-.RS 4
-When used with
-\fBstart\fR
-and related commands, disables asking for passwords\&. Background services may require input of a password or passphrase string, for example to unlock system hard disks or cryptographic certificates\&. Unless this option is specified and the command is invoked from a terminal
-\fBsystemctl\fR
-will query the user on the terminal for the necessary secrets\&. Use this option to switch this behavior off\&. In this case the password must be supplied by some other means (for example graphical password agents) or the service might fail\&.
-.RE
-.PP
-\fB\-\-kill\-who=\fR
-.RS 4
-When used with
-\fBkill\fR, choose which processes to kill\&. Must be one of
-\fBmain\fR,
-\fBcontrol\fR
-or
-\fBall\fR
-to select whether to kill only the main process of the unit, the control process or all processes of the unit\&. If omitted defaults to
-\fBall\fR\&.
-.RE
-.PP
-\fB\-\-signal=\fR, \fB\-s\fR
-.RS 4
-When used with
-\fBkill\fR, choose which signal to send to selected processes\&. Must be one of the well known signal specifiers such as SIGTERM, SIGINT or SIGSTOP\&. If omitted defaults to
-\fBSIGTERM\fR\&.
-.RE
-.PP
-\fB\-\-force\fR, \fB\-f\fR
-.RS 4
-When used with
-\fBenable\fR, override any existing conflicting symlinks\&.
-When used with
-\fBhalt\fR,
-\fBpoweroff\fR,
-\fBreboot\fR
-or
-\fBkexec\fR
-execute selected operation without shutting down all units\&. However, all processes will be killed forcibly and all file systems are unmounted or remounted read\-only\&. This is hence a drastic but relatively safe option to request an immediate reboot\&.
-.RE
-.PP
-\fB\-\-root=\fR
-.RS 4
-When used with
-\fBenable\fR/\fBdisable\fR/\fBis\-enabled\fR
-(and related commands), use alternative root path when looking for unit files\&.
-.RE
-.PP
-\fB\-\-runtime\fR
-.RS 4
-When used with
-\fBenable\fR/\fBdisable\fR/\fBis\-enabled\fR
-(and related commands), make changes only temporarily, so that they are dropped on the next reboot\&. This will have the effect that changes are not made in subdirectories of
-/etc
-but in
-/run, with identical immediate effects, however, since the latter is lost on reboot, the changes are lost too\&.
-.RE
-.PP
-\fB\-H\fR, \fB\-\-host\fR
-.RS 4
-Execute operation remotely\&. Specify a hostname, or username and hostname separated by @, to connect to\&. This will use SSH to talk to the remote systemd instance\&.
-.RE
-.PP
-\fB\-P\fR, \fB\-\-privileged\fR
-.RS 4
-Acquire privileges via PolicyKit before executing the operation\&.
-.RE
-.PP
-The following commands are understood:
-.PP
-\fBlist\-units\fR
-.RS 4
-List known units\&.
-.RE
-.PP
-\fBstart [NAME\&.\&.\&.]\fR
-.RS 4
-Start (activate) one or more units specified on the command line\&.
-.RE
-.PP
-\fBstop [NAME\&.\&.\&.]\fR
-.RS 4
-Stop (deactivate) one or more units specified on the command line\&.
-.RE
-.PP
-\fBreload [NAME\&.\&.\&.]\fR
-.RS 4
-Asks all units listed on the command line to reload their configuration\&. Note that this will reload the service\-specific configuration, not the unit configuration file of systemd\&. If you want systemd to reload the configuration file of a unit use the
-\fBdaemon\-reload\fR
-command\&. In other words: for the example case of Apache, this will reload Apache\*(Aqs
-httpd\&.conf
-in the web server, not the
-apache\&.service
-systemd unit file\&.
-.sp
-This command should not be confused with the
-\fBdaemon\-reload\fR
-or
-\fBload\fR
-commands\&.
-.RE
-.PP
-\fBrestart [NAME\&.\&.\&.]\fR
-.RS 4
-Restart one or more units specified on the command line\&. If the units are not running yet they will be started\&.
-.RE
-.PP
-\fBtry\-restart [NAME\&.\&.\&.]\fR
-.RS 4
-Restart one or more units specified on the command line if the units are running\&. Do nothing if units are not running\&. Note that for compatibility with Red Hat init scripts
-\fBcondrestart\fR
-is equivalent to this command\&.
-.RE
-.PP
-\fBreload\-or\-restart [NAME\&.\&.\&.]\fR
-.RS 4
-Reload one or more units if they support it\&. If not, restart them instead\&. If the units are not running yet they will be started\&.
-.RE
-.PP
-\fBreload\-or\-try\-restart [NAME\&.\&.\&.]\fR
-.RS 4
-Reload one or more units if they support it\&. If not, restart them instead\&. Do nothing if the units are not running\&. Note that for compatibility with SysV init scripts
-\fBforce\-reload\fR
-is equivalent to this command\&.
-.RE
-.PP
-\fBisolate [NAME]\fR
-.RS 4
-Start the unit specified on the command line and its dependencies and stop all others\&.
-.sp
-This is similar to changing the runlevel in a traditional init system\&. The
-\fBisolate\fR
-command will immediately stop processes that are not enabled in the new unit, possibly including the graphical environment or terminal you are currently using\&.
-.sp
-Note that this works only on units where
-\fBAllowIsolate=\fR
-is enabled\&. See
-\fBsystemd.unit\fR(5)
-for details\&.
-.RE
-.PP
-\fBkill [NAME\&.\&.\&.]\fR
-.RS 4
-Send a signal to one or more processes of the unit\&. Use
-\fB\-\-kill\-who=\fR
-to select which process to kill\&. Use
-\fB\-\-kill\-mode=\fR
-to select the kill mode and
-\fB\-\-signal=\fR
-to select the signal to send\&.
-.RE
-.PP
-\fBis\-active [NAME\&.\&.\&.]\fR
-.RS 4
-Check whether any of the specified units are active (i\&.e\&. running)\&. Returns an exit code 0 if at least one is active, non\-zero otherwise\&. Unless
-\fB\-\-quiet\fR
-is specified this will also print the current unit state to STDOUT\&.
-.RE
-.PP
-\fBstatus [NAME\&.\&.\&.|PID\&.\&.\&.]\fR
-.RS 4
-Show terse runtime status information about one or more units\&. This function is intended to generate human\-readable output\&. If you are looking for computer\-parsable output, use
-\fBshow\fR
-instead\&. If a PID is passed information about the unit the process of the PID belongs to is shown\&.
-.RE
-.PP
-\fBshow [NAME\&.\&.\&.|JOB\&.\&.\&.]\fR
-.RS 4
-Show properties of one or more units, jobs or the manager itself\&. If no argument is specified properties of the manager will be shown\&. If a unit name is specified properties of the unit is shown, and if a job id is specified properties of the job is shown\&. By default, empty properties are suppressed\&. Use
-\fB\-\-all\fR
-to show those too\&. To select specific properties to show use
-\fB\-\-property=\fR\&. This command is intended to be used whenever computer\-parsable output is required\&. Use
-\fBstatus\fR
-if you are looking for formatted human\-readable output\&.
-.RE
-.PP
-\fBreset\-failed [NAME\&.\&.\&.]\fR
-.RS 4
-Reset the \*(Aqfailed\*(Aq state of the specified units, or if no unit name is passed of all units\&. When a unit fails in some way (i\&.e\&. process exiting with non\-zero error code, terminating abnormally or timing out) it will automatically enter the \*(Aqfailed\*(Aq state and its exit code and status is recorded for introspection by the administrator until the service is restarted or reset with this command\&.
-.RE
-.PP
-\fBlist\-unit\-files\fR
-.RS 4
-List installed unit files\&.
-.RE
-.PP
-\fBenable [NAME\&.\&.\&.]\fR
-.RS 4
-Enable one or more unit files, as specified on the command line\&. This will create a number of symlinks as encoded in the
-[Install]
-sections of the unit files\&. After the symlinks have been created the systemd configuration is reloaded (in a way that is equivalent to
-\fBdaemon\-reload\fR) to ensure the changes are taken into account immediately\&. Note that this does not have the effect that any of the units enabled are also started at the same time\&. If this is desired a separate
-\fBstart\fR
-command must be invoked for the unit\&.
-.sp
-This command will print the actions executed\&. This output may be suppressed by passing
-\fB\-\-quiet\fR\&.
-.sp
-Note that this operation creates only the suggested symlinks for the units\&. While this command is the recommended way to manipulate the unit configuration directory, the administrator is free to make additional changes manually, by placing or removing symlinks in the directory\&. This is particularly useful to create configurations that deviate from the suggested default installation\&. In this case the administrator must make sure to invoke
-\fBdaemon\-reload\fR
-manually as necessary, to ensure his changes are taken into account\&.
-.sp
-Enabling units should not be confused with starting (activating) units, as done by the
-\fBstart\fR
-command\&. Enabling and starting units is orthogonal: units may be enabled without being started and started without being enabled\&. Enabling simply hooks the unit into various suggested places (for example, so that the unit is automatically started on boot or when a particular kind of hardware is plugged in)\&. Starting actually spawns the daemon process (in case of service units), or binds the socket (in case of socket units), and so on\&.
-.sp
-Depending on whether
-\fB\-\-system\fR,
-\fB\-\-user\fR
-or
-\fB\-\-global\fR
-is specified this enables the unit for the system, for the calling user only or for all future logins of all users\&. Note that in the latter case no systemd daemon configuration is reloaded\&.
-.RE
-.PP
-\fBdisable [NAME\&.\&.\&.]\fR
-.RS 4
-Disables one or more units\&. This removes all symlinks to the specified unit files from the unit configuration directory, and hence undoes the changes made by
-\fBenable\fR\&. Note however that this removes all symlinks to the unit files (i\&.e\&. including manual additions), not just those actually created by
-\fBenable\fR\&. This call implicitly reloads the systemd daemon configuration after completing the disabling of the units\&. Note that this command does not implicitly stop the units that is being disabled\&. If this is desired an additional
-\fBstop\fRcommand should be executed afterwards\&.
-.sp
-This command will print the actions executed\&. This output may be suppressed by passing
-\fB\-\-quiet\fR\&.
-.PP
-This command honors
-\fB\-\-system\fR,
-\fB\-\-user\fR,
-\fB\-\-global\fR
-in a similar way as
-\fBenable\fR\&.
-.RE
-.PP
-\fBis\-enabled [NAME\&.\&.\&.]\fR
-.RS 4
-Checks whether any of the specified unit files is enabled (as with
-\fBenable\fR)\&. Returns an exit code of 0 if at least one is enabled, non\-zero otherwise\&. Prints the current enable status\&. To suppress this output use
-\fB\-\-quiet\fR\&.
-.RE
-.PP
-\fBreenable [NAME\&.\&.\&.]\fR
-.RS 4
-Reenable one or more unit files, as specified on the command line\&. This is a combination of
-\fBdisable\fR
-and
-\fBenable\fR
-and is useful to reset the symlinks a unit is enabled with to the defaults configured in the
-[Install]
-section of the unit file\&.
-.RE
-.PP
-\fBpreset [NAME\&.\&.\&.]\fR
-.RS 4
-Reset one or more unit files, as specified on the command line, to the defaults configured in a preset file\&. This has the same effect as
-\fBdisable\fR
-or
-\fBenable\fR, depending how the unit is listed in the preset files\&.
-.RE
-.PP
-\fBmask [NAME\&.\&.\&.]\fR
-.RS 4
-Mask one or more unit files, as specified on the command line\&. This will link these units to
-/dev/null, making it impossible to start them\&. This is a stronger version of
-\fBdisable\fR, since it prohibits all kinds of activation of the unit, including manual activation\&. Use this option with care\&.
-.RE
-.PP
-\fBunmask [NAME\&.\&.\&.]\fR
-.RS 4
-Unmask one or more unit files, as specified on the command line\&. This will undo the effect of
-\fBmask\fR\&.
-.RE
-.PP
-\fBlink [NAME\&.\&.\&.]\fR
-.RS 4
-Link a unit file that is not in the unit file search paths into the unit file search path\&. This requires an absolute path to a unit file\&. The effect of this can be undone with
-\fBdisable\fR\&. The effect of this command is that a unit file is available for
-\fBstart\fR
-and other commands although it isn\*(Aqt installed directly in the unit search path\&.
-.RE
-.PP
-\fBload [NAME\&.\&.\&.]\fR
-.RS 4
-Load one or more units specified on the command line\&. This will simply load their configuration from disk, but not start them\&. To start them you need to use the
-\fBstart\fR
-command which will implicitly load a unit that has not been loaded yet\&. Note that systemd garbage collects loaded units that are not active or referenced by an active unit\&. This means that units loaded this way will usually not stay loaded for long\&. Also note that this command cannot be used to reload unit configuration\&. Use the
-\fBdaemon\-reload\fR
-command for that\&. All in all, this command is of little use except for debugging\&.
-.sp
-This command should not be confused with the
-\fBdaemon\-reload\fR
-or
-\fBreload\fR
-commands\&.
-.RE
-.PP
-\fBlist\-jobs\fR
-.RS 4
-List jobs that are in progress\&.
-.RE
-.PP
-\fBcancel [JOB\&.\&.\&.]\fR
-.RS 4
-Cancel one or more jobs specified on the command line by their numeric job IDs\&. If no job id is specified, cancel all pending jobs\&.
-.RE
-.PP
-\fBdump\fR
-.RS 4
-Dump server status\&. This will output a (usually very long) human readable manager status dump\&. Its format is subject to change without notice and should not be parsed by applications\&.
-.RE
-.PP
-\fBdot\fR
-.RS 4
-Generate textual dependency graph description in dot format for further processing with the GraphViz
-\fBdot\fR(1)
-tool\&. Use a command line like
-\fBsystemctl dot | dot \-Tsvg > systemd\&.svg\fR
-to generate a graphical dependency tree\&. Unless
-\fB\-\-order\fR
-or
-\fB\-\-require\fR
-is passed the generated graph will show both ordering and requirement dependencies\&.
-.RE
-.PP
-\fBsnapshot [NAME]\fR
-.RS 4
-Create a snapshot\&. If a snapshot name is specified, the new snapshot will be named after it\&. If none is specified an automatic snapshot name is generated\&. In either case, the snapshot name used is printed to STDOUT, unless
-\fB\-\-quiet\fR
-is specified\&.
-.sp
-A snapshot refers to a saved state of the systemd manager\&. It is implemented itself as a unit that is generated dynamically with this command and has dependencies on all units active at the time\&. At a later time the user may return to this state by using the
-\fBisolate\fR
-command on the snapshot unit\&.
-.PP
-Snapshots are only useful for saving and restoring which units are running or are stopped, they do not save/restore any other state\&. Snapshots are dynamic and lost on reboot\&.
-.RE
-.PP
-\fBdelete [NAME\&.\&.\&.]\fR
-.RS 4
-Remove a snapshot previously created with
-\fBsnapshot\fR\&.
-.RE
-.PP
-\fBdaemon\-reload\fR
-.RS 4
-Reload systemd manager configuration\&. This will reload all unit files and recreate the entire dependency tree\&. While the daemon is reloaded, all sockets systemd listens on on behalf of user configuration will stay accessible\&.
-.sp
-This command should not be confused with the
-\fBload\fR
-or
-\fBreload\fR
-commands\&.
-.RE
-.PP
-\fBdaemon\-reexec\fR
-.RS 4
-Reexecute the systemd manager\&. This will serialize the manager state, reexecute the process and deserialize the state again\&. This command is of little use except for debugging and package upgrades\&. Sometimes it might be helpful as a heavy\-weight
-\fBdaemon\-reload\fR\&. While the daemon is reexecuted all sockets systemd listens on on behalf of user configuration will stay accessible\&.
-.RE
-.PP
-\fBshow\-environment\fR
-.RS 4
-Dump the systemd manager environment block\&. The environment block will be dumped in straight\-forward form suitable for sourcing into a shell script\&. This environment block will be passed to all processes the manager spawns\&.
-.RE
-.PP
-\fBset\-environment [NAME=VALUE\&.\&.\&.]\fR
-.RS 4
-Set one or more systemd manager environment variables, as specified on the command line\&.
-.RE
-.PP
-\fBunset\-environment [NAME\&.\&.\&.]\fR
-.RS 4
-Unset one or more systemd manager environment variables\&. If only a variable name is specified it will be removed regardless of its value\&. If a variable and a value are specified the variable is only removed if it has the specified value\&.
-.RE
-.PP
-\fBdefault\fR
-.RS 4
-Enter default mode\&. This is mostly equivalent to
-\fBstart default\&.target\fR\&.
-.RE
-.PP
-\fBrescue\fR
-.RS 4
-Enter rescue mode\&. This is mostly equivalent to
-\fBisolate rescue\&.target\fR
-but also prints a wall message to all users\&.
-.RE
-.PP
-\fBemergency\fR
-.RS 4
-Enter emergency mode\&. This is mostly equivalent to
-\fBisolate emergency\&.target\fR
-but also prints a wall message to all users\&.
-.RE
-.PP
-\fBhalt\fR
-.RS 4
-Shut down and halt the system\&. This is mostly equivalent to
-\fBstart halt\&.target\fR
-but also prints a wall message to all users\&. If combined with
-\fB\-\-force\fR
-shutdown of all running services is skipped, however all processes are killed and all file systems are unmounted or mounted read\-only, immediately followed by the system halt\&.
-.RE
-.PP
-\fBpoweroff\fR
-.RS 4
-Shut down and power\-off the system\&. This is mostly equivalent to
-\fBstart poweroff\&.target\fR
-but also prints a wall message to all users\&. If combined with
-\fB\-\-force\fR
-shutdown of all running services is skipped, however all processes are killed and all file systems are unmounted or mounted read\-only, immediately followed by the powering off\&.
-.RE
-.PP
-\fBreboot\fR
-.RS 4
-Shut down and reboot the system\&. This is mostly equivalent to
-\fBstart reboot\&.target\fR
-but also prints a wall message to all users\&. If combined with
-\fB\-\-force\fR
-shutdown of all running services is skipped, however all processes are killed and all file systems are unmounted or mounted read\-only, immediately followed by the reboot\&.
-.RE
-.PP
-\fBkexec\fR
-.RS 4
-Shut down and reboot the system via kexec\&. This is mostly equivalent to
-\fBstart kexec\&.target\fR
-but also prints a wall message to all users\&. If combined with
-\fB\-\-force\fR
-shutdown of all running services is skipped, however all processes are killed and all file systems are unmounted or mounted read\-only, immediately followed by the reboot\&.
-.RE
-.PP
-\fBexit\fR
-.RS 4
-Ask the systemd manager to quit\&. This is only supported for user service managers (i\&.e\&. in conjunction with the
-\fB\-\-user\fR
-option) and will fail otherwise\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "ENVIRONMENT"
-.PP
-\fI$SYSTEMD_PAGER\fR
-.RS 4
-Pager to use when
-\fB\-\-no\-pager\fR
-is not given; overrides
-\fI$PAGER\fR\&. Setting this to an empty string or the value
-cat
-is equivalent to passing
-\fB\-\-no\-pager\fR\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemadm\fR(1),
-\fBsystemd-loginctl\fR(1),
-\fBsystemd.unit\fR(5),
-\fBsystemd.special\fR(7),
-\fBwall\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd-ask-password.1 b/man/systemd-ask-password.1
deleted file mode 100644 (file)
index 69d936e..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-'\" t
-.\"     Title: systemd-ask-password
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-ask-password
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-ASK\-PASSWO" "1" "02/15/2012" "systemd" "systemd-ask-password"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-ask-password \- Query the user for a system password
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-ask\-password\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[MESSAGE]\fR\ 'u
-\fBsystemd\-ask\-password \fR\fB[OPTIONS...]\fR\fB \fR\fB[MESSAGE]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-ask\-password\fR
-may be used to query a system password or passphrase from the user, using a question message specified on the command line\&. When run from a TTY it will query a password on the TTY and print it to STDOUT\&. When run with no TTY or with
-\fB\-\-no\-tty\fR
-it will query the password system\-wide and allow active users to respond via several agents\&. The latter is only available to privileged processes\&.
-.PP
-The purpose of this tool is to query system\-wide passwords \-\- that is passwords not attached to a specific user account\&. Examples include: unlocking encrypted hard disks when they are plugged in or at boot, entering an SSL certificate passphrase for web and VPN servers\&.
-.PP
-Existing agents are: a boot\-time password agent asking the user for passwords using Plymouth; a boot\-time password agent querying the user directly on the console; an agent requesting password input via a
-\fBwall\fR(1)
-message; an agent suitable for running in a GNOME session; a command line agent which can be started temporarily to process queued password requests; a TTY agent that is temporarily spawned during
-\fBsystemctl\fR(1)
-invocations\&.
-.PP
-Additional password agents may be implemented according to the
-\m[blue]\fBsystemd Password Agent Specification\fR\m[]\&\s-2\u[1]\d\s+2\&.
-.PP
-If a password is queried on a tty the user may press TAB to hide the asterisks normally shown for each character typed\&. Pressing Backspace as first key achieves the same effect\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-h\fR, \fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-icon=\fR
-.RS 4
-Specify an icon name alongside the password query, which may be used in all agents supporting graphical display\&. The icon name should follow the
-\m[blue]\fBXDG Icon Naming Specification\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.RE
-.PP
-\fB\-\-timeout=\fR
-.RS 4
-Specify the query timeout in seconds\&. Defaults to 90s\&.
-.RE
-.PP
-\fB\-\-no\-tty\fR
-.RS 4
-Never ask for password on current TTY even if one is available\&. Always use agent system\&.
-.RE
-.PP
-\fB\-\-accept\-cached\fR
-.RS 4
-If passed accept cached passwords, i\&.e\&. passwords previously typed in\&.
-.RE
-.PP
-\fB\-\-multiple\fR
-.RS 4
-When used in conjunction with
-\fB\-\-accept\-cached\fR
-accept multiple passwords\&. This will output one password per line\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBplymouth\fR(8),
-\fBwall\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-systemd Password Agent Specification
-.RS 4
-\%http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents
-.RE
-.IP " 2." 4
-XDG Icon Naming Specification
-.RS 4
-\%http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
-.RE
diff --git a/man/systemd-cgls.1 b/man/systemd-cgls.1
deleted file mode 100644 (file)
index 45a071c..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-'\" t
-.\"     Title: systemd-cgls
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-cgls
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-CGLS" "1" "02/15/2012" "systemd" "systemd-cgls"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-cgls \- Recursively show control group contents
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-cgls\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[CGROUP...]\fR\ 'u
-\fBsystemd\-cgls \fR\fB[OPTIONS...]\fR\fB \fR\fB[CGROUP...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-cgls\fR
-recursively shows the contents of the selected Linux control group hierarchy in a tree\&. If arguments are specified shows all member processes of the specified control groups plus all their subgroups and their members\&. The control groups may either be specified by their full file paths or are assumed in the systemd control group hierarchy\&. If no argument is specified and the current working directory is beneath the control group mount point
-/sys/fs/cgroup
-shows the contents of the control group the working directory refers to\&. Otherwise the full systemd control group hierarchy is shown\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-h\fR, \fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-no\-pager\fR
-.RS 4
-Do not pipe output into a pager\&.
-.RE
-.PP
-\fB\-k\fR
-.RS 4
-Include kernel threads in output\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBsystemd-cgtop\fR(1),
-\fBps\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 1e53147..8546e39 100644 (file)
 
                 <variablelist>
                         <varlistentry>
-                                <term><option>-h</option></term>
                                 <term><option>--help</option></term>
 
                                 <listitem><para>Prints a short help
                                 text and exits.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><option>--no-pager</option></term>
-
-                               <listitem><para>Do not pipe output into a
-                               pager.</para></listitem>
-                       </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-k</option></term>
-
-                                <listitem><para>Include kernel
-                                threads in output.</para></listitem>
-                        </varlistentry>
-
                 </variablelist>
 
         </refsect1>
                 <title>See Also</title>
                 <para>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-cgtop</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                        <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>
 
diff --git a/man/systemd-cgtop.1 b/man/systemd-cgtop.1
deleted file mode 100644 (file)
index 91ef1a2..0000000
+++ /dev/null
@@ -1,169 +0,0 @@
-'\" t
-.\"     Title: systemd-cgtop
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-cgtop
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-CGTOP" "1" "02/15/2012" "systemd" "systemd-cgtop"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-cgtop \- Show top control groups by their resource usage
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-cgtop\ \fR\fB[OPTIONS...]\fR\ 'u
-\fBsystemd\-cgtop \fR\fB[OPTIONS...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-cgtop\fR
-shows the top control groups of the local Linux control group hierarchy, ordered by their CPU, memory and disk I/O load\&. The display is refreshed in regular intervals (by default every 1s), similar in style to
-\fBtop\fR(1)\&.
-.PP
-Resource usage is only accounted for control groups in the relevant hierarchy, i\&.e\&. CPU usage is only accounted for control groups in the
-cpuacct
-hierarchy, memory usage only for those in
-memory
-and disk I/O usage for those in
-blkio\&.
-\fBsystemd\fR(1)
-by default places all services in their own control group in the
-cpuacct
-hierarchy, but not in
-memory
-nor
-blkio\&. If resource monitoring for these resources is required it is recommended to add
-blkio
-and
-memory
-to the
-\fIDefaultControllers=\fR
-setting in
-/etc/systemd/system\&.conf
-(see
-\fBsystemd.conf\fR(5)
-for details)\&. Alternatively, it is possible to enable resource accounting individually for services, by making use of the
-\fIControlGroup=\fR
-option in the unit files (See
-\fBsystemd.exec\fR(5)
-for details)\&.
-.PP
-To emphasize this: unless
-blkio
-and
-memory
-are enabled for the services in question with either of the options suggested above no resource accounting will be available for system services and the data shown by
-\fBsystemd\-cgtop\fR
-will be incomplete\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-h\fR, \fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-p\fR
-.RS 4
-Order by control group path name\&.
-.RE
-.PP
-\fB\-t\fR
-.RS 4
-Order by number of tasks in control group (i\&.e\&. threads and processes)\&.
-.RE
-.PP
-\fB\-c\fR
-.RS 4
-Order by CPU load\&.
-.RE
-.PP
-\fB\-m\fR
-.RS 4
-Order by memory usage\&.
-.RE
-.PP
-\fB\-i\fR
-.RS 4
-Order by disk I/O load\&.
-.RE
-.PP
-\fB\-d\fR, \fB\-\-delay=\fR
-.RS 4
-Specify refresh delay in seconds (or if one of
-ms,
-us,
-min
-is specified as unit in this time unit)\&.
-.RE
-.PP
-\fB\-\-depth=\fR
-.RS 4
-Maximum control group tree traversal depth\&. Specifies how deep
-\fBsystemd\-cgtop\fR
-shall traverse the control group hierarchies\&. If 0 is specified only the root group is monitored, for 1 only the first level of control groups is monitored, and so on\&. Defaults to 2\&.
-.RE
-.SH "KEYS"
-.PP
-\fBsystemd\-cgtop\fR
-is an interactive tool and may be controlled via user input using the following keys:
-.PP
-h
-.RS 4
-Shows a short help text\&.
-.RE
-.PP
-SPACE
-.RS 4
-Immediately refresh output\&.
-.RE
-.PP
-q
-.RS 4
-Terminate the program\&.
-.RE
-.PP
-p, t, c, m, i
-.RS 4
-Change ordering of control groups by path, number of tasks, CPU load, memory usage resp\&. IO load\&.
-.RE
-.PP
-+, \-
-.RS 4
-Increase, resp\&. decrease refresh delay\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBsystemd-cgls\fR(1),
-\fBtop\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd-cgtop.xml b/man/systemd-cgtop.xml
deleted file mode 100644 (file)
index 2d67ae5..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<!--
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
--->
-
-<refentry id="systemd-cgtop">
-
-        <refentryinfo>
-                <title>systemd-cgtop</title>
-                <productname>systemd</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Developer</contrib>
-                                <firstname>Lennart</firstname>
-                                <surname>Poettering</surname>
-                                <email>lennart@poettering.net</email>
-                        </author>
-                </authorgroup>
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>systemd-cgtop</refentrytitle>
-                <manvolnum>1</manvolnum>
-        </refmeta>
-
-        <refnamediv>
-                <refname>systemd-cgtop</refname>
-                <refpurpose>Show top control groups by their resource usage</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>systemd-cgtop <arg choice="opt" rep="repeat">OPTIONS</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>systemd-cgtop</command> shows the top
-                control groups of the local Linux control group
-                hierarchy, ordered by their CPU, memory and disk I/O load. The
-                display is refreshed in regular intervals (by default
-                every 1s), similar in style to
-                <citerefentry><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-
-                <para>Resource usage is only accounted for control
-                groups in the relevant hierarchy, i.e. CPU usage is
-                only accounted for control groups in the
-                <literal>cpuacct</literal> hierarchy, memory usage
-                only for those in <literal>memory</literal> and disk
-                I/O usage for those in
-                <literal>blkio</literal>. <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                by default places all services in their own control
-                group in the <literal>cpuacct</literal> hierarchy, but
-                not in <literal>memory</literal> nor
-                <literal>blkio</literal>. If resource monitoring for
-                these resources is required it is recommended to add
-                <literal>blkio</literal> and <literal>memory</literal>
-                to the <varname>DefaultControllers=</varname> setting
-                in <filename>/etc/systemd/system.conf</filename> (see
-                <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                for details). Alternatively, it is possible to enable
-                resource accounting individually for services, by
-                making use of the <varname>ControlGroup=</varname>
-                option in the unit files (See
-                <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                for details).</para>
-
-                <para>To emphasize this: unless
-                <literal>blkio</literal> and <literal>memory</literal>
-                are enabled for the services in question with either
-                of the options suggested above no resource accounting
-                will be available for system services and the data shown
-                by <command>systemd-cgtop</command> will be
-                incomplete.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <para>The following options are understood:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-p</option></term>
-
-                                <listitem><para>Order by control group
-                                path name.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-t</option></term>
-
-                                <listitem><para>Order by number of
-                                tasks in control
-                                group (i.e. threads and processes).</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-c</option></term>
-
-                                <listitem><para>Order by CPU load.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-m</option></term>
-
-                                <listitem><para>Order by memory usage.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-i</option></term>
-
-                                <listitem><para>Order by disk I/O load.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-d</option></term>
-                                <term><option>--delay=</option></term>
-
-                                <listitem><para>Specify refresh delay
-                                in seconds (or if one of
-                                <literal>ms</literal>,
-                                <literal>us</literal>,
-                                <literal>min</literal> is specified as
-                                unit in this time
-                                unit).</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--depth=</option></term>
-
-                                <listitem><para>Maximum control group
-                                tree traversal depth. Specifies how
-                                deep <command>systemd-cgtop</command>
-                                shall traverse the control group
-                                hierarchies. If 0 is specified only
-                                the root group is monitored, for 1
-                                only the first level of control groups
-                                is monitored, and so on. Defaults to
-                                2.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-
-        </refsect1>
-
-
-        <refsect1>
-                <title>Keys</title>
-
-                <para><command>systemd-cgtop</command> is an
-                interactive tool and may be controlled via user input
-                using the following keys:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term>h</term>
-
-                                <listitem><para>Shows a short help text.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term>SPACE</term>
-
-                                <listitem><para>Immediately refresh output.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term>q</term>
-
-                                <listitem><para>Terminate the program.</para></listitem>
-                        </varlistentry>
-
-
-                        <varlistentry>
-                                <term>p</term>
-                                <term>t</term>
-                                <term>c</term>
-                                <term>m</term>
-                                <term>i</term>
-
-                                <listitem><para>Change ordering of control groups
-                                by path, number of tasks, CPU load,
-                                memory usage resp. IO
-                                load.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term>+</term>
-                                <term>-</term>
-
-                                <listitem><para>Increase,
-                                resp. decrease refresh
-                                delay.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>systemd-cgls</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-                        <citerefentry><refentrytitle>top</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
diff --git a/man/systemd-loginctl.1 b/man/systemd-loginctl.1
deleted file mode 100644 (file)
index 4ca65ba..0000000
+++ /dev/null
@@ -1,253 +0,0 @@
-'\" t
-.\"     Title: systemd-loginctl
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-loginctl
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-LOGINCTL" "1" "02/15/2012" "systemd" "systemd-loginctl"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-loginctl \- Control the systemd login manager
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-loginctl\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB{COMMAND}\fR\fB\ \fR\fB[NAME...]\fR\ 'u
-\fBsystemd\-loginctl \fR\fB[OPTIONS...]\fR\fB \fR\fB{COMMAND}\fR\fB \fR\fB[NAME...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-loginctl\fR
-may be used to introspect and control the state of the
-\fBsystemd\fR(1)
-login manager\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-help\fR, \fB\-h\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-version\fR
-.RS 4
-Prints a short version string and exits\&.
-.RE
-.PP
-\fB\-\-property=\fR, \fB\-p\fR
-.RS 4
-When showing session/user/ properties, limit display to certain properties as specified as argument\&. If not specified all set properties are shown\&. The argument should be a property name, such as
-Sessions\&. If specified more than once all properties with the specified names are shown\&.
-.RE
-.PP
-\fB\-\-all\fR, \fB\-a\fR
-.RS 4
-When showing unit/job/manager properties, show all properties regardless whether they are set or not\&.
-.RE
-.PP
-\fB\-\-no\-pager\fR
-.RS 4
-Do not pipe output into a pager\&.
-.RE
-.PP
-\fB\-\-kill\-who=\fR
-.RS 4
-When used with
-\fBkill\-session\fR, choose which processes to kill\&. Must be one of
-\fBleader\fR, or
-\fBall\fR
-to select whether to kill only the leader process of the session or all processes of the session\&. If omitted defaults to
-\fBall\fR\&.
-.RE
-.PP
-\fB\-\-signal=\fR, \fB\-s\fR
-.RS 4
-When used with
-\fBkill\-session\fR
-or
-\fBkill\-user\fR, choose which signal to send to selected processes\&. Must be one of the well known signal specifiers such as SIGTERM, SIGINT or SIGSTOP\&. If omitted defaults to
-\fBSIGTERM\fR\&.
-.RE
-.PP
-\fB\-H\fR, \fB\-\-host\fR
-.RS 4
-Execute operation remotely\&. Specify a hostname, or username and hostname separated by @, to connect to\&. This will use SSH to talk to the remote login manager instance\&.
-.RE
-.PP
-\fB\-P\fR, \fB\-\-privileged\fR
-.RS 4
-Acquire privileges via PolicyKit before executing the operation\&.
-.RE
-.PP
-The following commands are understood:
-.PP
-\fBlist\-sessions\fR
-.RS 4
-List current sessions\&.
-.RE
-.PP
-\fBsession\-status [ID\&.\&.\&.]\fR
-.RS 4
-Show terse runtime status information about one or more sessions\&. This function is intended to generate human\-readable output\&. If you are looking for computer\-parsable output, use
-\fBshow\-session\fR
-instead\&.
-.RE
-.PP
-\fBshow\-session [ID\&.\&.\&.]\fR
-.RS 4
-Show properties of one or more sessions or the manager itself\&. If no argument is specified properties of the manager will be shown\&. If a session ID is specified properties of the session is shown\&. By default, empty properties are suppressed\&. Use
-\fB\-\-all\fR
-to show those too\&. To select specific properties to show use
-\fB\-\-property=\fR\&. This command is intended to be used whenever computer\-parsable output is required\&. Use
-\fBsession\-status\fR
-if you are looking for formatted human\-readable output\&.
-.RE
-.PP
-\fBactivate [ID\&.\&.\&.]\fR
-.RS 4
-Activate one or more sessions\&. This brings one or more sessions into the foreground, if another session is currently in the foreground on the respective seat\&.
-.RE
-.PP
-\fBlock\-session [ID\&.\&.\&.]\fR, \fBunlock\-session [ID\&.\&.\&.]\fR
-.RS 4
-Activates/deactivates the screen lock on one or more sessions, if the session supports it\&.
-.RE
-.PP
-\fBterminate\-session [ID\&.\&.\&.]\fR
-.RS 4
-Terminates a session\&. This kills all processes of the session and deallocates all resources attached to the session\&.
-.RE
-.PP
-\fBkill\-session [ID\&.\&.\&.]\fR
-.RS 4
-Send a signal to one or more processes of the session\&. Use
-\fB\-\-kill\-who=\fR
-to select which process to kill\&. Use
-\fB\-\-signal=\fR
-to select the signal to send\&.
-.RE
-.PP
-\fBlist\-users\fR
-.RS 4
-List currently logged in users\&.
-.RE
-.PP
-\fBuser\-status [USER\&.\&.\&.]\fR
-.RS 4
-Show terse runtime status information about one or more logged in users\&. This function is intended to generate human\-readable output\&. If you are looking for computer\-parsable output, use
-\fBshow\-user\fR
-instead\&. Users may be specified by their usernames or numeric user IDs\&.
-.RE
-.PP
-\fBshow\-user [USER\&.\&.\&.]\fR
-.RS 4
-Show properties of one or more users or the manager itself\&. If no argument is specified properties of the manager will be shown\&. If a user is specified properties of the user is shown\&. By default, empty properties are suppressed\&. Use
-\fB\-\-all\fR
-to show those too\&. To select specific properties to show use
-\fB\-\-property=\fR\&. This command is intended to be used whenever computer\-parsable output is required\&. Use
-\fBuser\-status\fR
-if you are looking for formatted human\-readable output\&.
-.RE
-.PP
-\fBenable\-linger [USER\&.\&.\&.]\fR, \fBdisable\-linger [USER\&.\&.\&.]\fR
-.RS 4
-Enable/disable user lingering for one or more users\&. If enabled for a specific user a user manager is spawned for him/her at boot, and kept around after logouts\&. This allows users who aren\*(Aqt logged in to run long\-running services\&.
-.RE
-.PP
-\fBterminate\-user [USER\&.\&.\&.]\fR
-.RS 4
-Terminates all sessions of a user\&. This kills all processes of all sessions of the user and deallocates all runtime resources attached to the user\&.
-.RE
-.PP
-\fBkill\-user [USER\&.\&.\&.]\fR
-.RS 4
-Send a signal to all processes of a user\&. Use
-\fB\-\-signal=\fR
-to select the signal to send\&.
-.RE
-.PP
-\fBlist\-seats\fR
-.RS 4
-List currently available seats on the local system\&.
-.RE
-.PP
-\fBseat\-status [NAME\&.\&.\&.]\fR
-.RS 4
-Show terse runtime status information about one or more seats\&. This function is intended to generate human\-readable output\&. If you are looking for computer\-parsable output, use
-\fBshow\-seat\fR
-instead\&.
-.RE
-.PP
-\fBshow\-seat [NAME\&.\&.\&.]\fR
-.RS 4
-Show properties of one or more seats or the manager itself\&. If no argument is specified properties of the manager will be shown\&. If a seat is specified properties of the seat are shown\&. By default, empty properties are suppressed\&. Use
-\fB\-\-all\fR
-to show those too\&. To select specific properties to show use
-\fB\-\-property=\fR\&. This command is intended to be used whenever computer\-parsable output is required\&. Use
-\fBseat\-status\fR
-if you are looking for formatted human\-readable output\&.
-.RE
-.PP
-\fBattach [NAME] [DEVICE\&.\&.\&.]\fR
-.RS 4
-Attach one or more devices to a seat\&. The devices should be specified via device paths in the
-/sys
-file system\&. To create a new seat attach at least one graphics card to a previously unused seat names\&. seat names may consist only of a\-z, A\-Z, 0\-9, "\-" and "_" and must be prefixed with "seat"\&. To drop assignment of a device to a specific seat just reassign it to a different seat, or use
-\fBflush\-devices\fR\&.
-.RE
-.PP
-\fBflush\-devices\fR
-.RS 4
-Removes all device assignments previously created with
-\fBattach\fR\&. After this call only automatically generated seats will remain and all seat hardware is assigned to them\&.
-.RE
-.PP
-\fBterminate\-seat [NAME\&.\&.\&.]\fR
-.RS 4
-Terminates all sessions on a seat\&. This kills all processes of all sessions on a seat and deallocates all runtime resources attached to them\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "ENVIRONMENT"
-.PP
-\fI$SYSTEMD_PAGER\fR
-.RS 4
-Pager to use when
-\fB\-\-no\-pager\fR
-is not given; overrides
-\fI$PAGER\fR\&. Setting this to an empty string or the value
-cat
-is equivalent to passing
-\fB\-\-no\-pager\fR\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBsystemd-logind.conf\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd-logind.conf.5 b/man/systemd-logind.conf.5
deleted file mode 100644 (file)
index 4b4e2f2..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-'\" t
-.\"     Title: systemd-logind.conf
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-logind.conf
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-LOGIND\&.CO" "5" "02/15/2012" "systemd" "systemd-logind.conf"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-logind.conf \- login manager configuration file
-.SH "SYNOPSIS"
-.PP
-systemd\-login\&.conf
-.SH "DESCRIPTION"
-.PP
-This files configures various parameters of the systemd login manager\&.
-.SH "OPTIONS"
-.PP
-All options are configured in the
-[Login]
-section:
-.PP
-\fINAutoVTs=\fR
-.RS 4
-Takes a positive integer\&. How many virtual terminals to allocate by default and when switched to autospawn
-autovt
-services on (if they are otherwise unused)\&. These services are instantiated from a template of
-autovt@\&.service
-with the virtual terminal TTY name, e\&.g\&.
-autovt@tty4\&.service\&. By default
-autovt@\&.service
-is linked to
-getty@\&.service, i\&.e\&. login prompts are started dynamically as the user switches to unused virtual terminals, and this parameter hence controls how many gettys are available on the virtual terminals\&. Defaults to 6\&. When set to 0, automatic spawning of
-autovt
-services is disabled\&.
-.RE
-.PP
-\fIKillUserProcesses=\fR
-.RS 4
-Takes a boolean argument\&. Configures whether the processes of a user should be killed when she or he completely logs out (i\&.e\&. after her/his last session ended)\&. Defaults to
-no\&.
-.RE
-.PP
-\fIKillOnlyUsers=\fR, \fIKillExcludeUsers=\fR
-.RS 4
-These settings take space separated lists of user names that influence the effect of
-\fIKillUserProcesses=\fR\&. If not empty only processes of users listed in
-\fIKillOnlyUsers\fR
-will be killed when they log out entirely\&. Processes of users listed in
-\fIKillExcludeUsers=\fR
-are excluded from being killed\&.
-\fIKillExcludeUsers=\fR
-defaults to
-root
-and takes precedence over
-\fIKillOnlyUsers=\fR
-which defaults to the empty list\&.
-.RE
-.PP
-\fIControllers=\fR, \fIResetControllers=\fR
-.RS 4
-These settings control the default control group hierarchies users logging are added to\&. When logging in users will get private control groups in all hierarchies listed in
-\fIControllers=\fR
-and be reset to the root control group in all hierarchies listed in
-\fIResetControllers=\fR\&.
-\fIControllers=\fR
-defaults to the empty list,
-\fIResetControllers=\fR
-defaults to
-cpu\&.
-.RE
-.PP
-Note that setting
-\fIKillUserProcesses=1\fR
-will break tools like
-\fBscreen\fR(1)\&.
-.PP
-Note that
-\fIKillUserProcesses=1\fR
-is a weaker version of
-\fIkill\-session\-processes=1\fR
-which may be configured per\-service for
-\fBpam_systemd\fR(8)\&. The latter kills processes of a session as soon as it ends, the former kills processes as soon as the last session of the user ends\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemd-loginctl\fR(1),
-\fBsystemd.conf\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd-notify.1 b/man/systemd-notify.1
deleted file mode 100644 (file)
index 5329a1e..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-'\" t
-.\"     Title: systemd-notify
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-notify
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-NOTIFY" "1" "02/15/2012" "systemd" "systemd-notify"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-notify \- Notify init system about start\-up completion and other daemon status changes
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-notify\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[VARIABLE=VALUE...]\fR\ 'u
-\fBsystemd\-notify \fR\fB[OPTIONS...]\fR\fB \fR\fB[VARIABLE=VALUE...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-notify\fR
-may be called by daemon scripts to notify the init system about status changes\&. It can be used to send arbitrary information, encoded in an environment\-block\-like list of strings\&. Most importantly it can be used for start\-up completion notification\&.
-.PP
-This is mostly just a wrapper around
-\fBsd_notify()\fR
-and makes this functionality available to shell scripts\&. For details see
-\fBsd_notify\fR(3)\&.
-.PP
-The command line may carry a list of environment variables to send as part of the status update\&.
-.PP
-Note that systemd will refuse reception of status updates from this command unless
-\fINotifyAccess=all\fR
-is set for the service unit this command is called from\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-h\fR, \fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-ready\fR
-.RS 4
-Inform the init system about service start\-up completion\&. This is equivalent to
-\fBsystemd\-notify READY=1\fR\&. For details about the semantics of this option see
-\fBsd_notify\fR(3)\&.
-.RE
-.PP
-\fB\-\-pid=\fR
-.RS 4
-Inform the init system about the main PID of the daemon\&. Takes a PID as argument\&. If the argument is omitted the PID of the process that invoked
-\fBsystemd\-notify\fR
-is used\&. This is equivalent to
-\fBsystemd\-notify MAINPID=$PID\fR\&. For details about the semantics of this option see
-\fBsd_notify\fR(3)\&.
-.RE
-.PP
-\fB\-\-status=\fR
-.RS 4
-Send a free\-form status string for the daemon to the init systemd\&. This option takes the status string as argument\&. This is equivalent to
-\fBsystemd\-notify STATUS=\&.\&.\&.\fR\&. For details about the semantics of this option see
-\fBsd_notify\fR(3)\&.
-.RE
-.PP
-\fB\-\-booted\fR
-.RS 4
-Returns 0 if the system was booted up with systemd, non\-zero otherwise\&. If this option is passed no message is sent\&. This option is hence unrelated to the other options\&. For details about the semantics of this option see
-\fBsd_booted\fR(3)\&.
-.RE
-.PP
-\fB\-\-readahead=\fR
-.RS 4
-Controls disk read\-ahead operations\&. The argument must be a string, and either "cancel", "done" or "noreplay"\&. For details about the semantics of this option see
-\fBsd_readahead\fR(3)\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&Start-up Notification and Status Updates\fR
-.PP
-A simple shell daemon that sends start\-up notifications after having set up its communication channel\&. During runtime it sends further status updates to the init system:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-#!/bin/bash
-
-mkfifo /tmp/waldo
-systemd\-notify \-\-ready \-\-status="Waiting for data\&.\&.\&."
-
-while : ; do
-        read a < /tmp/waldo
-        systemd\-notify \-\-status="Processing $a"
-
-        # Do something with $a \&.\&.\&.
-
-        systemd\-notify \-\-status="Waiting for data\&.\&.\&."
-done
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBsystemd.unit\fR(5),
-\fBsd_notify\fR(3),
-\fBsd_booted\fR(3)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd-nspawn.1 b/man/systemd-nspawn.1
deleted file mode 100644 (file)
index dc72a7a..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-'\" t
-.\"     Title: systemd-nspawn
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-nspawn
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-NSPAWN" "1" "02/15/2012" "systemd" "systemd-nspawn"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-nspawn \- Spawn a namespace container for debugging, testing and building
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-nspawn\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[COMMAND]\fR\fB\ \fR\fB[ARGS...]\fR\ 'u
-\fBsystemd\-nspawn \fR\fB[OPTIONS...]\fR\fB \fR\fB[COMMAND]\fR\fB \fR\fB[ARGS...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-nspawn\fR
-may be used to run a command or OS in a light\-weight namespace container\&. In many ways it is similar to
-\fBchroot\fR(1), but more powerful since it fully virtualizes the file system hierarchy, as well as the process tree, the various IPC subsystems and the host and domain name\&.
-.PP
-\fBsystemd\-nspawn\fR
-limits access to various kernel interfaces in the container to read\-only, such as
-/sys,
-/proc/sys
-or
-/sys/fs/selinux\&. Network interfaces and the system clock may not be changed from within the container\&. Device nodes may not be created\&. The host system cannot be rebooted and kernel modules may not be loaded from within the container\&.
-.PP
-Note that even though these security precautions are taken
-\fBsystemd\-nspawn\fR
-is not suitable for secure container setups\&. Many of the security features may be circumvented and are hence primarily useful to avoid accidental changes to the host system from the container\&. The intended use of this program is debugging and testing as well as building of packages, distributions and software involved with boot and systems management\&.
-.PP
-In contrast to
-\fBchroot\fR(1)
-\fBsystemd\-nspawn\fR
-may be used to boot full Linux\-based operating systems in a container\&.
-.PP
-Use a tool like
-\fBdebootstrap\fR(8)
-or
-\fBmock\fR(1)
-to set up an OS directory tree suitable as file system hierarchy for
-\fBsystemd\-nspawn\fR
-containers\&.
-.PP
-Note that
-\fBsystemd\-nspawn\fR
-will mount file systems private to the container to
-/dev,
-/run
-and similar\&. These will not be visible outside of the container, and their contents will be lost when the container exits\&.
-.PP
-Note that running two
-\fBsystemd\-nspawn\fR
-containers from the same directory tree will not make processes in them see each other\&. The PID namespace separation of the two containers is complete and the containers will share very few runtime objects except for the underlying file system\&.
-.SH "OPTIONS"
-.PP
-If no arguments are passed the container is set up and a shell started in it, otherwise the passed command and arguments are executed in it\&. The following options are understood:
-.PP
-\fB\-\-help\fR, \fB\-h\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-directory=\fR, \fB\-D\fR
-.RS 4
-Directory to use as file system root for the namespace container\&. If omitted the current directory will be used\&.
-.RE
-.PP
-\fB\-\-user=\fR, \fB\-u\fR
-.RS 4
-Run the command under specified user, create home directory and cd into it\&. As rest of systemd\-nspawn, this is not the security feature and limits against accidental changes only\&.
-.RE
-.PP
-\fB\-\-private\-network\fR
-.RS 4
-Turn off networking in the container\&. This makes all network interfaces unavailable in the container, with the exception of the loopback device\&.
-.RE
-.SH "EXAMPLE 1"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-# debootstrap \-\-arch=amd64 unstable debian\-tree/
-# systemd\-nspawn \-D debian\-tree/
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-This installs a minimal Debian unstable distribution into the directory
-debian\-tree/
-and then spawns a shell in a namespace container in it\&.
-.SH "EXAMPLE 2"
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-# mock \-\-init
-# systemd\-nspawn \-D /var/lib/mock/fedora\-rawhide\-x86_64/root/ /sbin/init systemd\&.log_level=debug
-.fi
-.if n \{\
-.RE
-.\}
-.PP
-This installs a minimal Fedora distribution into a subdirectory of
-/var/lib/mock/
-and then boots an OS in a namespace container in it, with systemd as init system, configured for debug logging\&.
-.SH "EXIT STATUS"
-.PP
-The exit code of the program executed in the container is returned\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBchroot\fR(1),
-\fBdebootstrap\fR(8),
-\fBmock\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index dbd2ff5..d5f8465 100644 (file)
                 <title>Example 2</title>
 
                 <programlisting># mock --init
-# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /sbin/init systemd.log_level=debug</programlisting>
+# systemd-nspawn -D /var/lib/mock/fedora-rawhide-x86_64/root/ /bin/systemd systemd.log_level=debug</programlisting>
 
                 <para>This installs a minimal Fedora distribution into
                 a subdirectory of <filename>/var/lib/mock/</filename>
diff --git a/man/systemd-tmpfiles.8 b/man/systemd-tmpfiles.8
deleted file mode 100644 (file)
index 4f8eb6a..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-'\" t
-.\"     Title: systemd-tmpfiles
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd-tmpfiles
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\-TMPFILES" "8" "02/15/2012" "systemd" "systemd-tmpfiles"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd-tmpfiles \- Creates, deletes and cleans up volatile and temporary files and directories\&.
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\-tmpfiles\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB[CONFIGURATION\ FILE...]\fR\ 'u
-\fBsystemd\-tmpfiles \fR\fB[OPTIONS...]\fR\fB \fR\fB[CONFIGURATION\ FILE...]\fR
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-tmpfiles\fR
-creates, deletes and cleans up volatile and temporary files and directories, based on the configuration from
-/etc/tmpfiles\&.d/\&. See
-\fBtmpfiles.d\fR(5)
-for more details on these files\&.
-.PP
-If invoked with no arguments applies all directives from all configuration files in
-/etc/tmpfiles\&.d/*\&.conf\&. If one or more absolute file names are passed on the command line only the directives in these files are applied\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-create\fR
-.RS 4
-If this option is passed all files and directories marked with f, F, d, D in the configuration files are created\&. Files and directories marked with z, Z have their ownership, access mode and security labels set\&.
-.RE
-.PP
-\fB\-\-clean\fR
-.RS 4
-If this option is passed all files and directories with an age parameter configured will be cleaned up\&.
-.RE
-.PP
-\fB\-\-remove\fR
-.RS 4
-If this option is passed all files and directories marked with r, R in the configuration files are removed\&.
-.RE
-.PP
-\fB\-\-prefix=PATH\fR
-.RS 4
-Only apply rules that apply to paths with the specified prefix\&.
-.RE
-.PP
-\fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-It is possible to combine
-\fB\-\-create\fR,
-\fB\-\-clean\fR, and
-\fB\-\-remove\fR
-in one invocation\&. For example, during boot the following command line is executed to ensure that all temporary and volatile directories are removed and created according to the configuration file:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-systemd\-tmpfiles \-\-remove \-\-create
-.fi
-.if n \{\
-.RE
-.\}
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBtmpfiles.d\fR(5),
-\fBtmpwatch\fR(8)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index bbb80b2..08d5c73 100644 (file)
@@ -84,9 +84,7 @@
                                 <listitem><para>If this option is passed all
                                 files and directories marked with f,
                                 F, d, D in the configuration files are
-                                created. Files and directories marked with z,
-                                Z have their ownership, access mode and security
-                                labels set.</para></listitem>
+                                created.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.1 b/man/systemd.1
deleted file mode 100644 (file)
index 49e6544..0000000
+++ /dev/null
@@ -1,821 +0,0 @@
-'\" t
-.\"     Title: systemd
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD" "1" "02/15/2012" "systemd" "systemd"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd, init \- systemd System and Service Manager
-.SH "SYNOPSIS"
-.HP \w'\fBsystemd\ \fR\fB[OPTIONS...]\fR\ 'u
-\fBsystemd \fR\fB[OPTIONS...]\fR
-.HP \w'\fBinit\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB{COMMAND}\fR\ 'u
-\fBinit \fR\fB[OPTIONS...]\fR\fB \fR\fB{COMMAND}\fR
-.SH "DESCRIPTION"
-.PP
-systemd is a system and service manager for Linux operating systems\&. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services\&.
-.PP
-For compatibility with SysV, if systemd is called as
-\fBinit\fR
-and a PID that is not 1, it will execute
-\fBtelinit\fR
-and pass all command line arguments unmodified\&. That means
-\fBinit\fR
-and
-\fBtelinit\fR
-are mostly equivalent when invoked from normal login sessions\&. See
-\fBtelinit\fR(8)
-for more information\&.
-.PP
-When run as system instance, systemd interprets the configuration file
-system\&.conf, otherwise
-user\&.conf\&. See
-\fBsystemd.conf\fR(5)
-for more information\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-h\fR, \fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-test\fR
-.RS 4
-Determine startup sequence, dump it and exit\&. This is an option useful for debugging only\&.
-.RE
-.PP
-\fB\-\-dump\-configuration\-items\fR
-.RS 4
-Dump understood unit configuration items\&. This outputs a terse but complete list of configuration items understood in unit definition files\&.
-.RE
-.PP
-\fB\-\-introspect=\fR
-.RS 4
-Extract D\-Bus interface introspection data\&. This is mostly useful at install time to generate data suitable for the D\-Bus interfaces repository\&. Optionally the interface name for the introspection data may be specified\&. If omitted, the introspection data for all interfaces is dumped\&.
-.RE
-.PP
-\fB\-\-unit=\fR
-.RS 4
-Set default unit to activate on startup\&. If not specified defaults to
-default\&.target\&.
-.RE
-.PP
-\fB\-\-system\fR, \fB\-\-user\fR
-.RS 4
-Tell systemd to run a system instance (resp\&. user instance), even if the process ID is not 1 (resp\&. is 1), i\&.e\&. systemd is not (resp\&. is) run as init process\&. Normally it should not be necessary to pass these options, as systemd automatically detects the mode it is started in\&. These options are hence of little use except for debugging\&. Note that it is not supported booting and maintaining a full system with systemd running in
-\fB\-\-system\fR
-mode, but PID not 1\&. In practice, passing
-\fB\-\-system\fR
-explicitly is only useful in conjunction with
-\fB\-\-test\fR\&.
-.RE
-.PP
-\fB\-\-dump\-core\fR
-.RS 4
-Dump core on crash\&. This switch has no effect when run as user instance\&.
-.RE
-.PP
-\fB\-\-crash\-shell\fR
-.RS 4
-Run shell on crash\&. This switch has no effect when run as user instance\&.
-.RE
-.PP
-\fB\-\-confirm\-spawn\fR
-.RS 4
-Ask for confirmation when spawning processes\&. This switch has no effect when run as user instance\&.
-.RE
-.PP
-\fB\-\-show\-status=\fR
-.RS 4
-Show terse service status information while booting\&. This switch has no effect when run as user instance\&. Takes a boolean argument which may be omitted which is interpreted as
-\fBtrue\fR\&.
-.RE
-.PP
-\fB\-\-sysv\-console=\fR
-.RS 4
-Controls whether output of SysV init scripts will be directed to the console\&. This switch has no effect when run as user instance\&. Takes a boolean argument which may be omitted which is interpreted as
-\fBtrue\fR\&.
-.RE
-.PP
-\fB\-\-log\-target=\fR
-.RS 4
-Set log target\&. Argument must be one of
-\fBconsole\fR,
-\fBjournal\fR,
-\fBsyslog\fR,
-\fBkmsg\fR,
-\fBjournal\-or\-kmsg\fR,
-\fBsyslog\-or\-kmsg\fR,
-\fBnull\fR\&.
-.RE
-.PP
-\fB\-\-log\-level=\fR
-.RS 4
-Set log level\&. As argument this accepts a numerical log level or the well\-known
-\fBsyslog\fR(3)
-symbolic names (lowercase):
-\fBemerg\fR,
-\fBalert\fR,
-\fBcrit\fR,
-\fBerr\fR,
-\fBwarning\fR,
-\fBnotice\fR,
-\fBinfo\fR,
-\fBdebug\fR\&.
-.RE
-.PP
-\fB\-\-log\-color=\fR
-.RS 4
-Highlight important log messages\&. Argument is a boolean value\&. If the argument is omitted it defaults to
-\fBtrue\fR\&.
-.RE
-.PP
-\fB\-\-log\-location=\fR
-.RS 4
-Include code location in log messages\&. This is mostly relevant for debugging purposes\&. Argument is a boolean value\&. If the argument is omitted it defaults to
-\fBtrue\fR\&.
-.RE
-.PP
-\fB\-\-default\-standard\-output=\fR, \fB\-\-default\-standard\-error=\fR
-.RS 4
-Sets the default output resp\&. error output for all services and sockets, i\&.e\&. controls the default for
-\fBStandardOutput=\fR
-resp\&.
-\fBStandardError=\fR
-(see
-\fBsystemd.exec\fR(5)
-for details)\&. Takes one of
-\fBinherit\fR,
-\fBnull\fR,
-\fBtty\fR,
-\fBjournal\fR,
-\fBjournal+console\fR,
-\fBsyslog\fR,
-\fBsyslog+console\fR,
-\fBkmsg\fR,
-\fBkmsg+console\fR\&. If the argument is omitted
-\fB\-\-default\-standard\-output=\fR
-defaults to
-\fBjournal\fR
-and
-\fB\-\-default\-standard\-error=\fR
-to
-\fBinherit\fR\&.
-.RE
-.SH "CONCEPTS"
-.PP
-systemd provides a dependency system between various entities called "units"\&. Units encapsulate various objects that are relevant for system boot\-up and maintenance\&. The majority of units are configured in unit configuration files, whose syntax and basic set of options is described in
-\fBsystemd.unit\fR(5), however some are created automatically from other configuration or dynamically from system state\&. Units may be \*(Aqactive\*(Aq (meaning started, bound, plugged in, \&.\&.\&. depending on the unit type, see below), or \*(Aqinactive\*(Aq (meaning stopped, unbound, unplugged, \&.\&.\&.), as well as in the process of being activated or deactivated, i\&.e\&. between the two states (these states are called \*(Aqactivating\*(Aq, \*(Aqdeactivating\*(Aq)\&. A special \*(Aqfailed\*(Aq state is available as well which is very similar to \*(Aqinactive\*(Aq and is entered when the service failed in some way (process returned error code on exit, or crashed, or an operation timed out)\&. If this state is entered the cause will be logged, for later reference\&. Note that the various unit types may have a number of additional substates, which are mapped to the five generalized unit states described here\&.
-.PP
-The following unit types are available:
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 1.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  1." 4.2
-.\}
-Service units, which control daemons and the processes they consist of\&. For details see
-\fBsystemd.service\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 2.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  2." 4.2
-.\}
-Socket units, which encapsulate local IPC or network sockets in the system, useful for socket\-based activation\&. For details about socket units see
-\fBsystemd.socket\fR(5), for details on socket\-based activation and other forms of activation, see
-\fBdaemon\fR(7)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 3.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  3." 4.2
-.\}
-Target units are useful to group units, or provide well\-known synchronization points during boot\-up, see
-\fBsystemd.target\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 4.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  4." 4.2
-.\}
-Device units expose kernel devices in systemd and may be used to implement device\-based activation\&. For details see
-\fBsystemd.device\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 5.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  5." 4.2
-.\}
-Mount units control mount points in the file system, for details see
-\fBsystemd.mount\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 6.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  6." 4.2
-.\}
-Automount units provide automount capabilities, for on\-demand mounting of file systems as well as parallelized boot\-up\&. See
-\fBsystemd.automount\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 7.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  7." 4.2
-.\}
-Snapshot units can be used to temporarily save the state of the set of systemd units, which later may be restored by activating the saved snapshot unit\&. For more information see
-\fBsystemd.snapshot\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 8.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  8." 4.2
-.\}
-Timer units are useful for triggering activation of other units based on timers\&. You may find details in
-\fBsystemd.timer\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04' 9.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "  9." 4.2
-.\}
-Swap units are very similar to mount units and encapsulate memory swap partitions or files of the operating system\&. They are described in
-\fBsystemd.swap\fR(5)\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'10.\h'+01'\c
-.\}
-.el \{\
-.sp -1
-.IP "10." 4.2
-.\}
-Path units may be used to activate other services when file system objects change or are modified\&. See
-\fBsystemd.path\fR(5)\&.
-.RE
-.PP
-Units are named as their configuration files\&. Some units have special semantics\&. A detailed list is available in
-\fBsystemd.special\fR(7)\&.
-.PP
-systemd knows various kinds of dependencies, including positive and negative requirement dependencies (i\&.e\&.
-\fIRequires=\fR
-and
-\fIConflicts=\fR) as well as ordering dependencies (\fIAfter=\fR
-and
-\fIBefore=\fR)\&. NB: ordering and requirement dependencies are orthogonal\&. If only a requirement dependency exists between two units (e\&.g\&.
-foo\&.service
-requires
-bar\&.service), but no ordering dependency (e\&.g\&.
-foo\&.service
-after
-bar\&.service) and both are requested to start, they will be started in parallel\&. It is a common pattern that both requirement and ordering dependencies are placed between two units\&. Also note that the majority of dependencies are implicitly created and maintained by systemd\&. In most cases it should be unnecessary to declare additional dependencies manually, however it is possible to do this\&.
-.PP
-Application programs and units (via dependencies) may request state changes of units\&. In systemd, these requests are encapsulated as \*(Aqjobs\*(Aq and maintained in a job queue\&. Jobs may succeed or can fail, their execution is ordered based on the ordering dependencies of the units they have been scheduled for\&.
-.PP
-On boot systemd activates the target unit
-default\&.target
-whose job is to activate on\-boot services and other on\-boot units by pulling them in via dependencies\&. Usually the unit name is just an alias (symlink) for either
-graphical\&.target
-(for fully\-featured boots into the UI) or
-multi\-user\&.target
-(for limited console\-only boots for use in embedded or server environments, or similar; a subset of graphical\&.target)\&. However it is at the discretion of the administrator to configure it as an alias to any other target unit\&. See
-\fBsystemd.special\fR(7)
-for details about these target units\&.
-.PP
-Processes systemd spawns are placed in individual Linux control groups named after the unit which they belong to in the private systemd hierarchy\&. (see
-\m[blue]\fBcgroups\&.txt\fR\m[]\&\s-2\u[1]\d\s+2
-for more information about control groups, or short "cgroups")\&. systemd uses this to effectively keep track of processes\&. Control group information is maintained in the kernel, and is accessible via the file system hierarchy (beneath
-/sys/fs/cgroup/systemd/), or in tools such as
-\fBps\fR(1)
-(\fBps xawf \-eo pid,user,cgroup,args\fR
-is particularly useful to list all processes and the systemd units they belong to\&.)\&.
-.PP
-systemd is compatible with the SysV init system to a large degree: SysV init scripts are supported and simply read as an alternative (though limited) configuration file format\&. The SysV
-/dev/initctl
-interface is provided, and compatibility implementations of the various SysV client tools are available\&. In addition to that, various established Unix functionality such as
-/etc/fstab
-or the
-utmp
-database are supported\&.
-.PP
-systemd has a minimal transaction system: if a unit is requested to start up or shut down it will add it and all its dependencies to a temporary transaction\&. Then, it will verify if the transaction is consistent (i\&.e\&. whether the ordering of all units is cycle\-free)\&. If it is not, systemd will try to fix it up, and removes non\-essential jobs from the transaction that might remove the loop\&. Also, systemd tries to suppress non\-essential jobs in the transaction that would stop a running service\&. Finally it is checked whether the jobs of the transaction contradict jobs that have already been queued, and optionally the transaction is aborted then\&. If all worked out and the transaction is consistent and minimized in its impact it is merged with all already outstanding jobs and added to the run queue\&. Effectively this means that before executing a requested operation, systemd will verify that it makes sense, fixing it if possible, and only failing if it really cannot work\&.
-.PP
-Systemd contains native implementations of various tasks that need to be executed as part of the boot process\&. For example, it sets the host name or configures the loopback network device\&. It also sets up and mounts various API file systems, such as
-/sys
-or
-/proc\&.
-.PP
-For more information about the concepts and ideas behind systemd please refer to the
-\m[blue]\fBOriginal Design Document\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.PP
-Note that some but not all interfaces provided by systemd are covered by the
-\m[blue]\fBInterface Stability Promise\fR\m[]\&\s-2\u[3]\d\s+2\&.
-.SH "DIRECTORIES"
-.PP
-System unit directories
-.RS 4
-The systemd system manager reads unit configuration from various directories\&. Packages that want to install unit files shall place them in the directory returned by
-\fBpkg\-config systemd \-\-variable=systemdsystemunitdir\fR\&. Other directories checked are
-/usr/local/lib/systemd/system
-and
-/usr/lib/systemd/system\&. User configuration always takes precedence\&.
-\fBpkg\-config systemd \-\-variable=systemdsystemconfdir\fR
-returns the path of the system configuration directory\&. Packages should alter the content of these directories only with the
-\fBenable\fR
-and
-\fBdisable\fR
-commands of the
-\fBsystemctl\fR(1)
-tool\&.
-.RE
-.PP
-User unit directories
-.RS 4
-Similar rules apply for the user unit directories\&. However, here the
-\m[blue]\fBXDG Base Directory specification\fR\m[]\&\s-2\u[4]\d\s+2
-is followed to find units\&. Applications should place their unit files in the directory returned by
-\fBpkg\-config systemd \-\-variable=systemduserunitdir\fR\&. Global configuration is done in the directory reported by
-\fBpkg\-config systemd \-\-variable=systemduserconfdir\fR\&. The
-\fBenable\fR
-and
-\fBdisable\fR
-commands of the
-\fBsystemctl\fR(1)
-tool can handle both global (i\&.e\&. for all users) and private (for one user) enabling/disabling of units\&.
-.RE
-.PP
-SysV init scripts directory
-.RS 4
-The location of the SysV init script directory varies between distributions\&. If systemd cannot find a native unit file for a requested service, it will look for a SysV init script of the same name (with the
-\&.service
-suffix removed)\&.
-.RE
-.PP
-SysV runlevel link farm directory
-.RS 4
-The location of the SysV runlevel link farm directory varies between distributions\&. systemd will take the link farm into account when figuring out whether a service shall be enabled\&. Note that a service unit with a native unit configuration file cannot be started by activating it in the SysV runlevel link farm\&.
-.RE
-.SH "SIGNALS"
-.PP
-SIGTERM
-.RS 4
-Upon receiving this signal the systemd system manager serializes its state, reexecutes itself and deserializes the saved state again\&. This is mostly equivalent to
-\fBsystemctl daemon\-reexec\fR\&.
-.sp
-systemd user managers will start the
-exit\&.target
-unit when this signal is received\&. This is mostly equivalent to
-\fBsystemctl \-\-user start exit\&.target\fR\&.
-.RE
-.PP
-SIGINT
-.RS 4
-Upon receiving this signal the systemd system manager will start the
-ctrl\-alt\-del\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start ctl\-alt\-del\&.target\fR\&.
-.sp
-systemd user managers treat this signal the same way as SIGTERM\&.
-.RE
-.PP
-SIGWINCH
-.RS 4
-When this signal is received the systemd system manager will start the
-kbrequest\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start kbrequest\&.target\fR\&.
-.sp
-This signal is ignored by systemd user managers\&.
-.RE
-.PP
-SIGPWR
-.RS 4
-When this signal is received the systemd manager will start the
-sigpwr\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start sigpwr\&.target\fR\&.
-.RE
-.PP
-SIGUSR1
-.RS 4
-When this signal is received the systemd manager will try to reconnect to the D\-Bus bus\&.
-.RE
-.PP
-SIGUSR2
-.RS 4
-When this signal is received the systemd manager will log its complete state in human readable form\&. The data logged is the same as printed by
-\fBsystemctl dump\fR\&.
-.RE
-.PP
-SIGHUP
-.RS 4
-Reloads the complete daemon configuration\&. This is mostly equivalent to
-\fBsystemctl daemon\-reload\fR\&.
-.RE
-.PP
-SIGRTMIN+0
-.RS 4
-Enters default mode, starts the
-default\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start default\&.target\fR\&.
-.RE
-.PP
-SIGRTMIN+1
-.RS 4
-Enters rescue mode, starts the
-rescue\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl isolate rescue\&.target\fR\&.
-.RE
-.PP
-SIGRTMIN+2
-.RS 4
-Enters emergency mode, starts the
-emergency\&.service
-unit\&. This is mostly equivalent to
-\fBsystemctl isolate emergency\&.service\fR\&.
-.RE
-.PP
-SIGRTMIN+3
-.RS 4
-Halts the machine, starts the
-halt\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start halt\&.target\fR\&.
-.RE
-.PP
-SIGRTMIN+4
-.RS 4
-Powers off the machine, starts the
-poweroff\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start poweroff\&.target\fR\&.
-.RE
-.PP
-SIGRTMIN+5
-.RS 4
-Reboots the machine, starts the
-reboot\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start reboot\&.target\fR\&.
-.RE
-.PP
-SIGRTMIN+6
-.RS 4
-Reboots the machine via kexec, starts the
-kexec\&.target
-unit\&. This is mostly equivalent to
-\fBsystemctl start kexec\&.target\fR\&.
-.RE
-.PP
-SIGRTMIN+13
-.RS 4
-Immediately halts the machine\&.
-.RE
-.PP
-SIGRTMIN+14
-.RS 4
-Immediately powers off the machine\&.
-.RE
-.PP
-SIGRTMIN+15
-.RS 4
-Immediately reboots the machine\&.
-.RE
-.PP
-SIGRTMIN+16
-.RS 4
-Immediately reboots the machine with kexec\&.
-.RE
-.PP
-SIGRTMIN+20
-.RS 4
-Enables display of status messages on the console, as controlled via
-\fIsystemd\&.show_status=1\fR
-on the kernel command line\&.
-.RE
-.PP
-SIGRTMIN+21
-.RS 4
-Disables display of status messages on the console, as controlled via
-\fIsystemd\&.show_status=0\fR
-on the kernel command line\&.
-.RE
-.PP
-SIGRTMIN+22, SIGRTMIN+23
-.RS 4
-Sets the log level to
-debug
-(resp\&.
-info
-on
-SIGRTMIN+23), as controlled via
-\fIsystemd\&.log_level=debug\fR
-(resp\&.
-\fIsystemd\&.log_level=info\fR
-on
-SIGRTMIN+23) on the kernel command line\&.
-.RE
-.PP
-SIGRTMIN+26, SIGRTMIN+27, SIGRTMIN+28, SIGRTMIN+29
-.RS 4
-Sets the log level to
-journal\-or\-kmsg
-(resp\&.
-console
-on
-SIGRTMIN+27; resp\&.
-kmsg
-on
-SIGRTMIN+28; resp\&.
-syslog\-or\-kmsg
-on
-SIGRTMIN+29), as controlled via
-\fIsystemd\&.log_target=journal\-or\-kmsg\fR
-(resp\&.
-\fIsystemd\&.log_target=console\fR
-on
-SIGRTMIN+27; resp\&.
-\fIsystemd\&.log_target=kmsg\fR
-on
-SIGRTMIN+28; resp
-\fIsystemd\&.log_target=syslog\-or\-kmsg\fR
-on
-SIGRTMIN+29) on the kernel command line\&.
-.RE
-.SH "ENVIRONMENT"
-.PP
-\fI$SYSTEMD_LOG_LEVEL\fR
-.RS 4
-systemd reads the log level from this environment variable\&. This can be overridden with
-\fB\-\-log\-level=\fR\&.
-.RE
-.PP
-\fI$SYSTEMD_LOG_TARGET\fR
-.RS 4
-systemd reads the log target from this environment variable\&. This can be overridden with
-\fB\-\-log\-target=\fR\&.
-.RE
-.PP
-\fI$SYSTEMD_LOG_COLOR\fR
-.RS 4
-Controls whether systemd highlights important log messages\&. This can be overridden with
-\fB\-\-log\-color=\fR\&.
-.RE
-.PP
-\fI$SYSTEMD_LOG_LOCATION\fR
-.RS 4
-Controls whether systemd prints the code location along with log messages\&. This can be overridden with
-\fB\-\-log\-location=\fR\&.
-.RE
-.PP
-\fI$XDG_CONFIG_HOME\fR, \fI$XDG_CONFIG_DIRS\fR, \fI$XDG_DATA_HOME\fR, \fI$XDG_DATA_DIRS\fR
-.RS 4
-The systemd user manager uses these variables in accordance to the
-\m[blue]\fBXDG Base Directory specification\fR\m[]\&\s-2\u[4]\d\s+2
-to find its configuration\&.
-.RE
-.PP
-\fI$SYSTEMD_UNIT_PATH\fR
-.RS 4
-Controls where systemd looks for unit files\&.
-.RE
-.PP
-\fI$SYSTEMD_SYSVINIT_PATH\fR
-.RS 4
-Controls where systemd looks for SysV init scripts\&.
-.RE
-.PP
-\fI$SYSTEMD_SYSVRCND_PATH\fR
-.RS 4
-Controls where systemd looks for SysV init script runlevel link farms\&.
-.RE
-.PP
-\fI$LISTEN_PID\fR, \fI$LISTEN_FDS\fR
-.RS 4
-Set by systemd for supervised processes during socket\-based activation\&. See
-\fBsd_listen_fds\fR(3)
-for more information\&.
-.RE
-.PP
-\fI$NOTIFY_SOCKET\fR
-.RS 4
-Set by systemd for supervised processes for status and start\-up completion notification\&. See
-\fBsd_notify\fR(3)
-for more information\&.
-.RE
-.SH "KERNEL COMMAND LINE"
-.PP
-When run as system instance systemd parses a few kernel command line arguments:
-.PP
-\fIsystemd\&.unit=\fR
-.RS 4
-Overrides the unit to activate on boot\&. Defaults to
-default\&.target\&. This may be used to temporarily boot into a different boot unit, for example
-rescue\&.target
-or
-emergency\&.service\&. See
-\fBsystemd.special\fR(7)
-for details about these units\&.
-.RE
-.PP
-\fIsystemd\&.dump_core=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-systemd dumps core when it crashes\&. Otherwise no core dump is created\&. Defaults to
-\fBtrue\fR\&.
-.RE
-.PP
-\fIsystemd\&.crash_shell=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-systemd spawns a shell when it crashes\&. Otherwise no shell is spawned\&. Defaults to
-\fBfalse\fR, for security reasons, as the shell is not protected by any password authentication\&.
-.RE
-.PP
-\fIsystemd\&.crash_chvt=\fR
-.RS 4
-Takes an integer argument\&. If positive systemd activates the specified virtual terminal when it crashes\&. Defaults to
-\-1\&.
-.RE
-.PP
-\fIsystemd\&.confirm_spawn=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-asks for confirmation when spawning processes\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIsystemd\&.show_status=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-shows terse service status updates on the console during bootup\&. Defaults to
-\fBtrue\fR\&.
-.RE
-.PP
-\fIsystemd\&.sysv_console=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-output of SysV init scripts will be directed to the console\&. Defaults to
-\fBtrue\fR, unless
-\fBquiet\fR
-is passed as kernel command line option in which case it defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIsystemd\&.log_target=\fR, \fIsystemd\&.log_level=\fR, \fIsystemd\&.log_color=\fR, \fIsystemd\&.log_location=\fR
-.RS 4
-Controls log output, with the same effect as the
-\fI$SYSTEMD_LOG_TARGET\fR,
-\fI$SYSTEMD_LOG_LEVEL\fR,
-\fI$SYSTEMD_LOG_COLOR\fR,
-\fI$SYSTEMD_LOG_LOCATION\fR
-environment variables described above\&.
-.RE
-.PP
-\fIsystemd\&.default_standard_output=\fR, \fIsystemd\&.default_standard_error=\fR
-.RS 4
-Controls default standard output/error output for services, with the same effect as the
-\fB\-\-default\-standard\-output=\fR
-resp\&.
-\fB\-\-default\-standard\-error=\fR
-command line arguments described above\&.
-.RE
-.PP
-\fIsystemd\&.setenv=\fR
-.RS 4
-Takes a string argument in the form VARIABLE=VALUE\&. May be used to set environment variables for the init process and all its children at boot time\&. May be used more than once to set multiple variables\&. If the equal sign and variable are missing unsets an environment variable which might be passed in from the initial ram disk\&.
-.RE
-.SH "SOCKETS AND FIFOS"
-.PP
-/run/systemd/notify
-.RS 4
-Daemon status notification socket\&. This is an AF_UNIX datagram socket and is used to implement the daemon notification logic as implemented by
-\fBsd_notify\fR(3)\&.
-.RE
-.PP
-/run/systemd/shutdownd
-.RS 4
-Used internally by the
-\fBshutdown\fR(8)
-tool to implement delayed shutdowns\&. This is an AF_UNIX datagram socket\&.
-.RE
-.PP
-/run/systemd/private
-.RS 4
-Used internally as communication channel between
-\fBsystemctl\fR(1)
-and the systemd process\&. This is an AF_UNIX stream socket\&. This interface is private to systemd and should not be used in external projects\&.
-.RE
-.PP
-/dev/initctl
-.RS 4
-Limited compatibility support for the SysV client interface, as implemented by the
-systemd\-initctl\&.service
-unit\&. This is a named pipe in the file system\&. This interface is obsolete and should not be used in new applications\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemctl\fR(1),
-\fBsystemadm\fR(1),
-\fBsystemd-notify\fR(1),
-\fBdaemon\fR(7),
-\fBsd-daemon\fR(7),
-\fBsystemd.unit\fR(5),
-\fBsystemd.special\fR(5),
-\fBpkg-config\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-cgroups.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/cgroups/cgroups.txt
-.RE
-.IP " 2." 4
-Original Design Document
-.RS 4
-\%http://0pointer.de/blog/projects/systemd.html
-.RE
-.IP " 3." 4
-Interface Stability Promise
-.RS 4
-\%http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise
-.RE
-.IP " 4." 4
-XDG Base Directory specification
-.RS 4
-\%http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-.RE
diff --git a/man/systemd.automount.5 b/man/systemd.automount.5
deleted file mode 100644 (file)
index 2ce1c31..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-'\" t
-.\"     Title: systemd.automount
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.automount
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.AUTOMOUNT" "5" "02/15/2012" "systemd" "systemd.automount"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.automount \- systemd automount configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.automount
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.automount
-encodes information about a file system automount point controlled and supervised by systemd\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. The automount specific configuration options are configured in the [Automount] section\&.
-.PP
-Automount units must be named after the automount directories they control\&. Example: the automount point
-/home/lennart
-must be configured in a unit file
-home\-lennart\&.automount\&. For details about the escaping logic used to convert a file system path to a unit name see
-\fBsystemd.unit\fR(5)\&.
-.PP
-For each automount unit file a matching mount unit file (see
-\fBsystemd.mount\fR(5)
-for details) must exist which is activated when the automount path is accessed\&. Example: if an automount unit
-home\-lennart\&.automount
-is active and the user accesses
-/home/lennart
-the mount unit
-home\-lennart\&.mount
-will be activated\&.
-.PP
-Automount units may be used to implement on\-demand mounting as well as parallelized mounting of file systems\&.
-.PP
-If an automount point is beneath another mount point in the file system hierarchy a dependency between both units is created automatically\&.
-.SH "FSTAB"
-.PP
-Automount units may either be configured via unit files, or via
-/etc/fstab
-(see
-\fBfstab\fR(5)
-for details)\&.
-.PP
-For details how systemd parses
-/etc/fstab
-see
-\fBsystemd.mount\fR(5)\&.
-.PP
-If an automount point is configured in both
-/etc/fstab
-and a unit file the configuration in the latter takes precedence\&.
-.SH "OPTIONS"
-.PP
-Automount files must include an [Automount] section, which carries information about the file system automount points it supervises\&. The options specific to the [Automount] section of automount units are the following:
-.PP
-\fIWhere=\fR
-.RS 4
-Takes an absolute path of a directory of the automount point\&. If the automount point is not existing at time of the automount point is installed it is created\&. This string must be reflected in the unit file name\&. (See above\&.) This option is mandatory\&.
-.RE
-.PP
-\fIDirectoryMode=\fR
-.RS 4
-Directories of automount points (and any parent directories) are automatically created if needed\&. This option specifies the file system access mode used when creating these directories\&. Takes an access mode in octal notation\&. Defaults to 0755\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.mount\fR(5),
-\fBmount\fR(8),
-\fBautomount\fR(8)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.conf.5 b/man/systemd.conf.5
deleted file mode 100644 (file)
index 2d82d03..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-'\" t
-.\"     Title: systemd.conf
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.conf
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.CONF" "5" "02/15/2012" "systemd" "systemd.conf"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.conf \- systemd manager configuration file
-.SH "SYNOPSIS"
-.PP
-system\&.conf
-.PP
-user\&.conf
-.SH "DESCRIPTION"
-.PP
-When run as system instance systemd reads the configuration file
-system\&.conf, otherwise
-user\&.conf\&. These configuration files contain a few settings controlling basic manager operations\&.
-.SH "OPTIONS"
-.PP
-All options are configured in the
-[Manager]
-section:
-.PP
-\fILogLevel=\fR, \fILogTarget=\fR, \fILogColor=\fR, \fILogLocation=\fR, \fIDumpCore=yes\fR, \fICrashShell=no\fR, \fIShowStatus=yes\fR, \fISysVConsole=yes\fR, \fICrashChVT=1\fR, \fIDefaultStandardOutput=journal\fR, \fIDefaultStandardError=inherit\fR
-.RS 4
-Configures various parameters of basic manager operation\&. These options may be overridden by the respective command line arguments\&. See
-\fBsystemd\fR(1)
-for details about these command line arguments\&.
-.RE
-.PP
-\fICPUAffinity=\fR
-.RS 4
-Configures the initial CPU affinity for the init process\&. Takes a space\-separated list of CPU indexes\&.
-.RE
-.PP
-\fIMountAuto=yes\fR, \fISwapAuto=yes\fR
-.RS 4
-Configures whether systemd should automatically activate all swap or mounts listed in
-/etc/fstab, or whether this job is left to some other system script\&.
-.RE
-.PP
-\fIDefaultControllers=cpu\fR
-.RS 4
-Configures in which cgroup controller hierarchies to create per\-service cgroups automatically, in addition to the name=systemd named hierarchy\&. Defaults to \*(Aqcpu\*(Aq\&. Takes a space separated list of controller names\&. Pass an empty string to ensure that systemd does not touch any hierarchies but its own\&.
-.RE
-.PP
-\fIJoinControllers=cpu,cpuacct\fR
-.RS 4
-Configures controllers that shall be mounted in a single hierarchy\&. By default systemd will mount all controllers which are enabled in the kernel in individual hierachies, with the exception of those listed in this setting\&. Takes a space separated list of comma separated controller names, in order to allow multiple joined hierarchies\&. Defaults to \*(Aqcpu,cpuacct\*(Aq\&. Pass an empty string to ensure that systemd mounts all controllers in separate hierarchies\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index ba144da..56490ef 100644 (file)
@@ -81,7 +81,7 @@
                                 <term><varname>ShowStatus=yes</varname></term>
                                 <term><varname>SysVConsole=yes</varname></term>
                                 <term><varname>CrashChVT=1</varname></term>
-                                <term><varname>DefaultStandardOutput=journal</varname></term>
+                                <term><varname>DefaultStandardOutput=null</varname></term>
                                 <term><varname>DefaultStandardError=inherit</varname></term>
 
                                 <listitem><para>Configures various
diff --git a/man/systemd.device.5 b/man/systemd.device.5
deleted file mode 100644 (file)
index 23a2764..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-'\" t
-.\"     Title: systemd.device
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.device
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.DEVICE" "5" "02/15/2012" "systemd" "systemd.device"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.device \- systemd device configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.device
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.device
-encodes information about a device unit as exposed in the sysfs/\fBudev\fR(7)
-device tree\&.
-.PP
-This unit type has no specific options\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic
-[Unit]
-and
-[Install]
-sections\&. A separate
-[Device]
-section does not exist, since no device\-specific options may be configured\&.
-.PP
-systemd will automatically create dynamic device units for all kernel devices that are marked with the "systemd" udev tag (by default all block and network devices, and a few others)\&. This may be used to define dependencies between devices and other units\&.
-.PP
-Device units are named after the
-/sys
-and
-/dev
-paths they control\&. Example: the device
-/dev/sda5
-is exposed in systemd as
-dev\-sda5\&.device\&. For details about the escaping logic used to convert a file system path to a unit name see
-\fBsystemd.unit\fR(5)\&.
-.SH "THE UDEV DATABASE"
-.PP
-The settings of device units may either be configured via unit files, or directly from the udev database (which is recommended)\&. The following udev properties are understood by systemd:
-.PP
-\fISYSTEMD_WANTS=\fR
-.RS 4
-Adds dependencies of type
-\fIWants\fR
-from this unit to all listed units\&. This may be used to activate arbitrary units, when a specific device becomes available\&. Note that this and the other tags are not taken into account unless the device is tagged with the "systemd" string in the udev database, because otherwise the device is not exposed as systemd unit\&.
-.RE
-.PP
-\fISYSTEMD_ALIAS=\fR
-.RS 4
-Adds an additional alias name to the device unit\&. This must be an absolute path that is automatically transformed into a unit name\&. (See above\&.)
-.RE
-.PP
-\fISYSTEMD_READY=\fR
-.RS 4
-If set to 0 systemd will consider this device unplugged even if it shows up in the udev tree\&. If this property is unset or set to 1 the device will be considered plugged the moment it shows up in the udev tree\&. This property has no influence on the behaviour when a device disappears from the udev tree\&. This option is useful to support devices that initially show up in an uninitialized state in the tree, and for which a changed event is generated the moment they are fully set up\&.
-.RE
-.PP
-\fIID_MODEL_FROM_DATABASE=\fR, \fIID_MODEL=\fR
-.RS 4
-If set, this property is used as description string for the device unit\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBudev\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.exec.5 b/man/systemd.exec.5
deleted file mode 100644 (file)
index 71927dd..0000000
+++ /dev/null
@@ -1,635 +0,0 @@
-'\" t
-.\"     Title: systemd.exec
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.exec
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.EXEC" "5" "02/15/2012" "systemd" "systemd.exec"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.exec \- systemd execution environment configuration
-.SH "SYNOPSIS"
-.PP
-systemd\&.service,
-systemd\&.socket,
-systemd\&.mount,
-systemd\&.swap
-.SH "DESCRIPTION"
-.PP
-Unit configuration files for services, sockets, mount points and swap devices share a subset of configuration options which define the execution environment of spawned processes\&.
-.PP
-This man page lists the configuration options shared by these four unit types\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files, and
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5),
-\fBsystemd.swap\fR(5)
-and
-\fBsystemd.mount\fR(5)
-for more information on the specific unit configuration files\&. The execution specific configuration options are configured in the [Service], [Socket], [Mount] resp\&. [Swap] section, depending on the unit type\&.
-.SH "OPTIONS"
-.PP
-\fIWorkingDirectory=\fR
-.RS 4
-Takes an absolute directory path\&. Sets the working directory for executed processes\&.
-.RE
-.PP
-\fIRootDirectory=\fR
-.RS 4
-Takes an absolute directory path\&. Sets the root directory for executed processes, with the
-\fBchroot\fR(2)
-system call\&. If this is used it must be ensured that the process and all its auxiliary files are available in the
-\fBchroot()\fR
-jail\&.
-.RE
-.PP
-\fIUser=\fR, \fIGroup=\fR
-.RS 4
-Sets the Unix user resp\&. group the processes are executed as\&. Takes a single user resp\&. group name or ID as argument\&. If no group is set the default group of the user is chosen\&.
-.RE
-.PP
-\fISupplementaryGroups=\fR
-.RS 4
-Sets the supplementary Unix groups the processes are executed as\&. This takes a space separated list of group names or IDs\&. This option may be specified more than once in which case all listed groups are set as supplementary groups\&. This option does not override but extends the list of supplementary groups configured in the system group database for the user\&.
-.RE
-.PP
-\fINice=\fR
-.RS 4
-Sets the default nice level (scheduling priority) for executed processes\&. Takes an integer between \-20 (highest priority) and 19 (lowest priority)\&. See
-\fBsetpriority\fR(2)
-for details\&.
-.RE
-.PP
-\fIOOMScoreAdjust=\fR
-.RS 4
-Sets the adjustment level for the Out\-Of\-Memory killer for executed processes\&. Takes an integer between \-1000 (to disable OOM killing for this process) and 1000 (to make killing of this process under memory pressure very likely)\&. See
-\m[blue]\fBproc\&.txt\fR\m[]\&\s-2\u[1]\d\s+2
-for details\&.
-.RE
-.PP
-\fIIOSchedulingClass=\fR
-.RS 4
-Sets the IO scheduling class for executed processes\&. Takes an integer between 0 and 3 or one of the strings
-\fBnone\fR,
-\fBrealtime\fR,
-\fBbest\-effort\fR
-or
-\fBidle\fR\&. See
-\fBioprio_set\fR(2)
-for details\&.
-.RE
-.PP
-\fIIOSchedulingPriority=\fR
-.RS 4
-Sets the IO scheduling priority for executed processes\&. Takes an integer between 0 (highest priority) and 7 (lowest priority)\&. The available priorities depend on the selected IO scheduling class (see above)\&. See
-\fBioprio_set\fR(2)
-for details\&.
-.RE
-.PP
-\fICPUSchedulingPolicy=\fR
-.RS 4
-Sets the CPU scheduling policy for executed processes\&. Takes one of
-\fBother\fR,
-\fBbatch\fR,
-\fBidle\fR,
-\fBfifo\fR
-or
-\fBrr\fR\&. See
-\fBsched_setscheduler\fR(2)
-for details\&.
-.RE
-.PP
-\fICPUSchedulingPriority=\fR
-.RS 4
-Sets the CPU scheduling priority for executed processes\&. Takes an integer between 1 (lowest priority) and 99 (highest priority)\&. The available priority range depends on the selected CPU scheduling policy (see above)\&. See
-\fBsched_setscheduler\fR(2)
-for details\&.
-.RE
-.PP
-\fICPUSchedulingResetOnFork=\fR
-.RS 4
-Takes a boolean argument\&. If true elevated CPU scheduling priorities and policies will be reset when the executed processes fork, and can hence not leak into child processes\&. See
-\fBsched_setscheduler\fR(2)
-for details\&. Defaults to false\&.
-.RE
-.PP
-\fICPUAffinity=\fR
-.RS 4
-Controls the CPU affinity of the executed processes\&. Takes a space\-separated list of CPU indexes\&. See
-\fBsched_setaffinity\fR(2)
-for details\&.
-.RE
-.PP
-\fIUMask=\fR
-.RS 4
-Controls the file mode creation mask\&. Takes an access mode in octal notation\&. See
-\fBumask\fR(2)
-for details\&. Defaults to 0022\&.
-.RE
-.PP
-\fIEnvironment=\fR
-.RS 4
-Sets environment variables for executed processes\&. Takes a space\-separated list of variable assignments\&. This option may be specified more than once in which case all listed variables will be set\&. If the same variable is set twice the later setting will override the earlier setting\&. See
-\fBenviron\fR(7)
-for details\&.
-.RE
-.PP
-\fIEnvironmentFile=\fR
-.RS 4
-Similar to
-\fIEnvironment=\fR
-but reads the environment variables from a text file\&. The text file should contain new\-line separated variable assignments\&. Empty lines and lines starting with ; or # will be ignored, which may be used for commenting\&. The parser strips leading and trailing whitespace from the values of assignments, unless you use double quotes (")\&. The argument passed should be an absolute file name, optionally prefixed with "\-", which indicates that if the file does not exist it won\*(Aqt be read and no error or warning message is logged\&. The files listed with this directive will be read shortly before the process is executed\&. Settings from these files override settings made with
-\fIEnvironment=\fR\&. If the same variable is set twice from these files the files will be read in the order they are specified and the later setting will override the earlier setting\&.
-.RE
-.PP
-\fIStandardInput=\fR
-.RS 4
-Controls where file descriptor 0 (STDIN) of the executed processes is connected to\&. Takes one of
-\fBnull\fR,
-\fBtty\fR,
-\fBtty\-force\fR,
-\fBtty\-fail\fR
-or
-\fBsocket\fR\&. If
-\fBnull\fR
-is selected standard input will be connected to
-/dev/null, i\&.e\&. all read attempts by the process will result in immediate EOF\&. If
-\fBtty\fR
-is selected standard input is connected to a TTY (as configured by
-\fITTYPath=\fR, see below) and the executed process becomes the controlling process of the terminal\&. If the terminal is already being controlled by another process the executed process waits until the current controlling process releases the terminal\&.
-\fBtty\-force\fR
-is similar to
-\fBtty\fR, but the executed process is forcefully and immediately made the controlling process of the terminal, potentially removing previous controlling processes from the terminal\&.
-\fBtty\-fail\fR
-is similar to
-\fBtty\fR
-but if the terminal already has a controlling process start\-up of the executed process fails\&. The
-\fBsocket\fR
-option is only valid in socket\-activated services, and only when the socket configuration file (see
-\fBsystemd.socket\fR(5)
-for details) specifies a single socket only\&. If this option is set standard input will be connected to the socket the service was activated from, which is primarily useful for compatibility with daemons designed for use with the traditional
-\fBinetd\fR(8)
-daemon\&. This setting defaults to
-\fBnull\fR\&.
-.RE
-.PP
-\fIStandardOutput=\fR
-.RS 4
-Controls where file descriptor 1 (STDOUT) of the executed processes is connected to\&. Takes one of
-\fBinherit\fR,
-\fBnull\fR,
-\fBtty\fR,
-\fBsyslog\fR,
-\fBkmsg\fR,
-\fBjournal\fR,
-\fBsyslog+console\fR,
-\fBkmsg+console\fR,
-\fBjournal+console\fR
-or
-\fBsocket\fR\&. If set to
-\fBinherit\fR
-the file descriptor of standard input is duplicated for standard output\&. If set to
-\fBnull\fR
-standard output will be connected to
-/dev/null, i\&.e\&. everything written to it will be lost\&. If set to
-\fBtty\fR
-standard output will be connected to a tty (as configured via
-\fITTYPath=\fR, see below)\&. If the TTY is used for output only the executed process will not become the controlling process of the terminal, and will not fail or wait for other processes to release the terminal\&.
-\fBsyslog\fR
-connects standard output to the
-\fBsyslog\fR(3)
-system syslog service\&.
-\fBkmsg\fR
-connects it with the kernel log buffer which is accessible via
-\fBdmesg\fR(1)\&.
-\fBjournal\fR
-connects it with the journal which is accessible via
-\fBsystemd-journalctl\fR(1)
-(Note that everything that is written to syslog or kmsg is implicitly stored in the journal as well, those options are hence supersets of this one)\&.
-\fBsyslog+console\fR,
-\fBjournal+console\fR
-and
-\fBkmsg+console\fR
-work similarly but copy the output to the system console as well\&.
-\fBsocket\fR
-connects standard output to a socket from socket activation, semantics are similar to the respective option of
-\fIStandardInput=\fR\&. This setting defaults to the value set with
-\fBDefaultStandardOutput=\fR
-in
-\fBsystemd.conf\fR(5), which defaults to
-\fBjournal\fR\&.
-.RE
-.PP
-\fIStandardError=\fR
-.RS 4
-Controls where file descriptor 2 (STDERR) of the executed processes is connected to\&. The available options are identical to those of
-\fIStandardOutput=\fR, with one exception: if set to
-\fBinherit\fR
-the file descriptor used for standard output is duplicated for standard error\&. This setting defaults to the value set with
-\fBDefaultStandardError=\fR
-in
-\fBsystemd.conf\fR(5), which defaults to
-\fBinherit\fR\&.
-.RE
-.PP
-\fITTYPath=\fR
-.RS 4
-Sets the terminal device node to use if standard input, output or stderr are connected to a TTY (see above)\&. Defaults to
-/dev/console\&.
-.RE
-.PP
-\fITTYReset=\fR
-.RS 4
-Reset the terminal device specified with
-\fITTYPath=\fR
-before and after execution\&. Defaults to
-no\&.
-.RE
-.PP
-\fITTYVHangup=\fR
-.RS 4
-Disconnect all clients which have opened the terminal device specified with
-\fITTYPath=\fR
-before and after execution\&. Defaults to
-no\&.
-.RE
-.PP
-\fITTYVTDisallocate=\fR
-.RS 4
-If the the terminal device specified with
-\fITTYPath=\fR
-is a virtual console terminal try to deallocate the TTY before and after execution\&. This ensures that the screen and scrollback buffer is cleared\&. Defaults to
-no\&.
-.RE
-.PP
-\fISyslogIdentifier=\fR
-.RS 4
-Sets the process name to prefix log lines sent to syslog or the kernel log buffer with\&. If not set defaults to the process name of the executed process\&. This option is only useful when
-\fIStandardOutput=\fR
-or
-\fIStandardError=\fR
-are set to
-\fBsyslog\fR
-or
-\fBkmsg\fR\&.
-.RE
-.PP
-\fISyslogFacility=\fR
-.RS 4
-Sets the syslog facility to use when logging to syslog\&. One of
-\fBkern\fR,
-\fBuser\fR,
-\fBmail\fR,
-\fBdaemon\fR,
-\fBauth\fR,
-\fBsyslog\fR,
-\fBlpr\fR,
-\fBnews\fR,
-\fBuucp\fR,
-\fBcron\fR,
-\fBauthpriv\fR,
-\fBftp\fR,
-\fBlocal0\fR,
-\fBlocal1\fR,
-\fBlocal2\fR,
-\fBlocal3\fR,
-\fBlocal4\fR,
-\fBlocal5\fR,
-\fBlocal6\fR
-or
-\fBlocal7\fR\&. See
-\fBsyslog\fR(3)
-for details\&. This option is only useful when
-\fIStandardOutput=\fR
-or
-\fIStandardError=\fR
-are set to
-\fBsyslog\fR\&. Defaults to
-\fBdaemon\fR\&.
-.RE
-.PP
-\fISyslogLevel=\fR
-.RS 4
-Default syslog level to use when logging to syslog or the kernel log buffer\&. One of
-\fBemerg\fR,
-\fBalert\fR,
-\fBcrit\fR,
-\fBerr\fR,
-\fBwarning\fR,
-\fBnotice\fR,
-\fBinfo\fR,
-\fBdebug\fR\&. See
-\fBsyslog\fR(3)
-for details\&. This option is only useful when
-\fIStandardOutput=\fR
-or
-\fIStandardError=\fR
-are set to
-\fBsyslog\fR
-or
-\fBkmsg\fR\&. Note that individual lines output by the daemon might be prefixed with a different log level which can be used to override the default log level specified here\&. The interpretation of these prefixes may be disabled with
-\fISyslogLevelPrefix=\fR, see below\&. For details see
-\fBsd-daemon\fR(7)\&. Defaults to
-\fBinfo\fR\&.
-.RE
-.PP
-\fISyslogLevelPrefix=\fR
-.RS 4
-Takes a boolean argument\&. If true and
-\fIStandardOutput=\fR
-or
-\fIStandardError=\fR
-are set to
-\fBsyslog\fR
-or
-\fBkmsg\fR
-log lines written by the executed process that are prefixed with a log level will be passed on to syslog with this log level set but the prefix removed\&. If set to false, the interpretation of these prefixes is disabled and the logged lines are passed on as\-is\&. For details about this prefixing see
-\fBsd-daemon\fR(7)\&. Defaults to true\&.
-.RE
-.PP
-\fITimerSlackNSec=\fR
-.RS 4
-Sets the timer slack in nanoseconds for the executed processes\&. The timer slack controls the accuracy of wake\-ups triggered by timers\&. See
-\fBprctl\fR(2)
-for more information\&. Note that in contrast to most other time span definitions this parameter takes an integer value in nano\-seconds and does not understand any other units\&.
-.RE
-.PP
-\fILimitCPU=\fR, \fILimitFSIZE=\fR, \fILimitDATA=\fR, \fILimitSTACK=\fR, \fILimitCORE=\fR, \fILimitRSS=\fR, \fILimitNOFILE=\fR, \fILimitAS=\fR, \fILimitNPROC=\fR, \fILimitMEMLOCK=\fR, \fILimitLOCKS=\fR, \fILimitSIGPENDING=\fR, \fILimitMSGQUEUE=\fR, \fILimitNICE=\fR, \fILimitRTPRIO=\fR, \fILimitRTTIME=\fR
-.RS 4
-These settings control various resource limits for executed processes\&. See
-\fBsetrlimit\fR(2)
-for details\&. Use the string
-\fIinfinity\fR
-to configure no limit on a specific resource\&.
-.RE
-.PP
-\fIPAMName=\fR
-.RS 4
-Sets the PAM service name to set up a session as\&. If set the executed process will be registered as a PAM session under the specified service name\&. This is only useful in conjunction with the
-\fIUser=\fR
-setting\&. If not set no PAM session will be opened for the executed processes\&. See
-\fBpam\fR(8)
-for details\&.
-.RE
-.PP
-\fITCPWrapName=\fR
-.RS 4
-If this is a socket\-activated service this sets the tcpwrap service name to check the permission for the current connection with\&. This is only useful in conjunction with socket\-activated services, and stream sockets (TCP) in particular\&. It has no effect on other socket types (e\&.g\&. datagram/UDP) and on processes unrelated to socket\-based activation\&. If the tcpwrap verification fails daemon start\-up will fail and the connection is terminated\&. See
-\fBtcpd\fR(8)
-for details\&. Note that this option may be used to do access control checks only\&. Shell commands and commands described in
-\fBhosts_options\fR(5)
-are not supported\&.
-.RE
-.PP
-\fICapabilityBoundingSet=\fR
-.RS 4
-Controls which capabilities to include in the capability bounding set for the executed process\&. See
-\fBcapabilities\fR(7)
-for details\&. Takes a whitespace separated list of capability names as read by
-\fBcap_from_name\fR(3)\&. Capabilities listed will be included in the bounding set, all others are removed\&. If the list of capabilities is prefixed with ~ all but the listed capabilities will be included, the effect of the assignment inverted\&. Note that this option does not actually set or unset any capabilities in the effective, permitted or inherited capability sets\&. That\*(Aqs what
-\fICapabilities=\fR
-is for\&. If this option is not used the capability bounding set is not modified on process execution, hence no limits on the capabilities of the process are enforced\&.
-.RE
-.PP
-\fISecureBits=\fR
-.RS 4
-Controls the secure bits set for the executed process\&. See
-\fBcapabilities\fR(7)
-for details\&. Takes a list of strings:
-\fBkeep\-caps\fR,
-\fBkeep\-caps\-locked\fR,
-\fBno\-setuid\-fixup\fR,
-\fBno\-setuid\-fixup\-locked\fR,
-\fBnoroot\fR
-and/or
-\fBnoroot\-locked\fR\&.
-.RE
-.PP
-\fICapabilities=\fR
-.RS 4
-Controls the
-\fBcapabilities\fR(7)
-set for the executed process\&. Take a capability string describing the effective, permitted and inherited capability sets as documented in
-\fBcap_from_text\fR(3)\&. Note that these capability sets are usually influenced by the capabilities attached to the executed file\&. Due to that
-\fICapabilityBoundingSet=\fR
-is probably the much more useful setting\&.
-.RE
-.PP
-\fIControlGroup=\fR
-.RS 4
-Controls the control groups the executed processes shall be made members of\&. Takes a space\-separated list of cgroup identifiers\&. A cgroup identifier has a format like
-cpu:/foo/bar, where "cpu" identifies the kernel control group controller used, and
-/foo/bar
-is the control group path\&. The controller name and ":" may be omitted in which case the named systemd control group hierarchy is implied\&. Alternatively, the path and ":" may be omitted, in which case the default control group path for this unit is implied\&. This option may be used to place executed processes in arbitrary groups in arbitrary hierarchies \-\- which can be configured externally with additional execution limits\&. By default systemd will place all executed processes in separate per\-unit control groups (named after the unit) in the systemd named hierarchy\&. Since every process can be in one group per hierarchy only overriding the control group path in the named systemd hierarchy will disable automatic placement in the default group\&. This option is primarily intended to place executed processes in specific paths in specific kernel controller hierarchies\&. It is however not recommended to manipulate the service control group path in the systemd named hierarchy\&. For details about control groups see
-\m[blue]\fBcgroups\&.txt\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.RE
-.PP
-\fIControlGroupModify=\fR
-.RS 4
-Takes a boolean argument\&. If true, the control groups created for this unit will be owned by the user specified with
-\fIUser=\fR
-(and the appropriate group), and he/she can create subgroups as well as add processes to the group\&.
-.RE
-.PP
-\fIControlGroupPersistent=\fR
-.RS 4
-Takes a boolean argument\&. If true, the control groups created for this unit will be marked to be persistent, i\&.e\&. systemd will not remove them when stopping the unit\&. The default is false, meaning that the control groups will be removed when the unit is stopped\&. For details about the semantics of this logic see
-\m[blue]\fBPaxControlGroups\fR\m[]\&\s-2\u[3]\d\s+2\&.
-.RE
-.PP
-\fIControlGroupAttribute=\fR
-.RS 4
-Set a specific control group attribute for executed processes, and (if needed) add the the executed processes to a cgroup in the hierarchy of the controller the attribute belongs to\&. Takes two space\-separated arguments: the attribute name (syntax is
-cpu\&.shares
-where
-cpu
-refers to a specific controller and
-shares
-to the attribute name), and the attribute value\&. Example:
-ControlGroupAttribute=cpu\&.shares 512\&. If this option is used for an attribute that belongs to a kernel controller hierarchy the unit is not already configured to be added to (for example via the
-ControlGroup=
-option) then the unit will be added to the controller and the default unit cgroup path is implied\&. Thus, using
-\fIControlGroupAttribute=\fR
-is in most case sufficient to make use of control group enforcements, explicit
-\fIControlGroup=\fR
-are only necessary in case the implied default control group path for a service is not desirable\&. For details about control group attributes see
-\m[blue]\fBcgroups\&.txt\fR\m[]\&\s-2\u[2]\d\s+2\&. This option may appear more than once, in order to set multiple control group attributes\&.
-.RE
-.PP
-\fICPUShares=\fR
-.RS 4
-Assign the specified overall CPU time shares to the processes executed\&. Takes an integer value\&. This controls the
-cpu\&.shares
-control group attribute, which defaults to 1024\&. For details about this control group attribute see
-\m[blue]\fBsched\-design\-CFS\&.txt\fR\m[]\&\s-2\u[4]\d\s+2\&.
-.RE
-.PP
-\fIMemoryLimit=\fR, \fIMemorySoftLimit=\fR
-.RS 4
-Limit the overall memory usage of the executed processes to a certain size\&. Takes a memory size in bytes\&. If the value is suffixed with K, M, G or T the specified memory size is parsed as Kilobytes, Megabytes, Gigabytes, resp\&. Terabytes (to the base 1024)\&. This controls the
-memory\&.limit_in_bytes
-and
-memory\&.soft_limit_in_bytes
-control group attributes\&. For details about these control group attributes see
-\m[blue]\fBmemory\&.txt\fR\m[]\&\s-2\u[5]\d\s+2\&.
-.RE
-.PP
-\fIDeviceAllow=\fR, \fIDeviceDeny=\fR
-.RS 4
-Control access to specific device nodes by the executed processes\&. Takes two space separated strings: a device node path (such as
-/dev/null) followed by a combination of r, w, m to control reading, writing resp\&. creating of the specific device node by the unit\&. This controls the
-devices\&.allow
-and
-devices\&.deny
-control group attributes\&. For details about these control group attributes see
-\m[blue]\fBdevices\&.txt\fR\m[]\&\s-2\u[6]\d\s+2\&.
-.RE
-.PP
-\fIBlockIOWeight=\fR
-.RS 4
-Set the default or per\-device overall block IO weight value for the executed processes\&. Takes either a single weight value (between 10 and 1000) to set the default block IO weight, or a space separated pair of a file path and a weight value to specify the device specific weight value (Example: "/dev/sda 500")\&. The file path may be specified as path to a block device node or as any other file in which case the backing block device of the file system of the file is determined\&. This controls the
-blkio\&.weight
-and
-blkio\&.weight_device
-control group attributes, which default to 1000\&. Use this option multiple times to set weights for multiple devices\&. For details about these control group attributes see
-\m[blue]\fBblkio\-controller\&.txt\fR\m[]\&\s-2\u[7]\d\s+2\&.
-.RE
-.PP
-\fIBlockIOReadBandwidth=\fR, \fIBlockIOWriteBandwidth=\fR
-.RS 4
-Set the per\-device overall block IO bandwith limit for the executed processes\&. Takes a space separated pair of a file path and a bandwith value (in bytes per second) to specify the device specific bandwidth\&. The file path may be specified as path to a block device node or as any other file in which case the backing block device of the file system of the file is determined\&. If the bandwith is suffixed with K, M, G, or T the specified bandwith is parsed as Kilobytes, Megabytes, Gigabytes, resp\&. Terabytes (Example: "/dev/disk/by\-path/pci\-0000:00:1f\&.2\-scsi\-0:0:0:0 5M")\&. This controls the
-blkio\&.read_bps_device
-and
-blkio\&.write_bps_device
-control group attributes\&. Use this option multiple times to set bandwith limits for multiple devices\&. For details about these control group attributes see
-\m[blue]\fBblkio\-controller\&.txt\fR\m[]\&\s-2\u[7]\d\s+2\&.
-.RE
-.PP
-\fIReadWriteDirectories=\fR, \fIReadOnlyDirectories=\fR, \fIInaccessibleDirectories=\fR
-.RS 4
-Sets up a new file\-system name space for executed processes\&. These options may be used to limit access a process might have to the main file\-system hierarchy\&. Each setting takes a space\-separated list of absolute directory paths\&. Directories listed in
-\fIReadWriteDirectories=\fR
-are accessible from within the namespace with the same access rights as from outside\&. Directories listed in
-\fIReadOnlyDirectories=\fR
-are accessible for reading only, writing will be refused even if the usual file access controls would permit this\&. Directories listed in
-\fIInaccessibleDirectories=\fR
-will be made inaccessible for processes inside the namespace\&. Note that restricting access with these options does not extend to submounts of a directory\&. You must list submounts separately in these settings to ensure the same limited access\&. These options may be specified more than once in which case all directories listed will have limited access from within the namespace\&.
-.RE
-.PP
-\fIPrivateTmp=\fR
-.RS 4
-Takes a boolean argument\&. If true sets up a new file system namespace for the executed processes and mounts a private
-/tmp
-directory inside it, that is not shared by processes outside of the namespace\&. This is useful to secure access to temporary files of the process, but makes sharing between processes via
-/tmp
-impossible\&. Defaults to false\&.
-.RE
-.PP
-\fIPrivateNetwork=\fR
-.RS 4
-Takes a boolean argument\&. If true sets up a new network namespace for the executed processes and configures only the loopback network device
-lo
-inside it\&. No other network devices will be available to the executed process\&. This is useful to securely turn off network access by the executed process\&. Defaults to false\&.
-.RE
-.PP
-\fIMountFlags=\fR
-.RS 4
-Takes a mount propagation flag:
-\fBshared\fR,
-\fBslave\fR
-or
-\fBprivate\fR, which control whether namespaces set up with
-\fIReadWriteDirectories=\fR,
-\fIReadOnlyDirectories=\fR
-and
-\fIInaccessibleDirectories=\fR
-receive or propagate new mounts from/to the main namespace\&. See
-\fBmount\fR(1)
-for details\&. Defaults to
-\fBshared\fR, i\&.e\&. the new namespace will both receive new mount points from the main namespace as well as propagate new mounts to it\&.
-.RE
-.PP
-\fIUtmpIdentifier=\fR
-.RS 4
-Takes a a four character identifier string for an utmp/wtmp entry for this service\&. This should only be set for services such as
-\fBgetty\fR
-implementations where utmp/wtmp entries must be created and cleared before and after execution\&. If the configured string is longer than four characters it is truncated and the terminal four characters are used\&. This setting interprets %I style string replacements\&. This setting is unset by default, i\&.e\&. no utmp/wtmp entries are created or cleaned up for this service\&.
-.RE
-.PP
-\fIIgnoreSIGPIPE=\fR
-.RS 4
-Takes a boolean argument\&. If true causes SIGPIPE to be ignored in the executed process\&. Defaults to true, since SIGPIPE generally is useful only in shell pipelines\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5),
-\fBsystemd.swap\fR(5),
-\fBsystemd.mount\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-proc.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/filesystems/proc.txt
-.RE
-.IP " 2." 4
-cgroups.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/cgroups/cgroups.txt
-.RE
-.IP " 3." 4
-PaxControlGroups
-.RS 4
-\%http://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups
-.RE
-.IP " 4." 4
-sched-design-CFS.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/scheduler/sched-design-CFS.txt
-.RE
-.IP " 5." 4
-memory.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/cgroups/memory.txt
-.RE
-.IP " 6." 4
-devices.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/cgroups/devices.txt
-.RE
-.IP " 7." 4
-blkio-controller.txt
-.RS 4
-\%http://www.kernel.org/doc/Documentation/cgroups/blkio-controller.txt
-.RE
index ac0f89f..230c4a3 100644 (file)
                                 <option>tty</option>,
                                 <option>syslog</option>,
                                 <option>kmsg</option>,
-                                <option>journal</option>,
-                                <option>syslog+console</option>,
                                 <option>kmsg+console</option>,
-                                <option>journal+console</option> or
+                                <option>syslog+console</option> or
                                 <option>socket</option>. If set to
                                 <option>inherit</option> the file
                                 descriptor of standard input is
                                 service. <option>kmsg</option>
                                 connects it with the kernel log buffer
                                 which is accessible via
-                                <citerefentry><refentrytitle>dmesg</refentrytitle><manvolnum>1</manvolnum></citerefentry>. <option>journal</option>
-                                connects it with the journal which is
-                                accessible via
-                                <citerefentry><refentrytitle>systemd-journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                                (Note that everything that is written
-                                to syslog or kmsg is implicitly stored
-                                in the journal as well, those options
-                                are hence supersets of this
-                                one). <option>syslog+console</option>,
-                                <option>journal+console</option> and
-                                <option>kmsg+console</option> work
+                                <citerefentry><refentrytitle>dmesg</refentrytitle><manvolnum>1</manvolnum></citerefentry>. <option>syslog+console</option>
+                                and <option>kmsg+console</option> work
                                 similarly but copy the output to the
                                 system console as
                                 well. <option>socket</option> connects
                                 in
                                 <citerefentry><refentrytitle>systemd.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                                 which defaults to
-                                <option>journal</option>.</para></listitem>
+                                <option>syslog</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><varname>StandardError=</varname></term>
                                 conjunction with socket-activated
                                 services, and stream sockets (TCP) in
                                 particular. It has no effect on other
-                                socket types (e.g. datagram/UDP) and
-                                on processes unrelated to socket-based
+                                socket types (e.g. datagram/UDP) and on processes
+                                unrelated to socket-based
                                 activation. If the tcpwrap
                                 verification fails daemon start-up
                                 will fail and the connection is
                                 terminated. See
                                 <citerefentry><refentrytitle>tcpd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-                                for details. Note that this option may
-                                be used to do access control checks
-                                only. Shell commands and commands
-                                described in
-                                <citerefentry><refentrytitle>hosts_options</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                                are not supported.</para></listitem>
+                                for details.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>ControlGroupPersistent=</varname></term>
-                                <listitem><para>Takes a boolean
-                                argument. If true, the control groups
-                                created for this unit will be marked
-                                to be persistent, i.e. systemd will
-                                not remove them when stopping the
-                                unit. The default is false, meaning
-                                that the control groups will be
-                                removed when the unit is stopped. For
-                                details about the semantics of this
-                                logic see <ulink
-                                url="http://www.freedesktop.org/wiki/Software/systemd/PaxControlGroups">PaxControlGroups</ulink>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><varname>ControlGroupAttribute=</varname></term>
 
                                 <listitem><para>Set a specific control
                                 this service.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><varname>IgnoreSIGPIPE=</varname></term>
-
-                                <listitem><para>Takes a boolean
-                                argument. If true causes SIGPIPE to be
-                                ignored in the executed
-                                process. Defaults to true, since
-                                SIGPIPE generally is useful only in
-                                shell pipelines.</para></listitem>
-                        </varlistentry>
-
                 </variablelist>
         </refsect1>
 
diff --git a/man/systemd.mount.5 b/man/systemd.mount.5
deleted file mode 100644 (file)
index c3d644b..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-'\" t
-.\"     Title: systemd.mount
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.mount
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.MOUNT" "5" "02/15/2012" "systemd" "systemd.mount"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.mount \- systemd mount configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.mount
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.mount
-encodes information about a file system mount point controlled and supervised by systemd\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. The mount specific configuration options are configured in the [Mount] section\&.
-.PP
-Additional options are listed in
-\fBsystemd.exec\fR(5), which define the execution environment the
-\fBmount\fR(8)
-binary is executed in\&.
-.PP
-Mount units must be named after the mount point directories they control\&. Example: the mount point
-/home/lennart
-must be configured in a unit file
-home\-lennart\&.mount\&. For details about the escaping logic used to convert a file system path to a unit name see
-\fBsystemd.unit\fR(5)\&.
-.PP
-Optionally, a mount unit may be accompanied by an automount unit, to allow on\-demand or parallelized mounting\&. See
-\fBsystemd.automount\fR(5)\&.
-.PP
-If an mount point is beneath another mount point in the file system hierarchy, a dependency between both units is created automatically\&.
-.PP
-Mount points created at runtime independent on unit files or
-/etc/fstab
-will be monitored by systemd and appear like any other mount unit in systemd\&.
-.SH "/ETC/FSTAB"
-.PP
-Mount units may either be configured via unit files, or via
-/etc/fstab
-(see
-\fBfstab\fR(5)
-for details)\&.
-.PP
-When reading
-/etc/fstab
-a few special mount options are understood by systemd which influence how dependencies are created for mount points from
-/etc/fstab\&. If
-\fBMountAuto=yes\fR
-is set in
-system\&.conf
-(which is the default), or if
-\fBx\-systemd\&.mount\fR
-is specified as mount option, then systemd will create a dependency of type
-\fBWants\fR
-from either
-local\-fs\&.target
-or
-remote\-fs\&.target, depending whether the file system is local or remote\&. If
-\fBx\-systemd\&.automount\fR
-is set, an automount unit will be created for the file system\&. See
-\fBsystemd.automount\fR(5)
-for details\&. If
-\fBx\-systemd\-device\-timeout=\fR
-is specified it may be used to configure how long systemd should wait for a device to show up before giving up on an entry from
-/etc/fstab\&. Specify a time in seconds or explicitly specifiy a unit as
-s,
-min,
-h,
-ms\&.
-.PP
-If a mount point is configured in both
-/etc/fstab
-and a unit file, the configuration in the latter takes precedence\&.
-.SH "OPTIONS"
-.PP
-Mount files must include a [Mount] section, which carries information about the file system mount points it supervises\&. A number of options that may be used in this section are shared with other unit types\&. These options are documented in
-\fBsystemd.exec\fR(5)\&. The options specific to the [Mount] section of mount units are the following:
-.PP
-\fIWhat=\fR
-.RS 4
-Takes an absolute path of a device node, file or other resource to mount\&. See
-\fBmount\fR(8)
-for details\&. If this refers to a device node, a dependency on the respective device unit is automatically created\&. (See
-\fBsystemd.device\fR(5)
-for more information\&.) This option is mandatory\&.
-.RE
-.PP
-\fIWhere=\fR
-.RS 4
-Takes an absolute path of a directory of the mount point\&. If the mount point is not existing at time of mounting, it is created\&. This string must be reflected in the unit file name\&. (See above\&.) This option is mandatory\&.
-.RE
-.PP
-\fIType=\fR
-.RS 4
-Takes a string for the filesystem type\&. See
-\fBmount\fR(8)
-for details\&. This setting is optional\&.
-.RE
-.PP
-\fIOptions=\fR
-.RS 4
-Mount options to use when mounting\&. This takes a comma separated list of options\&. This setting is optional\&.
-.RE
-.PP
-\fIDirectoryMode=\fR
-.RS 4
-Directories of mount points (and any parent directories) are automatically created if needed\&. This option specifies the file system access mode used when creating these directories\&. Takes an access mode in octal notation\&. Defaults to 0755\&.
-.RE
-.PP
-\fITimeoutSec=\fR
-.RS 4
-Configures the time to wait for the mount command to finish\&. If a command does not exit within the configured time the mount will be considered failed and be shut down again\&. All commands still running will be terminated forcibly via SIGTERM, and after another delay of this time with SIGKILL\&. (See
-\fBKillMode=\fR
-below\&.) Takes a unit\-less value in seconds, or a time span value such as "5min 20s"\&. Pass 0 to disable the timeout logic\&. Defaults to 90s\&.
-.RE
-.PP
-\fIKillMode=\fR
-.RS 4
-Specifies how processes of this mount shall be killed\&. One of
-\fBcontrol\-group\fR,
-\fBprocess\fR,
-\fBnone\fR\&.
-.sp
-This option is mostly equivalent to the
-\fBKillMode=\fR
-option of service files\&. See
-\fBsystemd.service\fR(5)
-for details\&.
-.RE
-.PP
-\fIKillSignal=\fR
-.RS 4
-Specifies which signal to use when killing a process of this mount\&. Defaults to SIGTERM\&.
-.RE
-.PP
-\fISendSIGKILL=\fR
-.RS 4
-Specifies whether to send SIGKILL to remaining processes after a timeout, if the normal shutdown procedure left processes of the mount around\&. Takes a boolean value\&. Defaults to "yes"\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.exec\fR(5),
-\fBsystemd.device\fR(5),
-\fBmount\fR(8)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 8f1cc51..d397c89 100644 (file)
@@ -99,7 +99,7 @@
         </refsect1>
 
         <refsect1>
-                <title><filename>/etc/fstab</filename></title>
+                <title><filename>fstab</filename></title>
 
                 <para>Mount units may either be configured via unit
                 files, or via <filename>/etc/fstab</filename> (see
                 few special mount options are understood by systemd
                 which influence how dependencies are created for mount
                 points from <filename>/etc/fstab</filename>. If
-                <option>MountAuto=yes</option> is set in
-                <filename>system.conf</filename> (which is the
-                default), or if <option>x-systemd.mount</option> is
-                specified as mount option, then systemd will create a
-                dependency of type <option>Wants</option> from either
+                <option>comment=systemd.mount</option> is specified as
+                mount option, then systemd will create a dependency of
+                type <option>Wants</option> from either
                 <filename>local-fs.target</filename> or
                 <filename>remote-fs.target</filename>, depending
                 whether the file system is local or remote. If
-                <option>x-systemd.automount</option> is set, an
-                automount unit will be created for the file
-                system. See
+                <option>comment=systemd.automount</option> is set, an
+                automount unit will be created for the file system. See
                 <citerefentry><refentrytitle>systemd.automount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                for details. If
-                <option>x-systemd-device-timeout=</option> is
-                specified it may be used to configure how long systemd
-                should wait for a device to show up before giving up
-                on an entry from
-                <filename>/etc/fstab</filename>. Specify a time in
-                seconds or explicitly specifiy a unit as
-                <literal>s</literal>, <literal>min</literal>,
-                <literal>h</literal>, <literal>ms</literal>.</para>
+                for details.</para>
 
                 <para>If a mount point is configured in both
                 <filename>/etc/fstab</filename> and a unit file, the
diff --git a/man/systemd.path.5 b/man/systemd.path.5
deleted file mode 100644 (file)
index b5df95f..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-'\" t
-.\"     Title: systemd.path
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.path
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.PATH" "5" "02/15/2012" "systemd" "systemd.path"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.path \- systemd path configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.path
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.path
-encodes information about a path monitored by systemd, for path\-based activation\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. The path specific configuration options are configured in the [Path] section\&.
-.PP
-For each path file, a matching unit file must exist, describing the unit to activate when the path changes\&. By default, a service by the same name as the path (except for the suffix) is activated\&. Example: a path file
-foo\&.path
-activates a matching service
-foo\&.service\&. The unit to activate may be controlled by
-\fIUnit=\fR
-(see below)\&.
-.PP
-Internally, path units use the
-\fBinotify\fR(7)
-API to monitor file systems\&. Due to that, it suffers by the same limitations as inotify, and for example cannot be used to monitor files or directories changed by other machines on remote NFS file systems\&.
-.PP
-If an path unit is beneath another mount point in the file system hierarchy, a dependency between both units is created automatically\&.
-.PP
-Unless
-\fIDefaultDependencies=\fR
-is set to
-\fBfalse\fR, path units will implicitly have dependencies of type
-\fIConflicts=\fR
-and
-\fIBefore=\fR
-on
-shutdown\&.target\&. These ensure that path units are terminated cleanly prior to system shutdown\&. Only path units involved with early boot or late system shutdown should disable this option\&.
-.SH "OPTIONS"
-.PP
-Path files must include a [Path] section, which carries information about the path(s) it monitors\&. The options specific to the [Path] section of path units are the following:
-.PP
-\fIPathExists=\fR, \fIPathExistsGlob=\fR, \fIPathChanged=\fR, \fIPathModified=\fR, \fIDirectoryNotEmpty=\fR
-.RS 4
-Defines paths to monitor for certain changes:
-\fIPathExists=\fR
-may be used to watch the mere existence of a file or directory\&. If the file specified exists the configured unit is activated\&.
-\fIPathExistsGlob=\fR
-works similar, but checks for the existance of at least one file matching the globbing pattern specified\&.
-\fIPathChanged=\fR
-may be used to watch a file or directory and activate the configured unit whenever it changes\&. It is not activated on every write to the watched file but it is activated if the file which was open for writing gets closed\&.
-\fIPathModified=\fR
-is similar, but additionally it is activated also on simple writes to the watched file\&.
-\fIDirectoryNotEmpty=\fR
-may be used to watch a directory and activate the configured unit whenever it contains at least one file\&.
-.sp
-The arguments of these directives must be absolute file system paths\&.
-.sp
-Multiple directives may be combined, of the same and of different types, to watch multiple paths\&.
-.sp
-If a path is already existing (in case of
-\fIPathExists=\fR
-and
-\fIPathExistsGlob=\fR) or a directory already is not empty (in case of
-\fIDirectoryNotEmpty=\fR) at the time the path unit is activated, then the configured unit is immediately activated as well\&. Something similar does not apply to
-\fIPathChanged=\fR\&.
-.RE
-.PP
-\fIUnit=\fR
-.RS 4
-The unit to activate when any of the configured paths changes\&. The argument is a unit name, whose suffix is not
-\&.path\&. If not specified, this value defaults to a service that has the same name as the path unit, except for the suffix\&. (See above\&.) It is recommended that the unit name that is activated and the unit name of the path unit are named identical, except for the suffix\&.
-.RE
-.PP
-\fIMakeDirectory=\fR
-.RS 4
-Takes a boolean argument\&. If true the directories to watch are created before watching\&. This option is ignored for
-\fIPathExists=\fR
-settings\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIDirectoryMode=\fR
-.RS 4
-If
-\fIMakeDirectory=\fR
-is enabled use the mode specified here to create the directories in question\&. Takes an access mode in octal notation\&. Defaults to
-\fB0755\fR\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.service\fR(5),
-\fBinotify\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 5b1ff75..10d8f73 100644 (file)
                                 <term><varname>PathExists=</varname></term>
                                 <term><varname>PathExistsGlob=</varname></term>
                                 <term><varname>PathChanged=</varname></term>
-                                <term><varname>PathModified=</varname></term>
                                 <term><varname>DirectoryNotEmpty=</varname></term>
 
                                 <listitem><para>Defines paths to
                                 specified. <varname>PathChanged=</varname>
                                 may be used to watch a file or
                                 directory and activate the configured
-                                unit whenever it changes. It is not activated
-                                on every write to the watched file but it is
-                                activated if the file which was open for writing
-                                gets closed. <varname>PathModified=</varname>
-                                is similar, but additionally it is activated
-                                also on simple writes to the watched file.
-
-                                <varname>DirectoryNotEmpty=</varname>
+                                unit whenever it changes or is
+                                modified. <varname>DirectoryNotEmpty=</varname>
                                 may be used to watch a directory and
                                 activate the configured unit whenever
                                 it contains at least one file.</para>
                                 activated, then the configured unit is
                                 immediately activated as
                                 well. Something similar does not apply
-                                to <varname>PathChanged=</varname>.
+                                to
+                                <varname>PathChanged=</varname>. The
+                                latter is not activated on simple
+                                writes but only if files with were
+                                opened for writing are closed.
                                 </para></listitem>
                         </varlistentry>
                         <varlistentry>
diff --git a/man/systemd.service.5 b/man/systemd.service.5
deleted file mode 100644 (file)
index fc2c369..0000000
+++ /dev/null
@@ -1,473 +0,0 @@
-'\" t
-.\"     Title: systemd.service
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.service
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.SERVICE" "5" "02/15/2012" "systemd" "systemd.service"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.service \- systemd service configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.service
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.service
-encodes information about a process controlled and supervised by systemd\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic
-[Unit]
-and
-[Install]
-sections\&. The service specific configuration options are configured in the
-[Service]
-section\&.
-.PP
-Additional options are listed in
-\fBsystemd.exec\fR(5), which define the execution environment the commands are executed in\&.
-.PP
-Unless
-\fIDefaultDependencies=\fR
-is set to
-\fBfalse\fR, service units will implicitly have dependencies of type
-\fIRequires=\fR
-and
-\fIAfter=\fR
-on
-basic\&.target
-as well as dependencies of type
-\fIConflicts=\fR
-and
-\fIBefore=\fR
-on
-shutdown\&.target\&. These ensure that normal service units pull in basic system initialization, and are terminated cleanly prior to system shutdown\&. Only services involved with early boot or late system shutdown should disable this option\&.
-.PP
-If a service is requested under a certain name but no unit configuration file is found, systemd looks for a SysV init script by the same name (with the
-\&.service
-suffix removed) and dynamically creates a service unit from that script\&. This is useful for compatibility with SysV\&.
-.SH "OPTIONS"
-.PP
-Service files must include a
-[Service]
-section, which carries information about the service and the process it supervises\&. A number of options that may be used in this section are shared with other unit types\&. These options are documented in
-\fBsystemd.exec\fR(5)\&. The options specific to the
-[Service]
-section of service units are the following:
-.PP
-\fIType=\fR
-.RS 4
-Configures the process start\-up type for this service unit\&. One of
-\fBsimple\fR,
-\fBforking\fR,
-\fBoneshot\fR,
-\fBdbus\fR,
-\fBnotify\fR\&.
-.sp
-If set to
-\fBsimple\fR
-(the default value) it is expected that the process configured with
-\fIExecStart=\fR
-is the main process of the service\&. In this mode, if the process offers functionality to other processes on the system its communication channels should be installed before the daemon is started up (e\&.g\&. sockets set up by systemd, via socket activation), as systemd will immediately proceed starting follow\-up units\&.
-.sp
-If set to
-\fBforking\fR
-it is expected that the process configured with
-\fIExecStart=\fR
-will call
-\fBfork()\fR
-as part of its start\-up\&. The parent process is expected to exit when start\-up is complete and all communication channels set up\&. The child continues to run as the main daemon process\&. This is the behaviour of traditional UNIX daemons\&. If this setting is used, it is recommended to also use the
-\fIPIDFile=\fR
-option, so that systemd can identify the main process of the daemon\&. systemd will proceed starting follow\-up units as soon as the parent process exits\&.
-.sp
-Behaviour of
-\fBoneshot\fR
-is similar to
-\fBsimple\fR, however it is expected that the process has to exit before systemd starts follow\-up units\&.
-\fIRemainAfterExit=\fR
-is particularly useful for this type of service\&.
-.sp
-Behaviour of
-\fBdbus\fR
-is similar to
-\fBsimple\fR, however it is expected that the daemon acquires a name on the D\-Bus bus, as configured by
-\fIBusName=\fR\&. systemd will proceed starting follow\-up units after the D\-Bus bus name has been acquired\&. Service units with this option configured implicitly gain dependencies on the
-dbus\&.socket
-unit\&.
-.sp
-Behaviour of
-\fBnotify\fR
-is similar to
-\fBsimple\fR, however it is expected that the daemon sends a notification message via
-\fBsd_notify\fR(3)
-or an equivalent call when it finished starting up\&. systemd will proceed starting follow\-up units after this notification message has been sent\&. If this option is used
-\fINotifyAccess=\fR
-(see below) should be set to open access to the notification socket provided by systemd\&. If
-\fINotifyAccess=\fR
-is not set, it will be implicitly set to
-\fBmain\fR\&.
-.RE
-.PP
-\fIRemainAfterExit=\fR
-.RS 4
-Takes a boolean value that specifies whether the service shall be considered active even when all its processes exited\&. Defaults to
-\fBno\fR\&.
-.RE
-.PP
-\fIGuessMainPID=\fR
-.RS 4
-Takes a boolean value that specifies whether systemd should try to guess the main PID of a service should if it cannot be determined reliably\&. This option is ignored unless
-\fBType=forking\fR
-is set and
-\fBPIDFile=\fR
-is unset because for the other types or with an explicitly configured PID file the main PID is always known\&. The guessing algorithm might come to incorrect conclusions if a daemon consists of more than one process\&. If the main PID cannot be determined failure detection and automatic restarting of a service will not work reliably\&. Defaults to
-\fByes\fR\&.
-.RE
-.PP
-\fIPIDFile=\fR
-.RS 4
-Takes an absolute file name pointing to the PID file of this daemon\&. Use of this option is recommended for services where
-\fIType=\fR
-is set to
-\fBforking\fR\&. systemd will read the PID of the main process of the daemon after start\-up of the service\&. systemd will not write to the file configured here\&.
-.RE
-.PP
-\fIBusName=\fR
-.RS 4
-Takes a D\-Bus bus name, where this service is reachable as\&. This option is mandatory for services where
-\fIType=\fR
-is set to
-\fBdbus\fR, but its use is otherwise recommended as well if the process takes a name on the D\-Bus bus\&.
-.RE
-.PP
-\fIExecStart=\fR
-.RS 4
-Takes a command line that is executed when this service shall be started up\&. The first token of the command line must be an absolute file name, then followed by arguments for the process\&. It is mandatory to set this option for all services\&. This option may not be specified more than once, except when
-\fIType=oneshot\fR
-is used in which case more than one
-\fIExecStart=\fR
-line is accepted which are then invoked one by one, sequentially in the order they appear in the unit file\&.
-.sp
-Optionally, if the absolute file name is prefixed with
-@, the second token will be passed as
-argv[0]
-to the executed process, followed by the further arguments specified\&. If the first token is prefixed with
-\-
-an exit code of the command normally considered a failure (i\&.e\&. non\-zero exit status or abnormal exit due to signal) is ignored and considered success\&. If both
-\-
-and
-@
-are used for the same command the former must precede the latter\&. Unless
-\fIType=forking\fR
-is set, the process started via this command line will be considered the main process of the daemon\&. The command line accepts % specifiers as described in
-\fBsystemd.unit\fR(5)\&.
-.sp
-On top of that basic environment variable substitution is supported\&. Use
-${FOO}
-as part of a word, or as word of its own on the command line, in which case it will be replaced by the value of the environment variable including all whitespace it contains, resulting in a single argument\&. Use
-$FOO
-as a separate word on the command line, in which case it will be replaced by the value of the environment variable split up at whitespace, resulting in no or more arguments\&. Note that the first argument (i\&.e\&. the program to execute) may not be a variable, and must be a literal and absolute path name\&.
-.RE
-.PP
-\fIExecStartPre=\fR, \fIExecStartPost=\fR
-.RS 4
-Additional commands that are executed before (resp\&. after) the command in
-\fIExecStart=\fR\&. Multiple command lines may be concatenated in a single directive, by separating them by semicolons (these semicolons must be passed as separate words)\&. In that case, the commands are executed one after the other, serially\&. Alternatively, these directives may be specified more than once with the same effect\&. However, the latter syntax is not recommended for compatibility with parsers suitable for XDG
-\&.desktop
-files\&. Use of these settings is optional\&. Specifier and environment variable substitution is supported\&.
-.RE
-.PP
-\fIExecReload=\fR
-.RS 4
-Commands to execute to trigger a configuration reload in the service\&. This argument takes multiple command lines, following the same scheme as pointed out for
-\fIExecStartPre=\fR
-above\&. Use of this setting is optional\&. Specifier and environment variable substitution is supported here following the same scheme as for
-\fIExecStart=\fR\&. One special environment variable is set: if known
-$MAINPID
-is set to the main process of the daemon, and may be used for command lines like the following:
-\fB/bin/kill \-HUP $MAINPID\fR\&.
-.RE
-.PP
-\fIExecStop=\fR
-.RS 4
-Commands to execute to stop the service started via
-\fIExecStart=\fR\&. This argument takes multiple command lines, following the same scheme as pointed out for
-\fIExecStartPre=\fR
-above\&. Use of this setting is optional\&. All processes remaining for a service after the commands configured in this option are run are terminated according to the
-\fIKillMode=\fR
-setting (see below)\&. If this option is not specified the process is terminated right\-away when service stop is requested\&. Specifier and environment variable substitution is supported (including
-$MAINPID, see above)\&.
-.RE
-.PP
-\fIExecStopPost=\fR
-.RS 4
-Additional commands that are executed after the service was stopped using the commands configured in
-\fIExecStop=\fR\&. This argument takes multiple command lines, following the same scheme as pointed out for
-\fIExecStartPre\fR\&. Use of these settings is optional\&. Specifier and environment variable substitution is supported\&.
-.RE
-.PP
-\fIRestartSec=\fR
-.RS 4
-Configures the time to sleep before restarting a service (as configured with
-\fIRestart=\fR)\&. Takes a unit\-less value in seconds, or a time span value such as "5min 20s"\&. Defaults to 100ms\&.
-.RE
-.PP
-\fITimeoutSec=\fR
-.RS 4
-Configures the time to wait for start\-up and stop\&. If a daemon service does not signal start\-up completion within the configured time the service will be considered failed and be shut down again\&. If a service is asked to stop but does not terminate in the specified time it will be terminated forcibly via SIGTERM, and after another delay of this time with SIGKILL\&. (See
-\fIKillMode=\fR
-below\&.) Takes a unit\-less value in seconds, or a time span value such as "5min 20s"\&. Pass 0 to disable the timeout logic\&. Defaults to 90s\&.
-.RE
-.PP
-\fIWatchdogSec=\fR
-.RS 4
-Configures the watchdog timeout for a service\&. This is activated when the start\-up is completed\&. The service must call
-\fBsd_notify\fR(3)
-regularly with "WATCHDOG=1"\&. If the time between two such calls is larger than the configured time then the service is placed in a failure state\&. By setting
-\fIRestart=\fR
-to
-\fBon\-failure\fR
-or
-\fBalways\fR
-the service will be automatically restarted\&. The time configured here will be passed to the executed service process in the
-\fIWATCHDOG_USEC=\fR
-environment variable\&. If this option is used
-\fINotifyAccess=\fR
-(see below) should be set to open access to the notification socket provided by systemd\&. If
-\fINotifyAccess=\fR
-is not set, it will be implicitly set to
-\fBmain\fR\&. Defaults to 0, which disables this feature\&.
-.RE
-.PP
-\fIRestart=\fR
-.RS 4
-Configures whether the main service process shall be restarted when it exits\&. Takes one of
-\fBno\fR,
-\fBon\-success\fR,
-\fBon\-failure\fR,
-\fBon\-abort\fR
-or
-\fBalways\fR\&. If set to
-\fBno\fR
-(the default) the service will not be restarted when it exits\&. If set to
-\fBon\-success\fR
-it will be restarted only when it exited cleanly, i\&.e\&. terminated with an exit code of 0\&. If set to
-\fBon\-failure\fR
-it will be restarted only when it exited with an exit code not equalling 0, when terminated by a signal, when an operation times out or when the configured watchdog timeout is triggered\&. If set to
-\fBon\-abort\fR
-it will be restarted only if it exits due to reception of an uncaught signal\&. If set to
-\fBalways\fR
-the service will be restarted regardless whether it exited cleanly or not, got terminated abnormally by a signal or hit a timeout\&.
-.RE
-.PP
-\fIPermissionsStartOnly=\fR
-.RS 4
-Takes a boolean argument\&. If true, the permission related execution options as configured with
-\fIUser=\fR
-and similar options (see
-\fBsystemd.exec\fR(5)
-for more information) are only applied to the process started with
-\fIExecStart=\fR, and not to the various other
-\fIExecStartPre=\fR,
-\fIExecStartPost=\fR,
-\fIExecReload=\fR,
-\fIExecStop=\fR,
-\fIExecStopPost=\fR
-commands\&. If false, the setting is applied to all configured commands the same way\&. Defaults to false\&.
-.RE
-.PP
-\fIRootDirectoryStartOnly=\fR
-.RS 4
-Takes a boolean argument\&. If true, the root directory as configured with the
-\fIRootDirectory=\fR
-option (see
-\fBsystemd.exec\fR(5)
-for more information) is only applied to the process started with
-\fIExecStart=\fR, and not to the various other
-\fIExecStartPre=\fR,
-\fIExecStartPost=\fR,
-\fIExecReload=\fR,
-\fIExecStop=\fR,
-\fIExecStopPost=\fR
-commands\&. If false, the setting is applied to all configured commands the same way\&. Defaults to false\&.
-.RE
-.PP
-\fISysVStartPriority=\fR
-.RS 4
-Set the SysV start priority to use to order this service in relation to SysV services lacking LSB headers\&. This option is only necessary to fix ordering in relation to legacy SysV services, that have no ordering information encoded in the script headers\&. As such it should only be used as temporary compatibility option, and not be used in new unit files\&. Almost always it is a better choice to add explicit ordering directives via
-\fIAfter=\fR
-or
-\fIBefore=\fR, instead\&. For more details see
-\fBsystemd.unit\fR(5)\&. If used, pass an integer value in the range 0\-99\&.
-.RE
-.PP
-\fIKillMode=\fR
-.RS 4
-Specifies how processes of this service shall be killed\&. One of
-\fBcontrol\-group\fR,
-\fBprocess\fR,
-\fBnone\fR\&.
-.sp
-If set to
-\fBcontrol\-group\fR
-all remaining processes in the control group of this service will be terminated on service stop, after the stop command (as configured with
-\fIExecStop=\fR) is executed\&. If set to
-\fBprocess\fR
-only the main process itself is killed\&. If set to
-\fBnone\fR
-no process is killed\&. In this case only the stop command will be executed on service stop, but no process be killed otherwise\&. Processes remaining alive after stop are left in their control group and the control group continues to exist after stop unless it is empty\&. Defaults to
-\fBcontrol\-group\fR\&.
-.sp
-Processes will first be terminated via SIGTERM (unless the signal to send is changed via
-\fIKillSignal=\fR)\&. If then after a delay (configured via the
-\fITimeoutSec=\fR
-option) processes still remain, the termination request is repeated with the SIGKILL signal (unless this is disabled via the
-\fISendSIGKILL=\fR
-option)\&. See
-\fBkill\fR(2)
-for more information\&.
-.RE
-.PP
-\fIKillSignal=\fR
-.RS 4
-Specifies which signal to use when killing a service\&. Defaults to SIGTERM\&.
-.RE
-.PP
-\fISendSIGKILL=\fR
-.RS 4
-Specifies whether to send SIGKILL to remaining processes after a timeout, if the normal shutdown procedure left processes of the service around\&. Takes a boolean value\&. Defaults to "yes"\&.
-.RE
-.PP
-\fINonBlocking=\fR
-.RS 4
-Set O_NONBLOCK flag for all file descriptors passed via socket\-based activation\&. If true, all file descriptors >= 3 (i\&.e\&. all except STDIN/STDOUT/STDERR) will have the O_NONBLOCK flag set and hence are in non\-blocking mode\&. This option is only useful in conjunction with a socket unit, as described in
-\fBsystemd.socket\fR(5)\&. Defaults to false\&.
-.RE
-.PP
-\fINotifyAccess=\fR
-.RS 4
-Controls access to the service status notification socket, as accessible via the
-\fBsd_notify\fR(3)
-call\&. Takes one of
-\fBnone\fR
-(the default),
-\fBmain\fR
-or
-\fBall\fR\&. If
-\fBnone\fR
-no daemon status updates are accepted from the service processes, all status update messages are ignored\&. If
-\fBmain\fR
-only service updates sent from the main process of the service are accepted\&. If
-\fBall\fR
-all services updates from all members of the service\*(Aqs control group are accepted\&. This option should be set to open access to the notification socket when using
-\fIType=notify\fR
-or
-\fIWatchdogUsec=\fR
-(see above)\&. If those options are used but
-\fINotifyAccess=\fR
-not configured it will be implicitly set to
-\fBmain\fR\&.
-.RE
-.PP
-\fISockets=\fR
-.RS 4
-Specifies the name of the socket units this service shall inherit the sockets from when the service is started\&. Normally it should not be necessary to use this setting as all sockets whose unit shares the same name as the service (ignoring the different suffix of course) are passed to the spawned process\&.
-.sp
-Note that the same socket may be passed to multiple processes at the same time\&. Also note that a different service may be activated on incoming traffic than inherits the sockets\&. Or in other words: The
-\fIService=\fR
-setting of
-\&.socket
-units doesn\*(Aqt have to match the inverse of the
-\fISockets=\fR
-setting of the
-\&.service
-it refers to\&.
-.RE
-.PP
-\fIFsckPassNo=\fR
-.RS 4
-Set the fsck passno priority to use to order this service in relation to other file system checking services\&. This option is only necessary to fix ordering in relation to fsck jobs automatically created for all
-/etc/fstab
-entries with a value in the fs_passno column > 0\&. As such it should only be used as option for fsck services\&. Almost always it is a better choice to add explicit ordering directives via
-\fIAfter=\fR
-or
-\fIBefore=\fR, instead\&. For more details see
-\fBsystemd.unit\fR(5)\&. If used, pass an integer value in the same range as
-/etc/fstab\*(Aqs fs_passno column\&. See
-\fBfstab\fR(5)
-for details\&.
-.RE
-.PP
-\fIStartLimitInterval=\fR, \fIStartLimitBurst=\fR
-.RS 4
-Configure service start rate limiting\&. By default services which are started more often than 5 times within 10s are not permitted to start any more times until the 10s interval ends\&. With these two options this rate limiting may be modified\&. Use
-\fIStartLimitInterval=\fR
-to configure the checking interval (defaults to 10s, set to 0 to disable any kind of rate limiting)\&. Use
-\fIStartLimitBurst=\fR
-to configure how many starts per interval are allowed (defaults to 5)\&. These configuration options are particularly useful in conjunction with
-\fIRestart=\fR\&.
-.RE
-.PP
-\fIStartLimitAction=\fR
-.RS 4
-Configure the action to take if the rate limit configured with
-\fIStartLimitInterval=\fR
-and
-\fIStartLimitBurst=\fR
-is hit\&. Takes one of
-\fBnone\fR,
-\fBreboot\fR,
-\fBreboot\-force\fR
-or
-\fBreboot\-immediate\fR\&. If
-\fBnone\fR
-is set, hitting the rate limit will trigger no action besides that the start will not be permitted\&.
-\fBreboot\fR
-causes a reboot following the normal shutdown procedure (i\&.e\&. equivalent to
-\fBsystemctl reboot\fR),
-\fBreboot\-force\fR
-causes an forced reboot which will terminate all processes forcibly but should cause no dirty file systems on reboot (i\&.e\&. equivalent to
-\fBsystemctl reboot \-f\fR) and
-\fBreboot\-immediate\fR
-causes immediate execution of the
-\fBreboot\fR(2)
-system call, which might result in data loss\&. Defaults to
-\fBnone\fR\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.exec\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
index 837a992..7b6f12d 100644 (file)
                                 below) should be set to open access to
                                 the notification socket provided by
                                 systemd. If
-                                <varname>NotifyAccess=</varname> is
-                                not set, it will be implicitly set to
+                                <varname>NotifyAccess=</varname> is not
+                                set, it will implicitly be set to
                                 <option>main</option>.</para>
                                 </listitem>
                         </varlistentry>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>WatchdogSec=</varname></term>
-                                <listitem><para>Configures the
-                                watchdog timeout for a service. This
-                                is activated when the start-up is
-                                completed. The service must call
-                                <citerefentry><refentrytitle>sd_notify</refentrytitle><manvolnum>3</manvolnum></citerefentry>
-                                regularly with "WATCHDOG=1". If the
-                                time between two such calls is larger
-                                than the configured time then the
-                                service is placed in a failure
-                                state. By setting
-                                <varname>Restart=</varname>
-                                to <option>on-failure</option> or
-                                <option>always</option> the service
-                                will be automatically restarted. The
-                                time configured here will be passed to
-                                the executed service process in the
-                                <varname>WATCHDOG_USEC=</varname>
-                                environment variable. If
-                                this option is used
-                                <varname>NotifyAccess=</varname> (see
-                                below) should be set to open access to
-                                the notification socket provided by
-                                systemd. If
-                                <varname>NotifyAccess=</varname> is not
-                                set, it will be implicitly set to
-                                <option>main</option>. Defaults to 0,
-                                which disables this
-                                feature.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><varname>Restart=</varname></term>
                                 <listitem><para>Configures whether the
                                 main service process shall be
                                 0. If set to
                                 <option>on-failure</option> it will be
                                 restarted only when it exited with an
-                                exit code not equalling 0, when
-                                terminated by a signal, when an
-                                operation times out or when the
-                                configured watchdog timeout is
-                                triggered. If set to
+                                exit code not equalling 0, or when
+                                terminated by a signal. If set to
                                 <option>on-abort</option> it will be
                                 restarted only if it exits due to
                                 reception of an uncaught signal. If
                                 set to <option>always</option> the
                                 service will be restarted regardless
-                                whether it exited cleanly or not,
+                                whether it exited cleanly or not, or
                                 got terminated abnormally by a
-                                signal or hit a timeout.</para></listitem>
+                                signal.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 accepted. If <option>all</option> all
                                 services updates from all members of
                                 the service's control group are
-                                accepted. This option should be set to
+                                accepted. This option must be set to
                                 open access to the notification socket
                                 when using
-                                <varname>Type=notify</varname> or
-                                <varname>WatchdogUsec=</varname> (see
-                                above). If those options are used but
-                                <varname>NotifyAccess=</varname> not
-                                configured it will be implicitly set
-                                to
-                                <option>main</option>.</para></listitem>
+                                <varname>Type=notify</varname> (see above).</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
                                 <listitem><para>Specifies the name of
                                 the socket units this service shall
                                 inherit the sockets from when the
-                                service is started. Normally it
+                                service (ignoring the different suffix
+                                of course) is started. Normally it
                                 should not be necessary to use this
                                 setting as all sockets whose unit
                                 shares the same name as the service
-                                (ignoring the different suffix of course)
                                 are passed to the spawned
                                 process.</para>
 
                                 for details.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><varname>StartLimitInterval=</varname></term>
-                                <term><varname>StartLimitBurst=</varname></term>
-
-                                <listitem><para>Configure service
-                                start rate limiting. By default
-                                services which are started more often
-                                than 5 times within 10s are not
-                                permitted to start any more times
-                                until the 10s interval ends. With
-                                these two options this rate limiting
-                                may be modified. Use
-                                <varname>StartLimitInterval=</varname>
-                                to configure the checking interval
-                                (defaults to 10s, set to 0 to disable
-                                any kind of rate limiting). Use
-                                <varname>StartLimitBurst=</varname> to
-                                configure how many starts per interval
-                                are allowed (defaults to 5). These
-                                configuration options are particularly
-                                useful in conjunction with
-                                <varname>Restart=</varname>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><varname>StartLimitAction=</varname></term>
-
-                                <listitem><para>Configure the action
-                                to take if the rate limit configured
-                                with
-                                <varname>StartLimitInterval=</varname>
-                                and
-                                <varname>StartLimitBurst=</varname> is
-                                hit. Takes one of
-                                <option>none</option>,
-                                <option>reboot</option>,
-                                <option>reboot-force</option> or
-                                <option>reboot-immediate</option>. If
-                                <option>none</option> is set,
-                                hitting the rate limit will trigger no
-                                action besides that the start will not
-                                be
-                                permitted. <option>reboot</option>
-                                causes a reboot following the normal
-                                shutdown procedure (i.e. equivalent to
-                                <command>systemctl reboot</command>),
-                                <option>reboot-force</option> causes
-                                an forced reboot which will terminate
-                                all processes forcibly but should
-                                cause no dirty file systems on reboot
-                                (i.e. equivalent to <command>systemctl
-                                reboot -f</command>) and
-                                <option>reboot-immediate</option>
-                                causes immediate execution of the
-                                <citerefentry><refentrytitle>reboot</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-                                system call, which might result in
-                                data loss.  Defaults to
-                                <option>none</option>.</para></listitem>
-                        </varlistentry>
-
                 </variablelist>
         </refsect1>
 
diff --git a/man/systemd.snapshot.5 b/man/systemd.snapshot.5
deleted file mode 100644 (file)
index dc59f23..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-'\" t
-.\"     Title: systemd.snapshot
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.snapshot
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.SNAPSHOT" "5" "02/15/2012" "systemd" "systemd.snapshot"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.snapshot \- systemd snapshot units
-.SH "SYNOPSIS"
-.PP
-systemd\&.snapshot
-.SH "DESCRIPTION"
-.PP
-Snapshot units are not configured via unit configuration files\&. Nonetheless they are named similar to filenames\&. A unit name whose name ends in
-\&.snapshot
-refers to a dynamic snapshot of the systemd runtime state\&.
-.PP
-Snapshots are not configured on disk but created dynamically via
-\fBsystemctl snapshot\fR
-(see
-\fBsystemctl\fR(8)
-for details) or an equivalent command\&. When created, they will automatically get dependencies on the currently activated units\&. They act as saved runtime state of the systemd manager\&. Later on, the user may choose to return to the saved state via
-\fBsystemctl isolate\fR\&. They are useful to roll back to a defined state after temporarily starting/stopping services or similar\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.socket.5 b/man/systemd.socket.5
deleted file mode 100644 (file)
index 2f286ec..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-'\" t
-.\"     Title: systemd.socket
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.socket
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.SOCKET" "5" "02/15/2012" "systemd" "systemd.socket"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.socket \- systemd socket configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.socket
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.socket
-encodes information about an IPC or network socket or a file system FIFO controlled and supervised by systemd, for socket\-based activation\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. The socket specific configuration options are configured in the [Socket] section\&.
-.PP
-Additional options are listed in
-\fBsystemd.exec\fR(5), which define the execution environment the
-\fBExecStartPre=\fR,
-\fBExecStartPost=\fR,
-\fBExecStopPre=\fR
-and
-\fBExecStoptPost=\fR
-commands are executed in\&.
-.PP
-For each socket file a matching service file (see
-\fBsystemd.service\fR(5)
-for details) must exist, describing the service to start on incoming traffic on the socket\&. Depending on the setting of
-\fBAccept=\fR
-(see below), this must either be named like the socket unit, but with the suffix replaced; or it must be a template file named the same way\&. Example: a socket file
-foo\&.socket
-needs a matching service
-foo\&.service
-if
-\fBAccept=false\fR
-is set\&. If
-\fBAccept=true\fR
-is set a service template file
-foo@\&.service
-must exist from which services are instantiated for each incoming connection\&.
-.PP
-Unless
-\fIDefaultDependencies=\fR
-is set to
-\fBfalse\fR, socket units will implicitly have dependencies of type
-\fIRequires=\fR
-and
-\fIAfter=\fR
-on
-sysinit\&.target
-as well as dependencies of type
-\fIConflicts=\fR
-and
-\fIBefore=\fR
-on
-shutdown\&.target\&. These ensure that socket units pull in basic system initialization, and are terminated cleanly prior to system shutdown\&. Only sockets involved with early boot or late system shutdown should disable this option\&.
-.PP
-Socket units may be used to implement on\-demand starting of services, as well as parallelized starting of services\&.
-.PP
-Note that the daemon software configured for socket activation with socket units needs to be able to accept sockets from systemd, either via systemd\*(Aqs native socket passing interface (see
-\fBsd_listen_fds\fR(3)
-for details) or via the traditional
-\fBinetd\fR(8)\-style socket passing (i\&.e\&. sockets passed in via STDIN and STDOUT, using
-\fIStandardInput=socket\fR
-in the service file)\&.
-.SH "OPTIONS"
-.PP
-Socket files must include a [Socket] section, which carries information about the socket or FIFO it supervises\&. A number of options that may be used in this section are shared with other unit types\&. These options are documented in
-\fBsystemd.exec\fR(5)\&. The options specific to the [Socket] section of socket units are the following:
-.PP
-\fIListenStream=\fR, \fIListenDatagram=\fR, \fIListenSequentialPacket=\fR
-.RS 4
-Specifies an address to listen on for a stream (SOCK_STREAM), datagram (SOCK_DGRAM) resp\&. sequential packet (SOCK_SEQPACKET) socket\&. The address can be written in various formats:
-.sp
-If the address starts with a slash (/), it is read as file system socket in the AF_UNIX socket family\&.
-.sp
-If the address starts with an at symbol (@) it is read as abstract namespace socket in the AF_UNIX family\&. The @ is replaced with a NUL character before binding\&. For details see
-\fBunix\fR(7)\&.
-.sp
-If the address string is a single number it is read as port number to listen on for both IPv4 and IPv6\&.
-.sp
-If the address string is a string in the format v\&.w\&.x\&.y:z it is read as IPv4 specifier for listening on an address v\&.w\&.x\&.y on a port z\&.
-.sp
-If the address string is a string in the format [x]:y it is read as IPv6 address x on a port y\&.
-.sp
-Note that SOCK_SEQPACKET (i\&.e\&.
-\fIListenSequentialPacket=\fR) is only available for AF_UNIX sockets\&. SOCK_STREAM (i\&.e\&.
-\fIListenStream=\fR) when used for IP sockets refers to TCP sockets, SOCK_DGRAM (i\&.e\&.
-\fIListenDatagram=\fR) to UDP\&.
-.sp
-These options may be specified more than once in which case incoming traffic on any of the sockets will trigger service activation, and all listed sockets will be passed to the service, regardless whether there is incoming traffic on them or not\&.
-.sp
-If an IP address is used here, it is often desirable to listen on it before the interface it is configured on is up and running, and even regardless whether it will be up and running ever at all\&. To deal with this it is recommended to set the
-\fIFreeBind=\fR
-option described below\&.
-.RE
-.PP
-\fIListenFIFO=\fR
-.RS 4
-Specifies a file system FIFO to listen on\&. This expects an absolute file system path as argument\&. Behaviour otherwise is very similar to the
-\fIListenDatagram=\fR
-directive above\&.
-.RE
-.PP
-\fIListenSpecial=\fR
-.RS 4
-Specifies a special file in the file system to listen on\&. This expects an absolute file system path as argument\&. Behaviour otherwise is very similar to the
-\fIListenFIFO=\fR
-directive above\&. Use this to open character device nodes as well as special files in
-/proc
-and
-/sys\&.
-.RE
-.PP
-\fIListenNetlink=\fR
-.RS 4
-Specifies a Netlink family to create a socket for to listen on\&. This expects a short string referring to the AF_NETLINK family name (such as
-\fIaudit\fR
-or
-\fIkobject\-uevent\fR) as argument, optionally suffixed by a whitespace followed by a multicast group integer\&. Behaviour otherwise is very similar to the
-\fIListenDatagram=\fR
-directive above\&.
-.RE
-.PP
-\fIListenMessageQueue=\fR
-.RS 4
-Specifies a POSIX message queue name to listen on\&. This expects a valid message queue name (i\&.e\&. beginning with /)\&. Behaviour otherwise is very similar to the
-\fIListenFIFO=\fR
-directive above\&. On Linux message queue descriptors are actually file descriptors and can be inherited between processes\&.
-.RE
-.PP
-\fIBindIPv6Only=\fR
-.RS 4
-Takes a one of
-\fBdefault\fR,
-\fBboth\fR
-or
-\fBipv6\-only\fR\&. Controls the IPV6_V6ONLY socket option (see
-\fBipv6\fR(7)
-for details)\&. If
-\fBboth\fR, IPv6 sockets bound will be accessible via both IPv4 and IPv6\&. If
-\fBipv6\-only\fR, they will be accessible via IPv6 only\&. If
-\fBdefault\fR
-(which is the default, surprise!) the system wide default setting is used, as controlled by
-/proc/sys/net/ipv6/bindv6only\&.
-.RE
-.PP
-\fIBacklog=\fR
-.RS 4
-Takes an unsigned integer argument\&. Specifies the number of connections to queue that have not been accepted yet\&. This setting matters only for stream and sequential packet sockets\&. See
-\fBlisten\fR(2)
-for details\&. Defaults to SOMAXCONN (128)\&.
-.RE
-.PP
-\fIBindToDevice=\fR
-.RS 4
-Specifies a network interface name to bind this socket to\&. If set traffic will only be accepted from the specified network interfaces\&. This controls the SO_BINDTODEVICE socket option (see
-\fBsocket\fR(7)
-for details)\&. If this option is used, an automatic dependency from this socket unit on the network interface device unit (\fBsystemd.device\fR(5)
-is created\&.
-.RE
-.PP
-\fIDirectoryMode=\fR
-.RS 4
-If listening on a file system socket of FIFO, the parent directories are automatically created if needed\&. This option specifies the file system access mode used when creating these directories\&. Takes an access mode in octal notation\&. Defaults to 0755\&.
-.RE
-.PP
-\fISocketMode=\fR
-.RS 4
-If listening on a file system socket of FIFO, this option specifies the file system access mode used when creating the file node\&. Takes an access mode in octal notation\&. Defaults to 0666\&.
-.RE
-.PP
-\fIAccept=\fR
-.RS 4
-Takes a boolean argument\&. If true, a service instance is spawned for each incoming connection and only the connection socket is passed to it\&. If false, all listening sockets themselves are passed to the started service unit, and only one service unit is spawned for all connections (also see above)\&. This value is ignored for datagram sockets and FIFOs where a single service unit unconditionally handles all incoming traffic\&. Defaults to
-\fBfalse\fR\&. For performance reasons, it is recommended to write new daemons only in a way that is suitable for
-\fBAccept=false\fR\&. This option is mostly useful to allow daemons designed for usage with
-\fBinetd\fR(8), to work unmodified with systemd socket activation\&.
-.RE
-.PP
-\fIMaxConnections=\fR
-.RS 4
-The maximum number of connections to simultaneously run services instances for, when
-\fBAccept=true\fR
-is set\&. If more concurrent connections are coming in, they will be refused until at least one existing connection is terminated\&. This setting has no effect for sockets configured with
-\fBAccept=no\fR
-or datagram sockets\&. Defaults to 64\&.
-.RE
-.PP
-\fIKeepAlive=\fR
-.RS 4
-Takes a boolean argument\&. If true, the TCP/IP stack will send a keep alive message after 2h (depending on the configuration of
-/proc/sys/net/ipv4/tcp_keepalive_time) for all TCP streams accepted on this socket\&. This controls the SO_KEEPALIVE socket option (see
-\fBsocket\fR(7)
-and the
-\m[blue]\fBTCP Keepalive HOWTO\fR\m[]\&\s-2\u[1]\d\s+2
-for details\&.) Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIPriority=\fR
-.RS 4
-Takes an integer argument controlling the priority for all traffic sent from this socket\&. This controls the SO_PRIORITY socket option (see
-\fBsocket\fR(7)
-for details\&.)\&.
-.RE
-.PP
-\fIReceiveBuffer=\fR, \fISendBuffer=\fR
-.RS 4
-Takes an integer argument controlling the receive resp\&. send buffer sizes of this socket\&. This controls the SO_RCVBUF resp\&. SO_SNDBUF socket options (see
-\fBsocket\fR(7)
-for details\&.)\&.
-.RE
-.PP
-\fIIPTOS=\fR
-.RS 4
-Takes an integer argument controlling the IP Type\-Of\-Service field for packets generated from this socket\&. This controls the IP_TOS socket option (see
-\fBip\fR(7)
-for details\&.)\&. Either a numeric string or one of
-\fBlow\-delay\fR,
-\fBthroughput\fR,
-\fBreliability\fR
-or
-\fBlow\-cost\fR
-may be specified\&.
-.RE
-.PP
-\fIIPTTL=\fR
-.RS 4
-Takes an integer argument controlling the IPv4 Time\-To\-Live/IPv6 Hop\-Count field for packets generated from this socket\&. This sets the IP_TTL/IPV6_UNICAST_HOPS socket options (see
-\fBip\fR(7)
-and
-\fBipv6\fR(7)
-for details\&.)
-.RE
-.PP
-\fIMark=\fR
-.RS 4
-Takes an integer value\&. Controls the firewall mark of packets generated by this socket\&. This can be used in the firewall logic to filter packets from this socket\&. This sets the SO_MARK socket option\&. See
-\fBiptables\fR(8)
-for details\&.
-.RE
-.PP
-\fIPipeSize=\fR
-.RS 4
-Takes an integer value\&. Controls the pipe buffer size of FIFOs configured in this socket unit\&. See
-\fBfcntl\fR(2)
-for details\&.
-.RE
-.PP
-\fIMessageQueueMaxMessages=\fR, \fIMessageQueueMessageSize=\fR
-.RS 4
-These two settings take integer values and control the mq_maxmsg resp\&. mq_msgsize field when creating the message queue\&. Note that either none or both of these variables need to be set\&. See
-\fBmq_setattr\fR(3)
-for details\&.
-.RE
-.PP
-\fIFreeBind=\fR
-.RS 4
-Takes a boolean value\&. Controls whether the socket can be bound to non\-local IP addresses\&. This is useful to configure sockets listening on specific IP addresses before those IP addresses are successfully configured on a network interface\&. This sets the IP_FREEBIND socket option\&. For robustness reasons it is recommended to use this option whenever you bind a socket to a specific IP address\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fITransparent=\fR
-.RS 4
-Takes a boolean value\&. Controls the IP_TRANSPARENT socket option\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIBroadcast=\fR
-.RS 4
-Takes a boolean value\&. This controls the SO_BROADCAST socket option, which allows broadcast datagrams to be sent from this socket\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIPassCredentials=\fR
-.RS 4
-Takes a boolean value\&. This controls the SO_PASSCRED socket option, which allows UNIX sockets to receive the credentials of the sending process in an ancillary message\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fITCPCongestion=\fR
-.RS 4
-Takes a string value\&. Controls the TCP congestion algorithm used by this socket\&. Should be one of "westwood", "veno", "cubic", "lp" or any other available algorithm supported by the IP stack\&. This setting applies only to stream sockets\&.
-.RE
-.PP
-\fIExecStartPre=\fR, \fIExecStartPost=\fR
-.RS 4
-Takes one or more command lines, which are executed before (resp\&. after) the listening sockets/FIFOs are created and bound\&. The first token of the command line must be an absolute file name, then followed by arguments for the process\&. Multiple command lines may be specified following the same scheme as used for
-\fIExecStartPre=\fR
-of service unit files\&.
-.RE
-.PP
-\fIExecStopPre=\fR, \fIExecStopPost=\fR
-.RS 4
-Additional commands that are executed before (resp\&. after) the listening sockets/FIFOs are closed and removed\&. Multiple command lines may be specified following the same scheme as used for
-\fIExecStartPre=\fR
-of service unit files\&.
-.RE
-.PP
-\fITimeoutSec=\fR
-.RS 4
-Configures the time to wait for the commands specified in
-\fIExecStartPre=\fR,
-\fIExecStartPost=\fR,
-\fIExecStopPre=\fR
-and
-\fIExecStopPost=\fR
-to finish\&. If a command does not exit within the configured time, the socket will be considered failed and be shut down again\&. All commands still running, will be terminated forcibly via SIGTERM, and after another delay of this time with SIGKILL\&. (See
-\fBKillMode=\fR
-below\&.) Takes a unit\-less value in seconds, or a time span value such as "5min 20s"\&. Pass 0 to disable the timeout logic\&. Defaults to 90s\&.
-.RE
-.PP
-\fIKillMode=\fR
-.RS 4
-Specifies how processes of this socket unit shall be killed\&. One of
-\fBcontrol\-group\fR,
-\fBprocess\fR,
-\fBnone\fR\&.
-.sp
-This option is mostly equivalent to the
-\fBKillMode=\fR
-option of service files\&. See
-\fBsystemd.service\fR(5)
-for details\&.
-.RE
-.PP
-\fIKillSignal=\fR
-.RS 4
-Specifies which signal to use when killing a process of this socket\&. Defaults to SIGTERM\&.
-.RE
-.PP
-\fISendSIGKILL=\fR
-.RS 4
-Specifies whether to send SIGKILL to remaining processes after a timeout, if the normal shutdown procedure left processes of the socket around\&. Takes a boolean value\&. Defaults to "yes"\&.
-.RE
-.PP
-\fIService=\fR
-.RS 4
-Specifies the service unit name to activate on incoming traffic\&. This defaults to the service that bears the same name as the socket (ignoring the different suffixes)\&. In most cases it should not be necessary to use this option\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.exec\fR(5),
-\fBsystemd.service\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-TCP Keepalive HOWTO
-.RS 4
-\%http://www.tldp.org/HOWTO/html_single/TCP-Keepalive-HOWTO/
-.RE
index ef5b28c..28c8dc4 100644 (file)
                                 family.</para>
 
                                 <para>If the address starts with an
-                                at symbol (@) it is read as abstract
+                                ampersand (@) it is read as abstract
                                 namespace socket in the AF_UNIX
                                 family. The @ is replaced with a NUL
                                 character before binding. For details
                                 <term><varname>Transparent=</varname></term>
                                 <listitem><para>Takes a boolean
                                 value. Controls the IP_TRANSPARENT
-                                socket option. Defaults to
+                                option. Defaults to
                                 <option>false</option>.</para></listitem>
                         </varlistentry>
 
                                 <term><varname>Broadcast=</varname></term>
                                 <listitem><para>Takes a boolean
                                 value. This controls the SO_BROADCAST
-                                socket option, which allows broadcast
+                                option, which allows broadcast
                                 datagrams to be sent from this
                                 socket. Defaults to
                                 <option>false</option>.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>PassCredentials=</varname></term>
-                                <listitem><para>Takes a boolean
-                                value. This controls the SO_PASSCRED
-                                socket option, which allows UNIX sockets to
-                                receive the credentials of the sending
-                                process in an ancillary message.
-                                Defaults to
-                                <option>false</option>.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><varname>TCPCongestion=</varname></term>
                                 <listitem><para>Takes a string
                                 value. Controls the TCP congestion
diff --git a/man/systemd.special.7.in b/man/systemd.special.7.in
deleted file mode 100644 (file)
index e1e552f..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-'\" t
-.\"     Title: systemd.special
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.special
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.SPECIAL" "7" "02/15/2012" "systemd" "systemd.special"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.special \- special systemd units
-.SH "SYNOPSIS"
-.PP
-basic\&.target,
-ctrl\-alt\-del\&.target,
-dbus\&.service,
-default\&.target,
-display\-manager\&.service,
-emergency\&.target,
-exit\&.service,
-graphical\&.target,
-halt\&.target,
-kbrequest\&.target,
-local\-fs\&.target,
-local\-fs\-pre\&.target,
-mail\-transfer\-agent\&.target,
-multi\-user\&.target,
-network\&.target,
-nss\-lookup\&.target,
-poweroff\&.target,
-reboot\&.target,
-remote\-fs\&.target,
-remote\-fs\-pre\&.target,
-rescue\&.target,
-rpcbind\&.target,
-runlevel2\&.target,
-runlevel3\&.target,
-runlevel4\&.target,
-runlevel5\&.target,
-shutdown\&.target,
-sigpwr\&.target,
-sockets\&.target,
-swap\&.target,
-sysinit\&.target,
-syslog\&.target,
-systemd\-initctl\&.service,
-systemd\-initctl\&.socket,
-systemd\-stdout\-syslog\-bridge\&.service,
-systemd\-stdout\-syslog\-bridge\&.socket,
-time\-sync\&.target,
-umount\&.target
-.SH "DESCRIPTION"
-.PP
-A few units are treated specially by systemd\&. They have special internal semantics and cannot be renamed\&.
-.SH "SPECIAL SYSTEM UNITS"
-.PP
-basic\&.target
-.RS 4
-A special target unit covering early boot\-up\&.
-.sp
-systemd automatically adds dependencies of the types Requires and After for this target unit to all SysV service units configured for runlevel 1 to 5\&.
-.sp
-Usually this should pull\-in all sockets, mount points, swap devices and other basic initialization necessary for the general purpose daemons\&. Most normal daemons should have dependencies of type After and Requires on this unit\&.
-.RE
-.PP
-ctrl\-alt\-del\&.target
-.RS 4
-systemd starts this target whenever Control+Alt+Del is pressed on the console\&. Usually this should be aliased (symlinked) to
-reboot\&.target\&.
-.RE
-.PP
-dbus\&.service
-.RS 4
-A special unit for the D\-Bus system bus\&. As soon as this service is fully started up systemd will connect to it and register its service\&.
-.RE
-.PP
-default\&.target
-.RS 4
-The default unit systemd starts at bootup\&. Usually this should be aliased (symlinked) to
-multi\-user\&.target
-or
-graphical\&.target\&.
-.sp
-The default unit systemd starts at bootup can be overridden with the
-\fIsystemd\&.unit=\fR
-kernel command line option\&.
-.RE
-.PP
-display\-manager\&.service
-.RS 4
-The display manager service\&. Usually this should be aliased (symlinked) to
-xdm\&.service
-or a similar display manager service\&.
-.sp
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with a LSB header referring to the
-$x\-display\-manager
-facility, for compatibility with Debian\&.
-.RE
-.PP
-emergency\&.target
-.RS 4
-A special target unit that starts an emergency shell on the main console\&. This unit is supposed to be used with the kernel command line option
-\fIsystemd\&.unit=\fR
-and has otherwise little use\&.
-.RE
-.PP
-graphical\&.target
-.RS 4
-A special target unit for setting up a graphical login screen\&. This pulls in
-multi\-user\&.target\&.
-.sp
-Units that are needed for graphical login shall add Wants dependencies for their unit to this unit (or
-multi\-user\&.target) during installation\&.
-.RE
-.PP
-halt\&.target
-.RS 4
-A special target unit for shutting down and halting the system\&.
-.sp
-Applications wanting to halt the system should start this unit\&.
-.RE
-.PP
-kbrequest\&.target
-.RS 4
-systemd starts this target whenever Alt+ArrowUp is pressed on the console\&. This is a good candidate to be aliased (symlinked) to
-rescue\&.target\&.
-.RE
-.PP
-local\-fs\&.target
-.RS 4
-systemd automatically adds dependencies of type After to all mount units that refer to local mount points for this target unit\&. In addition, systemd adds dependencies of type Wants to this target unit for those mounts listed in
-/etc/fstab
-that have the
-\fBauto\fR
-and
-\fBcomment=systemd\&.mount\fR
-mount options set\&.
-.sp
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$local_fs
-facility\&.
-.RE
-.PP
-local\-fs\-pre\&.target
-.RS 4
-This target unit is automatically ordered before all local mount points marked with
-\fBauto\fR
-(see above)\&. It can be used to execute certain units before all local mounts\&.
-.RE
-.PP
-mail\-transfer\-agent\&.target
-.RS 4
-The mail transfer agent (MTA) service\&. Usually this should pull\-in all units necessary for sending/receiving mails on the local host\&.
-.sp
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$mail\-transfer\-agent
-or
-$mail\-transport\-agent
-facilities, for compatibility with Debian\&.
-.RE
-.PP
-multi\-user\&.target
-.RS 4
-A special target unit for setting up a multi\-user system (non\-graphical)\&. This is pulled in by
-graphical\&.target\&.
-.sp
-Units that are needed for a multi\-user system shall add Wants dependencies to this unit for their unit during installation\&.
-.RE
-.PP
-network\&.target
-.RS 4
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$network
-facility\&.
-.RE
-.PP
-nss\-lookup\&.target
-.RS 4
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$named
-facility\&.
-.RE
-.PP
-poweroff\&.target
-.RS 4
-A special target unit for shutting down and powering off the system\&.
-.sp
-Applications wanting to power off the system should start this unit\&.
-.sp
-runlevel0\&.target
-is an alias for this target unit, for compatibility with SysV\&.
-.RE
-.PP
-reboot\&.target
-.RS 4
-A special target unit for shutting down and rebooting the system\&.
-.sp
-Applications wanting to reboot the system should start this unit\&.
-.sp
-runlevel6\&.target
-is an alias for this target unit, for compatibility with SysV\&.
-.RE
-.PP
-remote\-fs\&.target
-.RS 4
-Similar to
-local\-fs\&.target, but for remote mount points\&.
-.sp
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$remote_fs
-facility\&.
-.RE
-.PP
-remote\-fs\-pre\&.target
-.RS 4
-This target unit is automatically ordered before all remote mount points marked with
-\fBauto\fR
-(see above)\&. It can be used to execute certain units before all remote mounts\&.
-.RE
-.PP
-rescue\&.target
-.RS 4
-A special target unit for setting up the base system and a rescue shell\&.
-.sp
-runlevel1\&.target
-is an alias for this target unit, for compatibility with SysV\&.
-.RE
-.PP
-rpcbind\&.target
-.RS 4
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$rpcbind
-facility\&.
-.RE
-.PP
-runlevel2\&.target
-.RS 4
-This is a target that is called whenever the SysV compatibility code asks for runlevel 2\&. It is a good idea to make this an alias for (i\&.e\&. symlink to)
-multi\-user\&.target\&.
-.RE
-.PP
-runlevel3\&.target
-.RS 4
-This is a target that is called whenever the SysV compatibility code asks for runlevel 3\&. It is a good idea to make this an alias for (i\&.e\&. symlink to)
-multi\-user\&.target
-or
-graphical\&.target\&.
-.RE
-.PP
-runlevel4\&.target
-.RS 4
-This is a target that is called whenever the SysV compatibility code asks for runlevel 4\&. It is a good idea to make this an alias for (i\&.e\&. symlink to)
-multi\-user\&.target
-or
-graphical\&.target\&.
-.RE
-.PP
-runlevel5\&.target
-.RS 4
-This is a target that is called whenever the SysV compatibility code asks for runlevel 5\&. It is a good idea to make this an alias for (i\&.e\&. symlink to)
-multi\-user\&.target
-or
-graphical\&.target\&.
-.RE
-.PP
-shutdown\&.target
-.RS 4
-A special target unit that terminates the services on system shutdown\&.
-.sp
-Services that shall be terminated on system shutdown shall add Conflicts dependencies to this unit for their service unit, which is implicitly done when
-\fIDefaultDependencies=yes\fR
-is set (the default)\&.
-.sp
-systemd automatically adds dependencies of type Conflicts to this target unit for all SysV init script service units that shall be terminated in SysV runlevels 0 or 6\&.
-.RE
-.PP
-sigpwr\&.target
-.RS 4
-A special target that is started when systemd receives the SIGPWR process signal, which is normally sent by the kernel or UPS daemons when power fails\&.
-.RE
-.PP
-sockets\&.target
-.RS 4
-A special target unit that sets up all service sockets\&.
-.sp
-Services that can be socket\-activated shall add Wants dependencies to this unit for their socket unit during installation\&.
-.RE
-.PP
-swap\&.target
-.RS 4
-Similar to
-local\-fs\&.target, but for swap partitions and swap files\&.
-.RE
-.PP
-sysinit\&.target
-.RS 4
-A special target unit covering early boot\-up scripts\&.
-.sp
-systemd automatically adds dependencies of the types Wants and After for all SysV service units configured for runlevels that are not 0 to 6 to this target unit\&. This covers the special boot\-up runlevels some distributions have, such as S or b\&.
-.RE
-.PP
-syslog\&.target
-.RS 4
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$syslog
-facility\&.
-.RE
-.PP
-systemd\-initctl\&.service
-.RS 4
-This provides compatibility with the SysV /dev/initctl file system FIFO for communication with the init system\&.
-.sp
-This is a socket\-activated service, see
-system\-initctl\&.socket\&.
-.RE
-.PP
-systemd\-initctl\&.socket
-.RS 4
-Socket activation unit for
-system\-initctl\&.service\&.
-.RE
-.PP
-systemd\-stdout\-syslog\-bridge\&.service
-.RS 4
-This is internally used by systemd to provide syslog logging to the processes it maintains\&.
-.sp
-This is a socket\-activated service, see
-system\-stdout\-syslog\-bridge\&.socket\&.
-.RE
-.PP
-systemd\-stdout\-syslog\-bridge\&.socket
-.RS 4
-Socket activation unit for
-system\-stdout\-syslog\-bridge\&.service\&. systemd will automatically add dependencies of types Requires and After to all units that have been configured for stdout or stderr to be connected to syslog or the kernel log buffer\&.
-.RE
-.PP
-systemd\-shutdownd\&.service
-.RS 4
-This is internally used by
-\fBshutdown\fR(8)
-to implement delayed shutdowns\&.
-.sp
-This is a socket\-activated service, see
-system\-shutdownd\&.socket\&.
-.RE
-.PP
-systemd\-shutdownd\&.socket
-.RS 4
-Socket activation unit for
-system\-shutdownd\&.service\&.
-.RE
-.PP
-time\-sync\&.target
-.RS 4
-systemd automatically adds dependencies of type After for this target unit to all SysV init script service units with an LSB header referring to the
-$time
-facility\&.
-.RE
-.PP
-umount\&.target
-.RS 4
-A special target unit that umounts all mount and automount points on system shutdown\&.
-.sp
-Mounts that shall be unmounted on system shutdown shall add Conflicts dependencies to this unit for their mount unit, which is implicitly done when
-\fIDefaultDependencies=yes\fR
-is set (the default)\&.
-.RE
-.SH "SPECIAL USER UNITS"
-.PP
-When systemd runs as a user instance, the following special units are available, which have similar definitions as their system counterparts:
-default\&.target,
-local\-fs\&.target,
-remote\-fs\&.target,
-shutdown\&.target,
-sockets\&.target,
-swap\&.target\&.
-.PP
-In addition the following special unit is understood only when systemd runs as service instance:
-.PP
-exit\&.service
-.RS 4
-A special service unit for shutting down the user service manager\&.
-.sp
-Applications wanting to terminate the user service manager should start this unit\&. If systemd receives SIGTERM or SIGINT when running as user service daemon it will start this unit\&.
-.sp
-Normally, this pulls in
-shutdown\&.target
-which in turn should be conflicted by all units that want to be shut down on user service manager exit\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd.unit\fR(5),
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5),
-\fBsystemd.target\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.special.html.in b/man/systemd.special.html.in
deleted file mode 100644 (file)
index ed731b7..0000000
+++ /dev/null
@@ -1,361 +0,0 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>systemd.special</title><meta name="generator" content="DocBook XSL Stylesheets V1.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="systemd.special"><a name="systemd.special"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>systemd.special â€” special systemd units</p></div><div class="refsynopsisdiv" title="Synopsis"><h2>Synopsis</h2><p><code class="filename">basic.target</code>,
-                <code class="filename">ctrl-alt-del.target</code>,
-                <code class="filename">dbus.service</code>,
-                <code class="filename">default.target</code>,
-                <code class="filename">display-manager.service</code>,
-                <code class="filename">emergency.target</code>,
-                <code class="filename">exit.service</code>,
-                <code class="filename">graphical.target</code>,
-                <code class="filename">halt.target</code>,
-                <code class="filename">kbrequest.target</code>,
-                <code class="filename">local-fs.target</code>,
-                <code class="filename">local-fs-pre.target</code>,
-                <code class="filename">mail-transfer-agent.target</code>,
-                <code class="filename">multi-user.target</code>,
-                <code class="filename">network.target</code>,
-                <code class="filename">nss-lookup.target</code>,
-                <code class="filename">poweroff.target</code>,
-                <code class="filename">reboot.target</code>,
-                <code class="filename">remote-fs.target</code>,
-                <code class="filename">remote-fs-pre.target</code>,
-                <code class="filename">rescue.target</code>,
-                <code class="filename">rpcbind.target</code>,
-                <code class="filename">runlevel2.target</code>,
-                <code class="filename">runlevel3.target</code>,
-                <code class="filename">runlevel4.target</code>,
-                <code class="filename">runlevel5.target</code>,
-                <code class="filename">shutdown.target</code>,
-                <code class="filename">sigpwr.target</code>,
-                <code class="filename">sockets.target</code>,
-                <code class="filename">swap.target</code>,
-                <code class="filename">sysinit.target</code>,
-                <code class="filename">syslog.target</code>,
-                <code class="filename">systemd-initctl.service</code>,
-                <code class="filename">systemd-initctl.socket</code>,
-                <code class="filename">systemd-stdout-syslog-bridge.service</code>,
-                <code class="filename">systemd-stdout-syslog-bridge.socket</code>,
-                <code class="filename">time-sync.target</code>,
-                <code class="filename">umount.target</code></p></div><div class="refsect1" title="Description"><a name="id288252"></a><h2>Description</h2><p>A few units are treated specially by
-                systemd. They have special internal semantics and
-                cannot be renamed.</p></div><div class="refsect1" title="Special System Units"><a name="id288263"></a><h2>Special System Units</h2><div class="variablelist"><dl><dt><span class="term"><code class="filename">basic.target</code></span></dt><dd><p>A special target unit
-                                        covering early boot-up.</p><p>systemd automatically
-                                        adds dependencies of the types
-                                        Requires and After for this
-                                        target unit to all SysV
-                                        service units configured for
-                                        runlevel 1 to 5.</p><p>Usually this should pull-in
-                                        all sockets, mount points,
-                                        swap devices and other basic
-                                        initialization necessary for
-                                        the general purpose
-                                        daemons. Most normal daemons
-                                        should have dependencies of
-                                        type After and Requires on
-                                        this unit.</p></dd><dt><span class="term"><code class="filename">ctrl-alt-del.target</code></span></dt><dd><p>systemd starts this
-                                        target whenever
-                                        Control+Alt+Del is pressed on
-                                        the console. Usually this
-                                        should be aliased (symlinked)
-                                        to
-                                        <code class="filename">reboot.target</code>.</p></dd><dt><span class="term"><code class="filename">dbus.service</code></span></dt><dd><p>A special unit for the
-                                        D-Bus system bus. As soon as
-                                        this service is fully started
-                                        up systemd will connect to it
-                                        and register its
-                                        service.</p></dd><dt><span class="term"><code class="filename">default.target</code></span></dt><dd><p>The default unit systemd
-                                        starts at bootup. Usually this
-                                        should be aliased (symlinked)
-                                        to
-                                        <code class="filename">multi-user.target</code>
-                                        or
-                                        <code class="filename">graphical.target</code>.</p><p>The default unit systemd
-                                        starts at bootup can be
-                                        overridden with the
-                                        <code class="varname">systemd.unit=</code>
-                                        kernel command line option.</p></dd><dt><span class="term"><code class="filename">display-manager.service</code></span></dt><dd><p>The display manager
-                                        service. Usually this should
-                                        be aliased (symlinked) to
-                                        <code class="filename">xdm.service</code>
-                                        or a similar display manager
-                                        service.</p><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with a LSB header
-                                        referring to the
-                                        <code class="literal">$x-display-manager</code>
-                                        facility, for compatibility
-                                        with Debian.</p></dd><dt><span class="term"><code class="filename">emergency.target</code></span></dt><dd><p>A special target unit
-                                        that starts an emergency
-                                        shell on the main
-                                        console. This unit is supposed
-                                        to be used with the kernel
-                                        command line option
-                                        <code class="varname">systemd.unit=</code>
-                                        and has otherwise little use.
-                                        </p></dd><dt><span class="term"><code class="filename">graphical.target</code></span></dt><dd><p>A special target unit
-                                        for setting up a graphical
-                                        login screen. This pulls in
-                                        <code class="filename">multi-user.target</code>.</p><p>Units that are needed
-                                        for graphical login shall add
-                                        Wants dependencies for their
-                                        unit to this unit (or
-                                        <code class="filename">multi-user.target</code>)
-                                        during installation.</p></dd><dt><span class="term"><code class="filename">halt.target</code></span></dt><dd><p>A special target unit
-                                        for shutting down and halting the system.</p><p>Applications wanting to
-                                        halt the system should start
-                                        this unit.</p></dd><dt><span class="term"><code class="filename">kbrequest.target</code></span></dt><dd><p>systemd starts this
-                                        target whenever Alt+ArrowUp is
-                                        pressed on the console. This
-                                        is a good candidate to be
-                                        aliased (symlinked) to
-                                        <code class="filename">rescue.target</code>.</p></dd><dt><span class="term"><code class="filename">local-fs.target</code></span></dt><dd><p>systemd automatically
-                                        adds dependencies of type
-                                        After to all mount units that
-                                        refer to local mount points
-                                        for this target unit. In
-                                        addition, systemd adds
-                                        dependencies of type Wants to
-                                        this target unit for those
-                                        mounts listed in
-                                        <code class="filename">/etc/fstab</code>
-                                        that have the
-                                        <code class="option">auto</code> and
-                                        <code class="option">comment=systemd.mount</code>
-                                        mount options set.</p><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$local_fs</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">local-fs-pre.target</code></span></dt><dd><p>This target unit is
-                                        automatically ordered before
-                                        all local mount points marked
-                                        with <code class="option">auto</code>
-                                        (see above). It can be used to
-                                        execute certain units before
-                                        all local mounts.</p></dd><dt><span class="term"><code class="filename">mail-transfer-agent.target</code></span></dt><dd><p>The mail transfer agent
-                                        (MTA) service. Usually this
-                                        should pull-in all units
-                                        necessary for
-                                        sending/receiving mails on the
-                                        local host.</p><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$mail-transfer-agent</code>
-                                        or
-                                        <code class="literal">$mail-transport-agent</code>
-                                        facilities, for compatibility
-                                        with Debian.</p></dd><dt><span class="term"><code class="filename">multi-user.target</code></span></dt><dd><p>A special target unit
-                                        for setting up a multi-user
-                                        system (non-graphical). This
-                                        is pulled in by
-                                        <code class="filename">graphical.target</code>.</p><p>Units that are needed
-                                        for a multi-user system shall
-                                        add Wants dependencies to
-                                        this unit for their unit during
-                                        installation.</p></dd><dt><span class="term"><code class="filename">network.target</code></span></dt><dd><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$network</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">nss-lookup.target</code></span></dt><dd><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$named</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">poweroff.target</code></span></dt><dd><p>A special target unit
-                                        for shutting down and powering off the system.</p><p>Applications wanting to
-                                        power off the system should start
-                                        this unit.</p><p><code class="filename">runlevel0.target</code>
-                                        is an alias for this target
-                                        unit, for compatibility with SysV.</p></dd><dt><span class="term"><code class="filename">reboot.target</code></span></dt><dd><p>A special target unit
-                                        for shutting down and rebooting the system.</p><p>Applications wanting to
-                                        reboot the system should start
-                                        this unit.</p><p><code class="filename">runlevel6.target</code>
-                                        is an alias for this target
-                                        unit, for compatibility with SysV.</p></dd><dt><span class="term"><code class="filename">remote-fs.target</code></span></dt><dd><p>Similar to
-                                        <code class="filename">local-fs.target</code>,
-                                        but for remote mount
-                                        points.</p><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$remote_fs</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">remote-fs-pre.target</code></span></dt><dd><p>This target unit is
-                                        automatically ordered before
-                                        all remote mount points marked
-                                        with <code class="option">auto</code>
-                                        (see above). It can be used to
-                                        execute certain units before
-                                        all remote mounts.</p></dd><dt><span class="term"><code class="filename">rescue.target</code></span></dt><dd><p>A special target unit
-                                        for setting up the base system
-                                        and a rescue shell.</p><p><code class="filename">runlevel1.target</code>
-                                        is an alias for this target
-                                        unit, for compatibility with SysV.</p></dd><dt><span class="term"><code class="filename">rpcbind.target</code></span></dt><dd><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$rpcbind</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">runlevel2.target</code></span></dt><dd><p>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 2. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <code class="filename">multi-user.target</code>.</p></dd><dt><span class="term"><code class="filename">runlevel3.target</code></span></dt><dd><p>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 3. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <code class="filename">multi-user.target</code>
-                                        or
-                                        <code class="filename">graphical.target</code>.</p></dd><dt><span class="term"><code class="filename">runlevel4.target</code></span></dt><dd><p>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 4. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <code class="filename">multi-user.target</code>
-                                        or
-                                        <code class="filename">graphical.target</code>.</p></dd><dt><span class="term"><code class="filename">runlevel5.target</code></span></dt><dd><p>This is a target that is
-                                        called whenever the SysV
-                                        compatibility code asks for
-                                        runlevel 5. It is a good idea
-                                        to make this an alias for
-                                        (i.e. symlink to)
-                                        <code class="filename">multi-user.target</code>
-                                        or
-                                        <code class="filename">graphical.target</code>.</p></dd><dt><span class="term"><code class="filename">shutdown.target</code></span></dt><dd><p>A special target unit
-                                        that terminates the services
-                                        on system shutdown.</p><p>Services that shall be
-                                        terminated on system shutdown
-                                        shall add Conflicts
-                                        dependencies to this unit for
-                                        their service unit, which is
-                                        implicitly done when
-                                        <code class="varname">DefaultDependencies=yes</code>
-                                        is set (the default).</p><p>systemd automatically
-                                        adds dependencies of type
-                                        Conflicts to this target unit
-                                        for all SysV init script
-                                        service units that shall be
-                                        terminated in SysV runlevels 0
-                                        or 6.</p></dd><dt><span class="term"><code class="filename">sigpwr.target</code></span></dt><dd><p>A special target that is
-                                        started when systemd receives
-                                        the SIGPWR process signal,
-                                        which is normally sent by the
-                                        kernel or UPS daemons when
-                                        power fails.</p></dd><dt><span class="term"><code class="filename">sockets.target</code></span></dt><dd><p>A special target unit
-                                        that sets up all service
-                                        sockets.</p><p>Services that can be
-                                        socket-activated shall add
-                                        Wants dependencies to this
-                                        unit for their socket unit
-                                        during installation.</p></dd><dt><span class="term"><code class="filename">swap.target</code></span></dt><dd><p>Similar to
-                                        <code class="filename">local-fs.target</code>, but for swap
-                                        partitions and swap
-                                        files.</p></dd><dt><span class="term"><code class="filename">sysinit.target</code></span></dt><dd><p>A special target unit
-                                        covering early boot-up scripts.</p><p>systemd automatically
-                                        adds dependencies of the types
-                                        Wants and After for all
-                                        SysV service units configured
-                                        for runlevels that are not 0
-                                        to 6 to this target unit.
-                                        This covers the special
-                                        boot-up runlevels some
-                                        distributions have, such as S
-                                        or b.</p></dd><dt><span class="term"><code class="filename">syslog.target</code></span></dt><dd><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$syslog</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">systemd-initctl.service</code></span></dt><dd><p>This provides
-                                        compatibility with the SysV
-                                        /dev/initctl file system FIFO
-                                        for communication with the
-                                        init system.</p><p>This is a
-                                        socket-activated service, see
-                                        <code class="filename">system-initctl.socket</code>.</p></dd><dt><span class="term"><code class="filename">systemd-initctl.socket</code></span></dt><dd><p>Socket activation unit
-                                        for
-                                        <code class="filename">system-initctl.service</code>.</p></dd><dt><span class="term"><code class="filename">systemd-stdout-syslog-bridge.service</code></span></dt><dd><p>This is internally used
-                                        by systemd to provide syslog
-                                        logging to the processes it
-                                        maintains.</p><p>This is a
-                                        socket-activated service, see
-                                        <code class="filename">system-stdout-syslog-bridge.socket</code>.</p></dd><dt><span class="term"><code class="filename">systemd-stdout-syslog-bridge.socket</code></span></dt><dd><p>Socket activation unit
-                                        for
-                                        <code class="filename">system-stdout-syslog-bridge.service</code>. systemd
-                                        will automatically add
-                                        dependencies of types Requires
-                                        and After to all units that
-                                        have been configured for
-                                        stdout or stderr to be
-                                        connected to syslog or the
-                                        kernel log buffer.</p></dd><dt><span class="term"><code class="filename">systemd-shutdownd.service</code></span></dt><dd><p>This is internally used
-                                        by
-                                        <span class="citerefentry"><span class="refentrytitle">shutdown</span>(8)</span>
-                                        to implement delayed shutdowns.</p><p>This is a
-                                        socket-activated service, see
-                                        <code class="filename">system-shutdownd.socket</code>.</p></dd><dt><span class="term"><code class="filename">systemd-shutdownd.socket</code></span></dt><dd><p>Socket activation unit
-                                        for
-                                        <code class="filename">system-shutdownd.service</code>.</p></dd><dt><span class="term"><code class="filename">time-sync.target</code></span></dt><dd><p>systemd automatically
-                                        adds dependencies of type
-                                        After for this target unit to
-                                        all SysV init script service
-                                        units with an LSB header
-                                        referring to the
-                                        <code class="literal">$time</code>
-                                        facility.</p></dd><dt><span class="term"><code class="filename">umount.target</code></span></dt><dd><p>A special target unit
-                                        that umounts all mount and
-                                        automount points on system
-                                        shutdown.</p><p>Mounts that shall be
-                                        unmounted on system shutdown
-                                        shall add Conflicts
-                                        dependencies to this unit for
-                                        their mount unit, which is
-                                        implicitly done when
-                                        <code class="varname">DefaultDependencies=yes</code>
-                                        is set (the default).</p></dd></dl></div></div><div class="refsect1" title="Special User Units"><a name="id330517"></a><h2>Special User Units</h2><p>When systemd runs as a user instance, the
-                following special units are available, which have
-                similar definitions as their system counterparts:
-                <code class="filename">default.target</code>,
-                <code class="filename">local-fs.target</code>,
-                <code class="filename">remote-fs.target</code>,
-                <code class="filename">shutdown.target</code>,
-                <code class="filename">sockets.target</code>,
-                <code class="filename">swap.target</code>.</p><p>In addition the following special unit is
-                understood only when systemd runs as service instance:</p><div class="variablelist"><dl><dt><span class="term"><code class="filename">exit.service</code></span></dt><dd><p>A special service unit
-                                        for shutting down the
-                                        user service manager.</p><p>Applications wanting to
-                                        terminate the user service
-                                        manager should start this
-                                        unit. If systemd receives
-                                        SIGTERM or SIGINT when running
-                                        as user service daemon it will
-                                        start this unit.</p><p>Normally, this pulls in
-                                        <code class="filename">shutdown.target</code>
-                                        which in turn should be
-                                        conflicted by all units that
-                                        want to be shut down on
-                                        user service manager exit.</p></dd></dl></div></div><div class="refsect1" title="See Also"><a name="id330601"></a><h2>See Also</h2><p>
-                          <span class="citerefentry"><span class="refentrytitle">systemd.unit</span>(5)</span>,
-                          <span class="citerefentry"><span class="refentrytitle">systemd.service</span>(5)</span>,
-                          <span class="citerefentry"><span class="refentrytitle">systemd.socket</span>(5)</span>,
-                          <span class="citerefentry"><span class="refentrytitle">systemd.target</span>(5)</span>
-                  </p></div></div></body></html>
diff --git a/man/systemd.swap.5 b/man/systemd.swap.5
deleted file mode 100644 (file)
index 9b6571a..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-'\" t
-.\"     Title: systemd.swap
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.swap
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.SWAP" "5" "02/15/2012" "systemd" "systemd.swap"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.swap \- systemd swap configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.swap
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.swap
-encodes information about a swap device or file for memory paging controlled and supervised by systemd\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. The swap specific configuration options are configured in the [Swap] section\&.
-.PP
-Swap units must be named after the devices (resp\&. files) they control\&. Example: the swap device
-/dev/sda5
-must be configured in a unit file
-dev\-sda5\&.swap\&. For details about the escaping logic used to convert a file system path to a unit name see
-\fBsystemd.unit\fR(5)\&.
-.PP
-All swap units automatically get the appropriate dependencies on the devices (resp\&. on the mount points of the files) they are activated from\&.
-.PP
-Swap units with
-\fIDefaultDependencies=\fR
-enabled implicitly acquire a conflicting dependency to
-umount\&.target
-so that they are deactivated at shutdown\&.
-.SH "FSTAB"
-.PP
-Swap units may either be configured via unit files, or via
-/etc/fstab
-(see
-\fBfstab\fR(5)
-for details)\&.
-.PP
-If a swap device or file is configured in both
-/etc/fstab
-and a unit file the configuration in the latter takes precedence\&.
-.PP
-Unless the
-\fBnoauto\fR
-option is set for them all swap units configured in
-/etc/fstab
-are also added as requirements to
-swap\&.target, so that they are waited for and activated during boot\&.
-.SH "OPTIONS"
-.PP
-Swap files must include a [Swap] section, which carries information about the swap device it supervises\&. A number of options that may be used in this section are shared with other unit types\&. These options are documented in
-\fBsystemd.exec\fR(5)\&. The options specific to the [Swap] section of swap units are the following:
-.PP
-\fIWhat=\fR
-.RS 4
-Takes an absolute path of a device node or file to use for paging\&. See
-\fBswapon\fR(8)
-for details\&. If this refers to a device node, a dependency on the respective device unit is automatically created\&. (See
-\fBsystemd.device\fR(5)
-for more information\&.) If this refers to a file, a dependency on the respective mount unit is automatically created\&. (See
-\fBsystemd.mount\fR(5)
-for more information\&.) This option is mandatory\&.
-.RE
-.PP
-\fIPriority=\fR
-.RS 4
-Swap priority to use when activating the swap device or file\&. This takes an integer\&. This setting is optional\&.
-.RE
-.PP
-\fITimeoutSec=\fR
-.RS 4
-Configures the time to wait for the swapon command to finish\&. If a command does not exit within the configured time the swap will be considered failed and be shut down again\&. All commands still running will be terminated forcibly via SIGTERM, and after another delay of this time with SIGKILL\&. (See
-\fBKillMode=\fR
-below\&.) Takes a unit\-less value in seconds, or a time span value such as "5min 20s"\&. Pass 0 to disable the timeout logic\&. Defaults to 90s\&.
-.RE
-.PP
-\fIKillMode=\fR
-.RS 4
-Specifies how processes of this swap shall be killed\&. One of
-\fBcontrol\-group\fR,
-\fBprocess\fR,
-\fBnone\fR\&.
-.sp
-This option is mostly equivalent to the
-\fBKillMode=\fR
-option of service files\&. See
-\fBsystemd.service\fR(5)
-for details\&.
-.RE
-.PP
-\fIKillSignal=\fR
-.RS 4
-Specifies which signal to use when killing a process of this swap\&. Defaults to SIGTERM\&.
-.RE
-.PP
-\fISendSIGKILL=\fR
-.RS 4
-Specifies whether to send SIGKILL to remaining processes after a timeout, if the normal shutdown procedure left processes of the swap around\&. Takes a boolean value\&. Defaults to "yes"\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.exec\fR(5),
-\fBsystemd.device\fR(5),
-\fBsystemd.mount\fR(5),
-\fBswapon\fR(8)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.target.5 b/man/systemd.target.5
deleted file mode 100644 (file)
index 6d33aec..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-'\" t
-.\"     Title: systemd.target
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.target
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.TARGET" "5" "02/15/2012" "systemd" "systemd.target"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.target \- systemd target configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.target
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.target
-encodes information about a target unit of systemd, which is used for grouping units and as well\-known synchronization points during start\-up\&.
-.PP
-This unit type has no specific options\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. A separate [Target] section does not exist, since no target\-specific options may be configured\&.
-.PP
-Target units do not offer any additional functionality on top of the generic functionality provided by units\&. They exist merely to group units via dependencies (useful as boot targets), and to establish standardized names for synchronization points used in dependencies between units\&. Among other things, target units are a more flexible replacement for SysV runlevels in the classic SysV init system\&. (And for compatibility reasons special target units such as
-runlevel3\&.target
-exist which are used by the SysV runlevel compatibility code in systemd\&. See
-\fBsystemd.special\fR(7)
-for details)\&.
-.PP
-Unless
-\fIDefaultDependencies=\fR
-is set to
-\fBfalse\fR, target units will implicitly complement all configured dependencies of type
-\fIWants=\fR,
-\fIRequires=\fR,
-\fIRequiresOverridable=\fR
-with dependencies of type
-\fIAfter=\fR
-if the units in question also have
-\fIDefaultDependencies=true\fR\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.special\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.timer.5 b/man/systemd.timer.5
deleted file mode 100644 (file)
index 016dd68..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-'\" t
-.\"     Title: systemd.timer
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.timer
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.TIMER" "5" "02/15/2012" "systemd" "systemd.timer"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.timer \- systemd timer configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.timer
-.SH "DESCRIPTION"
-.PP
-A unit configuration file whose name ends in
-\&.timer
-encodes information about a timer controlled and supervised by systemd, for timer\-based activation\&.
-.PP
-This man page lists the configuration options specific to this unit type\&. See
-\fBsystemd.unit\fR(5)
-for the common options of all unit configuration files\&. The common configuration items are configured in the generic [Unit] and [Install] sections\&. The timer specific configuration options are configured in the [Timer] section\&.
-.PP
-For each timer file, a matching unit file must exist, describing the unit to activate when the timer elapses\&. By default, a service by the same name as the timer (except for the suffix) is activated\&. Example: a timer file
-foo\&.timer
-activates a matching service
-foo\&.service\&. The unit to activate may be controlled by
-\fIUnit=\fR
-(see below)\&.
-.PP
-Unless
-\fIDefaultDependencies=\fR
-is set to
-\fBfalse\fR, timer units will implicitly have dependencies of type
-\fIConflicts=\fR
-and
-\fIBefore=\fR
-on
-shutdown\&.target\&. These ensure that timer units are stopped cleanly prior to system shutdown\&. Only timer units involved with early boot or late system shutdown should disable this option\&.
-.SH "OPTIONS"
-.PP
-Timer files must include a [Timer] section, which carries information about the timer it defines\&. The options specific to the [Timer] section of timer units are the following:
-.PP
-\fIOnActiveSec=\fR, \fIOnBootSec=\fR, \fIOnStartupSec=\fR, \fIOnUnitActiveSec=\fR, \fIOnUnitInactiveSec=\fR
-.RS 4
-Defines timers relative to different starting points:
-\fIOnActiveSec=\fR
-defines a timer relative to the moment the timer itself is activated\&.
-\fIOnBootSec=\fR
-defines a timer relative to when the machine was booted up\&.
-\fIOnStartupSec=\fR
-defines a timer relative to when systemd was started\&.
-\fIOnUnitActiveSec=\fR
-defines a timer relative to when the unit the timer is activating was last activated\&.
-\fIOnUnitInactiveSec=\fR
-defines a timer relative to when the unit the timer is activating was last deactivated\&.
-.sp
-Multiple directives may be combined of the same and of different types\&. For example, by combining
-\fIOnBootSec=\fR
-and
-\fIOnUnitActiveSec=\fR
-it is possible to define a timer that elapses in regular intervals and activates a specific service each time\&.
-.sp
-The arguments to the directives are time spans configured in seconds\&. Example: "OnBootSec=50" means 50s after boot\-up\&. The argument may also include time units\&. Example: "OnBootSec=5h 30min" means 5 hours and 30 minutes after boot\-up\&. For details about the syntax of time spans see
-\fBsystemd.unit\fR(5)\&.
-.sp
-If a timer configured with
-\fIOnBootSec=\fR
-or
-\fIOnStartupSec=\fR
-is already in the past when the timer unit is activated, it will immediately elapse and the configured unit is started\&. This is not the case for timers defined in the other directives\&.
-.PP
-These are monotonic timers, independent of wall\-clock time and timezones\&. If the computer is temporarily suspended, the monotonic clock stops too\&.
-.RE
-.PP
-\fIUnit=\fR
-.RS 4
-The unit to activate when this timer elapses\&. The argument is a unit name, whose suffix is not
-\&.timer\&. If not specified, this value defaults to a service that has the same name as the timer unit, except for the suffix\&. (See above\&.) It is recommended that the unit name that is activated and the unit name of the timer unit are named identically, except for the suffix\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.unit\fR(5),
-\fBsystemd.service\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/systemd.unit.5 b/man/systemd.unit.5
deleted file mode 100644 (file)
index 10b4f1b..0000000
+++ /dev/null
@@ -1,577 +0,0 @@
-'\" t
-.\"     Title: systemd.unit
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: systemd.unit
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "SYSTEMD\&.UNIT" "5" "02/15/2012" "systemd" "systemd.unit"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-systemd.unit \- systemd unit configuration files
-.SH "SYNOPSIS"
-.PP
-systemd\&.service,
-systemd\&.socket,
-systemd\&.device,
-systemd\&.mount,
-systemd\&.automount,
-systemd\&.swap,
-systemd\&.target,
-systemd\&.path,
-systemd\&.timer,
-systemd\&.snapshot
-.SH "DESCRIPTION"
-.PP
-A unit configuration file encodes information about a service, a socket, a device, a mount point, an automount point, a swap file or partition, a start\-up target, a file system path or a timer controlled and supervised by
-\fBsystemd\fR(1)\&. The syntax is inspired by
-\m[blue]\fBXDG Desktop Entry Specification\fR\m[]\&\s-2\u[1]\d\s+2
-\&.desktop
-files, which are in turn inspired by Microsoft Windows
-\&.ini
-files\&.
-.PP
-This man pages lists the common configuration options of all the unit types\&. These options need to be configured in the [Unit] resp\&. [Install] section of the unit files\&.
-.PP
-In addition to the generic [Unit] and [Install] sections described here, each unit should have a type\-specific section, e\&.g\&. [Service] for a service unit\&. See the respective man pages for more information\&.
-.PP
-Unit files may contain additional options on top of those listed here\&. If systemd encounters an unknown option it will write a warning log message but continue loading the unit\&. If an option is prefixed with
-\fBX\-\fR
-it is ignored completely by systemd\&. Applications may use this to include additional information in the unit files\&.
-.PP
-Boolean arguments used in unit files can be written in various formats\&. For positive settings the strings
-\fB1\fR,
-\fByes\fR,
-\fBtrue\fR
-and
-\fBon\fR
-are equivalent\&. For negative settings the strings
-\fB0\fR,
-\fBno\fR,
-\fBfalse\fR
-and
-\fBoff\fR
-are equivalent\&.
-.PP
-Time span values encoded in unit files can be written in various formats\&. A stand\-alone number specifies a time in seconds\&. If suffixed with a time unit, the unit is honored\&. A concatenation of multiple values with units is supported, in which case the values are added up\&. Example: "50" refers to 50 seconds; "2min 200ms" refers to 2 minutes plus 200 milliseconds, i\&.e\&. 120200ms\&. The following time units are understood: s, min, h, d, w, ms, us\&.
-.PP
-Empty lines and lines starting with # or ; are ignored\&. This may be used for commenting\&. Lines ending in a backslash are concatenated with the following line while reading and the backslash is replaced by a space character\&. This may be used to wrap long lines\&.
-.PP
-If a line starts with
-\fB\&.include\fR
-followed by a file name, the specified file will be parsed at this point\&. Make sure that the file that is included has the appropiate section headers before any directives\&.
-.PP
-Along with a unit file
-foo\&.service
-a directory
-foo\&.service\&.wants/
-may exist\&. All units symlinked from such a directory are implicitly added as dependencies of type
-\fIWanted=\fR
-to the unit\&. This is useful to hook units into the start\-up of other units, without having to modify their unit configuration files\&. For details about the semantics of
-\fIWanted=\fR
-see below\&. The preferred way to create symlinks in the
-\&.wants/
-directory of a service is with the
-\fBenable\fR
-command of the
-\fBsystemctl\fR(1)
-tool which reads information from the [Install] section of unit files\&. (See below\&.) A similar functionality exists for
-\fIRequires=\fR
-type dependencies as well, the directory suffix is
-\&.requires/
-in this case\&.
-.PP
-Note that while systemd offers a flexible dependency system between units it is recommended to use this functionality only sparsely and instead rely on techniques such as bus\-based or socket\-based activation which makes dependencies implicit, which both results in a simpler and more flexible system\&.
-.PP
-Some unit names reflect paths existing in the file system name space\&. Example: a device unit
-dev\-sda\&.device
-refers to a device with the device node
-/dev/sda
-in the file system namespace\&. If this applies a special way to escape the path name is used, so that the result is usable as part of a file name\&. Basically, given a path, "/" is replaced by "\-", and all unprintable characters and the "\-" are replaced by C\-style "\ex20" escapes\&. The root directory "/" is encoded as single dash, while otherwise the initial and ending "/" is removed from all paths during transformation\&. This escaping is reversible\&.
-.PP
-Optionally, units may be instantiated from a template file at runtime\&. This allows creation of multiple units from a single configuration file\&. If systemd looks for a unit configuration file it will first search for the literal unit name in the filesystem\&. If that yields no success and the unit name contains an @ character, systemd will look for a unit template that shares the same name but with the instance string (i\&.e\&. the part between the @ character and the suffix) removed\&. Example: if a service
-getty@tty3\&.service
-is requested and no file by that name is found, systemd will look for
-getty@\&.service
-and instantiate a service from that configuration file if it is found\&.
-.PP
-To refer to the instance string from within the configuration file you may use the special
-%i
-specifier in many of the configuration options\&. Other specifiers exist, the full list is:
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B Table\ \&1.\ \&Specifiers available in unit files
-.TS
-allbox tab(:);
-lB lB lB.
-T{
-Specifier
-T}:T{
-Meaning
-T}:T{
-Details
-T}
-.T&
-l l l
-l l l
-l l l
-l l l
-l l l
-l l l
-l l l
-l l l
-l l l
-l l l
-l l l.
-T{
-%n
-T}:T{
-Full unit name
-T}:T{
-\ \&
-T}
-T{
-%N
-T}:T{
-Unescaped full unit name
-T}:T{
-\ \&
-T}
-T{
-%p
-T}:T{
-Prefix name
-T}:T{
-This refers to the string before the @, i\&.e\&. "getty" in the example above, where "tty3" is the instance name\&.
-T}
-T{
-%P
-T}:T{
-Unescaped prefix name
-T}:T{
-\ \&
-T}
-T{
-%i
-T}:T{
-Instance name
-T}:T{
-This is the string between the @ character and the suffix\&.
-T}
-T{
-%I
-T}:T{
-Unescaped instance name
-T}:T{
-\ \&
-T}
-T{
-%f
-T}:T{
-Unescaped file name
-T}:T{
-This is either the unescaped instance name (if set) with / prepended (if necessary), or the prefix name similarly prepended with /\&.
-T}
-T{
-%c
-T}:T{
-Control group path of the unit
-T}:T{
-\ \&
-T}
-T{
-%r
-T}:T{
-Root control group path of systemd
-T}:T{
-\ \&
-T}
-T{
-%R
-T}:T{
-Parent directory of the root control group path of systemd
-T}:T{
-\ \&
-T}
-T{
-%t
-T}:T{
-Runtime socket dir
-T}:T{
-This is either /run (for the system manager) or $XDG_RUNTIME_DIR (for user managers)\&.
-T}
-.TE
-.sp 1
-.PP
-If a unit file is empty (i\&.e\&. has the file size 0) or is symlinked to
-/dev/null
-its configuration will not be loaded and it appears with a load state of
-masked, and cannot be activated\&. Use this as an effective way to fully disable a unit, making it impossible to start it even manually\&.
-.PP
-The unit file format is covered by the
-\m[blue]\fBInterface Stability Promise\fR\m[]\&\s-2\u[2]\d\s+2\&.
-.SH "OPTIONS"
-.PP
-Unit file may include a [Unit] section, which carries generic information about the unit that is not dependent on the type of unit:
-.PP
-\fIDescription=\fR
-.RS 4
-A free\-form string describing the unit\&. This is intended for use in UIs to show descriptive information along with the unit name\&.
-.RE
-.PP
-\fIRequires=\fR
-.RS 4
-Configures requirement dependencies on other units\&. If this unit gets activated, the units listed here will be activated as well\&. If one of the other units gets deactivated or its activation fails, this unit will be deactivated\&. This option may be specified more than once, in which case requirement dependencies for all listed names are created\&. Note that requirement dependencies do not influence the order in which services are started or stopped\&. This has to be configured independently with the
-\fIAfter=\fR
-or
-\fIBefore=\fR
-options\&. If a unit
-foo\&.service
-requires a unit
-bar\&.service
-as configured with
-\fIRequires=\fR
-and no ordering is configured with
-\fIAfter=\fR
-or
-\fIBefore=\fR, then both units will be started simultaneously and without any delay between them if
-foo\&.service
-is activated\&. Often it is a better choice to use
-\fIWants=\fR
-instead of
-\fIRequires=\fR
-in order to achieve a system that is more robust when dealing with failing services\&.
-.RE
-.PP
-\fIRequiresOverridable=\fR
-.RS 4
-Similar to
-\fIRequires=\fR\&. Dependencies listed in
-\fIRequiresOverridable=\fR
-which cannot be fulfilled or fail to start are ignored if the startup was explicitly requested by the user\&. If the start\-up was pulled in indirectly by some dependency or automatic start\-up of units that is not requested by the user this dependency must be fulfilled and otherwise the transaction fails\&. Hence, this option may be used to configure dependencies that are normally honored unless the user explicitly starts up the unit, in which case whether they failed or not is irrelevant\&.
-.RE
-.PP
-\fIRequisite=\fR, \fIRequisiteOverridable=\fR
-.RS 4
-Similar to
-\fIRequires=\fR
-resp\&.
-\fIRequiresOverridable=\fR\&. However, if a unit listed here is not started already it will not be started and the transaction fails immediately\&.
-.RE
-.PP
-\fIWants=\fR
-.RS 4
-A weaker version of
-\fIRequires=\fR\&. A unit listed in this option will be started if the configuring unit is\&. However, if the listed unit fails to start up or cannot be added to the transaction this has no impact on the validity of the transaction as a whole\&. This is the recommended way to hook start\-up of one unit to the start\-up of another unit\&. Note that dependencies of this type may also be configured outside of the unit configuration file by adding a symlink to a
-\&.wants/
-directory accompanying the unit file\&. For details see above\&.
-.RE
-.PP
-\fIBindTo=\fR
-.RS 4
-Configures requirement dependencies, very similar in style to
-\fIRequires=\fR, however in addition to this behaviour it also declares that this unit is stopped when any of the units listed suddenly disappears\&. Units can suddenly, unexpectedly disappear if a service terminates on its own choice, a device is unplugged or a mount point unmounted without involvement of systemd\&.
-.RE
-.PP
-\fIConflicts=\fR
-.RS 4
-Configures negative requirement dependencies\&. If a unit has a
-\fIConflicts=\fR
-setting on another unit, starting the former will stop the latter and vice versa\&. Note that this setting is independent of and orthogonal to the
-\fIAfter=\fR
-and
-\fIBefore=\fR
-ordering dependencies\&.
-.sp
-If a unit A that conflicts with a unit B is scheduled to be started at the same time as B, the transaction will either fail (in case both are required part of the transaction) or be modified to be fixed (in case one or both jobs are not a required part of the transaction)\&. In the latter case the job that is not the required will be removed, or in case both are not required the unit that conflicts will be started and the unit that is conflicted is stopped\&.
-.RE
-.PP
-\fIBefore=\fR, \fIAfter=\fR
-.RS 4
-Configures ordering dependencies between units\&. If a unit
-foo\&.service
-contains a setting
-\fBBefore=bar\&.service\fR
-and both units are being started,
-bar\&.service\*(Aqs start\-up is delayed until
-foo\&.service
-is started up\&. Note that this setting is independent of and orthogonal to the requirement dependencies as configured by
-\fIRequires=\fR\&. It is a common pattern to include a unit name in both the
-\fIAfter=\fR
-and
-\fIRequires=\fR
-option in which case the unit listed will be started before the unit that is configured with these options\&. This option may be specified more than once, in which case ordering dependencies for all listed names are created\&.
-\fIAfter=\fR
-is the inverse of
-\fIBefore=\fR, i\&.e\&. while
-\fIAfter=\fR
-ensures that the configured unit is started after the listed unit finished starting up,
-\fIBefore=\fR
-ensures the opposite, i\&.e\&. that the configured unit is fully started up before the listed unit is started\&. Note that when two units with an ordering dependency between them are shut down, the inverse of the start\-up order is applied\&. i\&.e\&. if a unit is configured with
-\fIAfter=\fR
-on another unit, the former is stopped before the latter if both are shut down\&. If one unit with an ordering dependency on another unit is shut down while the latter is started up, the shut down is ordered before the start\-up regardless whether the ordering dependency is actually of type
-\fIAfter=\fR
-or
-\fIBefore=\fR\&. If two units have no ordering dependencies between them they are shut down resp\&. started up simultaneously, and no ordering takes place\&.
-.RE
-.PP
-\fIOnFailure=\fR
-.RS 4
-Lists one or more units that are activated when this unit enters the \*(Aqfailed\*(Aq state\&.
-.RE
-.PP
-\fIPropagateReloadTo=\fR, \fIPropagateReloadFrom=\fR
-.RS 4
-Lists one or more units where reload requests on the unit will be propagated to/on the other unit will be propagated from\&. Issuing a reload request on a unit will automatically also enqueue a reload request on all units that the reload request shall be propagated to via these two settings\&.
-.RE
-.PP
-\fIOnFailureIsolate=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-the unit listed in
-\fIOnFailure=\fR
-will be enqueued in isolation mode, i\&.e\&. all units that are not its dependency will be stopped\&. If this is set only a single unit may be listed in
-\fIOnFailure=\fR\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIIgnoreOnIsolate=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-this unit will not be stopped when isolating another unit\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIIgnoreOnSnapshot=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-this unit will not be included in snapshots\&. Defaults to
-\fBtrue\fR
-for device and snapshot units,
-\fBfalse\fR
-for the others\&.
-.RE
-.PP
-\fIStopWhenUnneeded=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-this unit will be stopped when it is no longer used\&. Note that in order to minimize the work to be executed, systemd will not stop units by default unless they are conflicting with other units, or the user explicitly requested their shut down\&. If this option is set, a unit will be automatically cleaned up if no other active unit requires it\&. Defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIRefuseManualStart=\fR, \fIRefuseManualStop=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-this unit can only be activated (resp\&. deactivated) indirectly\&. In this case explicit start\-up (resp\&. termination) requested by the user is denied, however if it is started (resp\&. stopped) as a dependency of another unit, start\-up (resp\&. termination) will succeed\&. This is mostly a safety feature to ensure that the user does not accidentally activate units that are not intended to be activated explicitly, and not accidentally deactivate units that are not intended to be deactivated\&. These options default to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIAllowIsolate=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-this unit may be used with the
-\fBsystemctl isolate\fR
-command\&. Otherwise this will be refused\&. It probably is a good idea to leave this disabled except for target units that shall be used similar to runlevels in SysV init systems, just as a precaution to avoid unusable system states\&. This option defaults to
-\fBfalse\fR\&.
-.RE
-.PP
-\fIDefaultDependencies=\fR
-.RS 4
-Takes a boolean argument\&. If
-\fBtrue\fR
-(the default), a few default dependencies will implicitly be created for the unit\&. The actual dependencies created depend on the unit type\&. For example, for service units, these dependencies ensure that the service is started only after basic system initialization is completed and is properly terminated on system shutdown\&. See the respective man pages for details\&. Generally, only services involved with early boot or late shutdown should set this option to
-\fBfalse\fR\&. It is highly recommended to leave this option enabled for the majority of common units\&. If set to
-\fBfalse\fR
-this option does not disable all implicit dependencies, just non\-essential ones\&.
-.RE
-.PP
-\fIJobTimeoutSec=\fR
-.RS 4
-When clients are waiting for a job of this unit to complete, time out after the specified time\&. If this time limit is reached the job will be cancelled, the unit however will not change state or even enter the \*(Aqfailed\*(Aq mode\&. This value defaults to 0 (job timeouts disabled), except for device units\&. NB: this timeout is independent from any unit\-specific timeout (for example, the timeout set with
-\fITimeout=\fR
-in service units) as the job timeout has no effect on the unit itself, only on the job that might be pending for it\&. Or in other words: unit\-specific timeouts are useful to abort unit state changes, and revert them\&. The job timeout set with this option however is useful to abort only the job waiting for the unit state to change\&.
-.RE
-.PP
-\fIConditionPathExists=\fR, \fIConditionPathExistsGlob=\fR, \fIConditionPathIsDirectory=\fR, \fIConditionPathIsSymbolicLink=\fR, \fIConditionPathIsMountPoint=\fR, \fIConditionDirectoryNotEmpty=\fR, \fIConditionFileIsExecutable=\fR, \fIConditionKernelCommandLine=\fR, \fIConditionVirtualization=\fR, \fIConditionSecurity=\fR, \fIConditionCapability=\fR, \fIConditionNull=\fR
-.RS 4
-Before starting a unit verify that the specified condition is true\&. With
-\fIConditionPathExists=\fR
-a file existence condition can be checked before a unit is started\&. If the specified absolute path name does not exist, startup of a unit will not actually happen, however the unit is still useful for ordering purposes in this case\&. The condition is checked at the time the queued start job is to be executed\&. If the absolute path name passed to
-\fIConditionPathExists=\fR
-is prefixed with an exclamation mark (!), the test is negated, and the unit is only started if the path does not exist\&.
-\fIConditionPathExistsGlob=\fR
-works in a similar way, but checks for the existence of at least one file or directory matching the specified globbing pattern\&.
-\fIConditionPathIsDirectory=\fR
-is similar to
-\fIConditionPathExists=\fR
-but verifies whether a certain path exists and is a directory\&.
-\fIConditionPathIsSymbolicLink=\fR
-is similar to
-\fIConditionPathExists=\fR
-but verifies whether a certain path exists and is a symbolic link\&.
-\fIConditionPathIsMountPoint=\fR
-is similar to
-\fIConditionPathExists=\fR
-but verifies whether a certain path exists and is a mount point\&.
-\fIConditionFileIsExecutable=\fR
-is similar to
-\fIConditionPathExists=\fR
-but verifies whether a certain path exists, is a regular file and marked executable\&.
-\fIConditionDirectoryNotEmpty=\fR
-is similar to
-\fIConditionPathExists=\fR
-but verifies whether a certain path exists and is a non\-empty directory\&. Similarly
-\fIConditionKernelCommandLine=\fR
-may be used to check whether a specific kernel command line option is set (or if prefixed with the exclamation mark unset)\&. The argument must either be a single word, or an assignment (i\&.e\&. two words, separated by the equality sign)\&. In the former case the kernel command line is searched for the word appearing as is, or as left hand side of an assignment\&. In the latter case the exact assignment is looked for with right and left hand side matching\&.
-\fIConditionVirtualization=\fR
-may be used to check whether the system is executed in a virtualized environment and optionally test whether it is a specific implementation\&. Takes either boolean value to check if being executed in any virtualized environment, or one of
-\fIvm\fR
-and
-\fIcontainer\fR
-to test against a specific type of virtualization solution, or one of
-\fIqemu\fR,
-\fIkvm\fR,
-\fIvmware\fR,
-\fImicrosoft\fR,
-\fIoracle\fR,
-\fIxen\fR,
-\fIbochs\fR,
-\fIchroot\fR,
-\fIopenvz\fR,
-\fIlxc\fR,
-\fIlxc\-libvirt\fR,
-\fIsystemd\-nspawn\fR,
-\fIpidns\fR
-to test against a specific implementation\&. If multiple virtualization technologies are nested only the innermost is considered\&. The test may be negated by prepending an exclamation mark\&.
-\fIConditionSecurity=\fR
-may be used to check whether the given security module is enabled on the system\&. Currently the only recognized value is
-\fIselinux\fR\&. The test may be negated by prepending an exclamation mark\&.
-\fIConditionCapability=\fR
-may be used to check whether the given capability exists in the capability bounding set of the service manager (i\&.e\&. this does not check whether capability is actually available in the permitted or effective sets, see
-\fBcapabilities\fR(7)
-for details)\&. Pass a capability name such as
-CAP_MKNOD, possibly prefixed with an exclamation mark to negate the check\&. Finally,
-\fIConditionNull=\fR
-may be used to add a constant condition check value to the unit\&. It takes a boolean argument\&. If set to
-\fIfalse\fR
-the condition will always fail, otherwise succeed\&. If multiple conditions are specified the unit will be executed if all of them apply (i\&.e\&. a logical AND is applied)\&. Condition checks can be prefixed with a pipe symbol (|) in which case a condition becomes a triggering condition\&. If at least one triggering condition is defined for a unit then the unit will be executed if at least one of the triggering conditions apply and all of the non\-triggering conditions\&. If you prefix an argument with the pipe symbol and an exclamation mark the pipe symbol must be passed first, the exclamation second\&. Except for
-\fIConditionPathIsSymbolicLink=\fR, all path checks follow symlinks\&.
-.RE
-.PP
-\fINames=\fR
-.RS 4
-Additional names for this unit\&. The names listed here must have the same suffix (i\&.e\&. type) as the unit file name\&. This option may be specified more than once, in which case all listed names are used\&. Note that this option is different from the
-\fIAlias=\fR
-option from the [Install] section mentioned below\&. See below for details\&. Note that in almost all cases this option is not what you want\&. A symlink alias in the file system is generally preferable since it can be used as lookup key\&. If a unit with a symlinked alias name is not loaded and needs to be it is easily found via the symlink\&. However, if a unit with an alias name configured with this setting is not loaded it will not be discovered\&. This settings\*(Aq only use is in conjunction with service instances\&.
-.RE
-.PP
-Unit file may include a [Install] section, which carries installation information for the unit\&. This section is not interpreted by
-\fBsystemd\fR(1)
-during runtime\&. It is used exclusively by the
-\fBenable\fR
-and
-\fBdisable\fR
-commands of the
-\fBsystemctl\fR(1)
-tool during installation of a unit:
-.PP
-\fIAlias=\fR
-.RS 4
-Additional names this unit shall be installed under\&. The names listed here must have the same suffix (i\&.e\&. type) as the unit file name\&. This option may be specified more than once, in which case all listed names are used\&. At installation time,
-\fBsystemctl enable\fR
-will create symlinks from these names to the unit file name\&. Note that this is different from the
-\fINames=\fR
-option from the [Unit] section mentioned above: The names from
-\fINames=\fR
-apply unconditionally if the unit is loaded\&. The names from
-\fIAlias=\fR
-apply only if the unit has actually been installed with the
-\fBsystemctl enable\fR
-command\&. Also, if systemd searches for a unit, it will discover symlinked alias names as configured with
-\fIAlias=\fR, but not names configured with
-\fINames=\fR
-only\&. It is a common pattern to list a name in both options\&. In this case, a unit will be active under all names if installed, but also if not installed but requested explicitly under its main name\&.
-.RE
-.PP
-\fIWantedBy=\fR
-.RS 4
-Installs a symlink in the
-\&.wants/
-subdirectory for a unit\&. This has the effect that when the listed unit name is activated the unit listing it is activated too\&.
-\fBWantedBy=foo\&.service\fR
-in a service
-bar\&.service
-is mostly equivalent to
-\fBAlias=foo\&.service\&.wants/bar\&.service\fR
-in the same file\&.
-.RE
-.PP
-\fIAlso=\fR
-.RS 4
-Additional units to install when this unit is installed\&. If the user requests installation of a unit with this option configured,
-\fBsystemctl enable\fR
-will automatically install units listed in this option as well\&.
-.RE
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(8),
-\fBsystemd.special\fR(7),
-\fBsystemd.service\fR(5),
-\fBsystemd.socket\fR(5),
-\fBsystemd.device\fR(5),
-\fBsystemd.mount\fR(5),
-\fBsystemd.automount\fR(5),
-\fBsystemd.swap\fR(5),
-\fBsystemd.target\fR(5),
-\fBsystemd.path\fR(5),
-\fBsystemd.timer\fR(5),
-\fBsystemd.snapshot\fR(5),
-\fBcapabilities\fR(7)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
-.SH "NOTES"
-.IP " 1." 4
-XDG Desktop Entry Specification
-.RS 4
-\%http://standards.freedesktop.org/desktop-entry-spec/latest/
-.RE
-.IP " 2." 4
-Interface Stability Promise
-.RS 4
-\%http://www.freedesktop.org/wiki/Software/systemd/InterfaceStabilityPromise
-.RE
index eecff73..897f99f 100644 (file)
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>PropagateReloadTo=</varname></term>
-                                <term><varname>PropagateReloadFrom=</varname></term>
-
-                                <listitem><para>Lists one or more
-                                units where reload requests on the
-                                unit will be propagated to/on the
-                                other unit will be propagated
-                                from. Issuing a reload request on a
-                                unit will automatically also enqueue a
-                                reload request on all units that the
-                                reload request shall be propagated to
-                                via these two
-                                settings.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
                                 <term><varname>OnFailureIsolate=</varname></term>
 
                                 <listitem><para>Takes a boolean
                                 <varname>chroot</varname>,
                                 <varname>openvz</varname>,
                                 <varname>lxc</varname>,
-                                <varname>lxc-libvirt</varname>,
                                 <varname>systemd-nspawn</varname>,
                                 <varname>pidns</varname> to test
                                 against a specific implementation. If
index f0bc552..a8a6967 100644 (file)
                                 <listitem><para>Set log
                                 target. Argument must be one of
                                 <option>console</option>,
-                                <option>journal</option>,
                                 <option>syslog</option>,
                                 <option>kmsg</option>,
-                                <option>journal-or-kmsg</option>,
                                 <option>syslog-or-kmsg</option>,
                                 <option>null</option>.</para></listitem>
                         </varlistentry>
                                 <option>inherit</option>,
                                 <option>null</option>,
                                 <option>tty</option>,
-                                <option>journal</option>,
-                                <option>journal+console</option>,
                                 <option>syslog</option>,
                                 <option>syslog+console</option>,
                                 <option>kmsg</option>,
                                 <option>kmsg+console</option>.  If the
                                 argument is omitted
                                 <option>--default-standard-output=</option>
-                                defaults to <option>journal</option>
+                                defaults to <option>syslog</option>
                                 and
                                 <option>--default-standard-error=</option>
                                 to
                                 <listitem><para>Sets the log level to
                                 <literal>debug</literal>
                                 (resp. <literal>info</literal> on
-                                <literal>SIGRTMIN+23</literal>), as
+                                <literal>SIGRTMIN+32</literal>), as
                                 controlled via
                                 <varname>systemd.log_level=debug</varname>
                                 (resp. <varname>systemd.log_level=info</varname>
                         </varlistentry>
 
                         <varlistentry>
-                                <term>SIGRTMIN+26</term>
                                 <term>SIGRTMIN+27</term>
                                 <term>SIGRTMIN+28</term>
                                 <term>SIGRTMIN+29</term>
 
                                 <listitem><para>Sets the log level to
-                                <literal>journal-or-kmsg</literal>
-                                (resp. <literal>console</literal> on
-                                <literal>SIGRTMIN+27</literal>;
-                                resp. <literal>kmsg</literal> on
+                                <literal>console</literal>
+                                (resp. <literal>kmsg</literal> on
                                 <literal>SIGRTMIN+28</literal>;
                                 resp. <literal>syslog-or-kmsg</literal>
                                 on <literal>SIGRTMIN+29</literal>), as
                                 controlled via
-                                <varname>systemd.log_target=journal-or-kmsg</varname>
-                                (resp. <varname>systemd.log_target=console</varname>
-                                on <literal>SIGRTMIN+27</literal>;
-                                resp. <varname>systemd.log_target=kmsg</varname>
+                                <varname>systemd.log_target=console</varname>
+                                (resp. <varname>systemd.log_target=kmsg</varname>
                                 on <literal>SIGRTMIN+28</literal>;
                                 resp
                                 <varname>systemd.log_target=syslog-or-kmsg</varname>
                                 above.</para></listitem>
                         </varlistentry>
 
-                        <varlistentry>
-                                <term><varname>systemd.setenv=</varname></term>
-
-                                <listitem><para>Takes a string
-                                argument in the form
-                                VARIABLE=VALUE. May be used to set
-                                environment variables for the init
-                                process and all its children at boot
-                                time. May be used more than once to
-                                set multiple variables. If the equal
-                                sign and variable are missing unsets
-                                an environment variable which might be
-                                passed in from the initial ram
-                                disk.</para></listitem>
-                        </varlistentry>
-
                 </variablelist>
         </refsect1>
 
                         </varlistentry>
 
                         <varlistentry>
+                                <term><filename>/run/systemd/stdout-syslog-bridge</filename></term>
+
+                                <listitem><para>Used internally by the
+                                <filename>systemd-stdout-syslog-bridge.service</filename>
+                                unit to connect STDOUT and/or STDERR
+                                of spawned processes to
+                                <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
+                                or the kernel log buffer. This is an
+                                AF_UNIX stream
+                                socket.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
                                 <term><filename>/run/systemd/shutdownd</filename></term>
 
                                 <listitem><para>Used internally by the
diff --git a/man/telinit.8 b/man/telinit.8
deleted file mode 100644 (file)
index 4db6958..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-'\" t
-.\"     Title: telinit
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: telinit
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "TELINIT" "8" "02/15/2012" "systemd" "telinit"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-telinit \- Change SysV runlevel
-.SH "SYNOPSIS"
-.HP \w'\fBtelinit\ \fR\fB[OPTIONS...]\fR\fB\ \fR\fB{COMMAND}\fR\ 'u
-\fBtelinit \fR\fB[OPTIONS...]\fR\fB \fR\fB{COMMAND}\fR
-.SH "DESCRIPTION"
-.PP
-\fBtelinit\fR
-may be used to change the SysV system runlevel\&. Since the concept of SysV runlevels is obsolete the runlevel requests will be transparently translated into systemd unit activation requests\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fB\-\-help\fR
-.RS 4
-Prints a short help text and exits\&.
-.RE
-.PP
-\fB\-\-no\-wall\fR
-.RS 4
-Don\*(Aqt send wall message before reboot/halt/power\-off\&.
-.RE
-.PP
-The following commands are understood:
-.PP
-\fB0\fR
-.RS 4
-Power\-off the machine\&. This is translated into an activation request for
-poweroff\&.target
-and is equivalent to
-\fBsystemctl poweroff\fR\&.
-.RE
-.PP
-\fB6\fR
-.RS 4
-Reboot the machine\&. This is translated into an activation request for
-reboot\&.target
-and is equivalent to
-\fBsystemctl reboot\fR\&.
-.RE
-.PP
-\fB2\fR, \fB3\fR, \fB4\fR, \fB5\fR
-.RS 4
-Change the SysV runlevel\&. This is translated into an activation request for
-runlevel2\&.target,
-runlevel3\&.target, \&.\&.\&. and is equivalent to
-\fBsystemctl isolate runlevel2\&.target\fR,
-\fBsystemctl isolate runlevel3\&.target\fR, \&.\&.\&.
-.RE
-.PP
-\fB1\fR, \fBs\fR, \fBS\fR
-.RS 4
-Change into system rescue mode\&. This is translated into an activation request for
-rescue\&.target
-and is equivalent to
-\fBsystemctl rescue\fR\&.
-.RE
-.PP
-\fBq\fR, \fBQ\fR
-.RS 4
-Reload daemon configuration\&. This is equivalent to
-\fBsystemctl daemon\-reload\fR\&.
-.RE
-.PP
-\fBu\fR, \fBU\fR
-.RS 4
-Serialize state, reexecute daemon and deserialize state again\&. This is equivalent to
-\fBsystemctl daemon\-reexec\fR\&.
-.RE
-.SH "EXIT STATUS"
-.PP
-On success 0 is returned, a non\-zero failure code otherwise\&.
-.SH "NOTES"
-.PP
-This is a legacy command available for compatibility only\&. It should not be used anymore, as the concept of runlevels is obsolete\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemctl\fR(1),
-\fBwall\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/timezone.5 b/man/timezone.5
deleted file mode 100644 (file)
index 5ff661d..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: timezone
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: /etc/timezone
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "TIMEZONE" "5" "02/15/2012" "systemd" "/etc/timezone"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-timezone \- Local time zone configuration file
-.SH "SYNOPSIS"
-.PP
-/etc/timezone
-.SH "DESCRIPTION"
-.PP
-The
-/etc/timezone
-file configures the system\-wide time zone of the local system that is used by applications for presentation to the user\&. It should contain a single newline\-terminated line consisting of a time zone identifier such as
-Europe/Berlin\&. The file
-/etc/localtime
-corresponds with
-/etc/timezone
-and contains the binary time zone data for the time zone\&. These files should always be changed simultaneously and kept in sync\&.
-.PP
-The time zone may be overridden for individual programs by using the TZ environment variable\&. See
-\fBenviron\fR(7)\&.
-.SH "HISTORY"
-.PP
-The simple configuration file format of
-/etc/timezone
-originates from Debian GNU/Linux\&.
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/man/tmpfiles.d.5 b/man/tmpfiles.d.5
deleted file mode 100644 (file)
index 447a5d8..0000000
+++ /dev/null
@@ -1,193 +0,0 @@
-'\" t
-.\"     Title: tmpfiles.d
-.\"    Author: Brandon Philips <brandon@ifup.org>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: tmpfiles.d
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "TMPFILES\&.D" "5" "02/15/2012" "systemd" "tmpfiles.d"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-tmpfiles.d \- Configuration for creation, deletion and cleaning of volatile and temporary files
-.SH "SYNOPSIS"
-.PP
-/usr/lib/tmpfiles\&.d/*\&.conf
-.PP
-/etc/tmpfiles\&.d/*\&.conf
-.PP
-/run/tmpfiles\&.d/*\&.conf
-.SH "DESCRIPTION"
-.PP
-\fBsystemd\-tmpfiles\fR
-uses the configuration files from the above directories to describe the creation, cleaning and removal of volatile and temporary files and directories which usually reside in directories such as
-/run
-or
-/tmp\&.
-.SH "CONFIGURATION FORMAT"
-.PP
-Each configuration file is named in the style of
-<program>\&.conf\&. Files in
-/etc/
-override files with the same name in
-/usr/lib/\&. Files in
-/run
-override files with the same name in
-/etc/
-and
-/usr/lib/\&. Packages should install their configuration files in
-/usr/lib/, files in
-/etc/
-are reserved for the local administrator, who may choose to override the configurations installed from packages\&. The list of configuration files are sorted by their filename in alphabetical order, regardless in which of the directories they reside, to guarantee that a configuration file takes precedence over another configuration file with an alphabetically later name\&.
-.PP
-The configuration format is one line per path containing action, path, mode, ownership, age and argument fields:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-Type Path        Mode UID  GID  Age Argument
-d    /run/user   0755 root root 10d \-
-L    /tmp/foobar \-    \-    \-    \-   /dev/null
-.fi
-.if n \{\
-.RE
-.\}
-.SS "Type"
-.PP
-\fIf\fR
-.RS 4
-Create a file if it doesn\*(Aqt exist yet (optionally writing a short string into it, if the argument parameter is passed)
-.RE
-.PP
-\fIF\fR
-.RS 4
-Create or truncate a file (optionally writing a short string into it, if the argument parameter is passed)
-.RE
-.PP
-\fIw\fR
-.RS 4
-Write the argument parameter to a file, if it exists\&.
-.RE
-.PP
-\fId\fR
-.RS 4
-Create a directory if it doesn\*(Aqt exist yet
-.RE
-.PP
-\fID\fR
-.RS 4
-Create or empty a directory
-.RE
-.PP
-\fIp\fR
-.RS 4
-Create a named pipe (FIFO) if it doesn\*(Aqt exist yet
-.RE
-.PP
-\fIL\fR
-.RS 4
-Create a symlink if it doesn\*(Aqt exist yet
-.RE
-.PP
-\fIc\fR
-.RS 4
-Create a character device node if it doesn\*(Aqt exist yet
-.RE
-.PP
-\fIb\fR
-.RS 4
-Create a block device node if it doesn\*(Aqt exist yet
-.RE
-.PP
-\fIx\fR
-.RS 4
-Ignore a path during cleaning\&. Use this type to exclude paths from clean\-up as controlled with the Age parameter\&. Note that lines of this type do not influence the effect of r or R lines\&. Lines of this type accept shell\-style globs in place of of normal path names\&.
-.RE
-.PP
-\fIr\fR
-.RS 4
-Remove a file or directory if it exists\&. This may not be used to remove non\-empty directories, use R for that\&. Lines of this type accept shell\-style globs in place of normal path names\&.
-.RE
-.PP
-\fIR\fR
-.RS 4
-Recursively remove a path and all its subdirectories (if it is a directory)\&. Lines of this type accept shell\-style globs in place of normal path names\&.
-.RE
-.PP
-\fIz\fR
-.RS 4
-Set ownership, access mode and relabel security context of a file or directory if it exists\&. Lines of this type accept shell\-style globs in place of normal path names\&.
-.RE
-.PP
-\fIZ\fR
-.RS 4
-Recursively set ownership, access mode and relabel security context of a path and all its subdirectories (if it is a directory)\&. Lines of this type accept shell\-style globs in place of normal path names\&.
-.RE
-.SS "Mode"
-.PP
-The file access mode to use when creating this file or directory\&. If omitted or when set to \- the default is used: 0755 for directories, 0644 for all other file objects\&. For z, Z lines if omitted or when set to \- the file access mode will not be modified\&. This parameter is ignored for x, r, R, L lines\&.
-.SS "UID, GID"
-.PP
-The user and group to use for this file or directory\&. This may either be a numeric user/group ID or a user or group name\&. If omitted or when set to \- the default 0 (root) is used\&. For z, Z lines when omitted or when set to \- the file ownership will not be modified\&. These parameters are ignored for x, r, R, L lines\&.
-.SS "Age"
-.PP
-The date field, when set, is used to decide what files to delete when cleaning\&. If a file or directory is older than the current time minus the age field it is deleted\&. The field format is a series of integers each followed by one of the following postfixes for the respective time units:
-.PP
-\fIs\fR, \fImin\fR, \fIh\fR, \fId\fR, \fIw\fR, \fIms\fR, \fIm\fR, \fIus\fR
-.RS 4
-.RE
-.PP
-If multiple integers and units are specified the time values are summed up\&.
-.PP
-The age field only applies to lines starting with d, D and x\&. If omitted or set to \- no automatic clean\-up is done\&.
-.SS "Argument"
-.PP
-For L lines determines the destination path of the symlink\&. For c, b determines the major/minor of the device node, with major and minor formatted as integers, separated by :, e\&.g\&. "1:3"\&. For f, F, w may be used to specify a short string that is written to the file, suffixed by a newline\&. Ignored for all other lines\&.
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&/etc/tmpfiles.d/screen.conf example\fR
-.PP
-\fBscreen\fR
-needs two directories created at boot with specific modes and ownership\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-d /var/run/screens  1777 root root 10d
-d /var/run/uscreens 0755 root root 10d12h
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBsystemd-tmpfiles\fR(8)
-.SH "AUTHOR"
-.PP
-\fBBrandon Philips\fR <\&brandon@ifup\&.org\&>
-.RS 4
-Documentation
-.RE
index 25a7c9b..7f4c45c 100644 (file)
                <title>Configuration Format</title>
 
                 <para>Each configuration file is named in the style of
-                <filename>&lt;program&gt;.conf</filename>.  Files in
-                <filename>/etc/</filename> override files with the
-                same name in <filename>/usr/lib/</filename>.  Files in
-                <filename>/run</filename> override files with the same
-                name in <filename>/etc/</filename> and
-                <filename>/usr/lib/</filename>. Packages should
-                install their configuration files in
-                <filename>/usr/lib/</filename>, files in
-                <filename>/etc/</filename> are reserved for the local
-                administrator, who may choose to override the
-                configurations installed from packages. The list of
-                configuration files are sorted by their filename in
-                alphabetical order, regardless in which of the
-                directories they reside, to guarantee that a
-                configuration file takes precedence over another
-                configuration file with an alphabetically later
-                name.</para>
+                <filename>&lt;program&gt;.conf</filename>.
+                Files in <filename>/etc/</filename> overwrite
+                files with the same name in <filename>/usr/lib/</filename>.
+                Files in <filename>/run</filename> overwrite files with
+                the same name in <filename>/etc/</filename> and
+                <filename>/usr/lib/</filename>. Packages should install their
+                configuration files in <filename>/usr/lib/</filename>, files
+                in <filename>/etc/</filename> are reserved for the local
+                administration, which possibly decides to overwrite the
+                configurations installed from packages. All files are sorted
+                by filename in alphabetical order, regardless in which of the
+                directories they reside, to ensure that a specific
+                configuration file takes precedence over another file with
+                an alphabetically later name.</para>
 
                <para>The configuration format is one line per path
-               containing action, path, mode, ownership, age and argument
+               containing action, mode, ownership and age
                fields:</para>
 
-                <programlisting>Type Path        Mode UID  GID  Age Argument
-d    /run/user   0755 root root 10d -
-L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
+                <programlisting>Type Path          Mode UID  GID  Age
+d    /run/user 0755 root root 10d</programlisting>
 
                 <refsect2>
                         <title>Type</title>
                         <variablelist>
                                 <varlistentry>
                                         <term><varname>f</varname></term>
-                                        <listitem><para>Create a file if it doesn't exist yet (optionally writing a short string into it, if the argument parameter is passed)</para></listitem>
+                                        <listitem><para>Create a file if it doesn't exist yet</para></listitem>
                                 </varlistentry>
 
                                 <varlistentry>
                                         <term><varname>F</varname></term>
-                                        <listitem><para>Create or truncate a file (optionally writing a short string into it, if the argument parameter is passed)</para></listitem>
-                                </varlistentry>
-
-                                <varlistentry>
-                                        <term><varname>w</varname></term>
-                                        <listitem><para>Write the argument parameter to a file, if it exists.</para></listitem>
+                                        <listitem><para>Create or truncate a file</para></listitem>
                                 </varlistentry>
 
                                 <varlistentry>
@@ -127,21 +118,6 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                 </varlistentry>
 
                                 <varlistentry>
-                                        <term><varname>L</varname></term>
-                                        <listitem><para>Create a symlink if it doesn't exist yet</para></listitem>
-                                </varlistentry>
-
-                                <varlistentry>
-                                        <term><varname>c</varname></term>
-                                        <listitem><para>Create a character device node if it doesn't exist yet</para></listitem>
-                                </varlistentry>
-
-                                <varlistentry>
-                                        <term><varname>b</varname></term>
-                                        <listitem><para>Create a block device node if it doesn't exist yet</para></listitem>
-                                </varlistentry>
-
-                                <varlistentry>
                                         <term><varname>x</varname></term>
                                         <listitem><para>Ignore a path
                                         during cleaning. Use this type
@@ -179,27 +155,6 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                         place of normal path
                                         names.</para></listitem>
                                 </varlistentry>
-
-                                <varlistentry>
-                                        <term><varname>z</varname></term>
-                                        <listitem><para>Set ownership, access
-                                        mode and relabel security context of
-                                        a file or directory if it exists.
-                                        Lines of this type accept shell-style
-                                        globs in place of normal path names.
-                                        </para></listitem>
-                                </varlistentry>
-
-                                <varlistentry>
-                                        <term><varname>Z</varname></term>
-                                        <listitem><para>Recursively set
-                                        ownership, access mode and relabel
-                                        security context of a path and
-                                        all its subdirectories (if it is a
-                                        directory). Lines of this type accept
-                                        shell-style globs in place of normal
-                                        path names.</para></listitem>
-                                </varlistentry>
                         </variablelist>
                 </refsect2>
 
@@ -209,11 +164,8 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         <para>The file access mode to use when
                         creating this file or directory. If omitted or
                         when set to - the default is used: 0755 for
-                        directories, 0644 for all other file
-                        objects. For z, Z lines if omitted or when set
-                        to - the file access mode will not be
-                        modified. This parameter is ignored for x, r,
-                        R, L lines.</para>
+                        directories, 0644 for files. This parameter is
+                        ignored for x, r, R lines.</para>
                 </refsect2>
 
                 <refsect2>
@@ -223,9 +175,8 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         or directory. This may either be a numeric
                         user/group ID or a user or group name. If
                         omitted or when set to - the default 0 (root)
-                        is used. For z, Z lines when omitted or when set to -
-                        the file ownership will not be modified.
-                        These parameters are ignored for x, r, R, L lines.</para>
+                        is used. . These parameters are ignored for x,
+                        r, R lines.</para>
                 </refsect2>
 
                 <refsect2>
@@ -258,19 +209,6 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         is done.</para>
                 </refsect2>
 
-                <refsect2>
-                        <title>Argument</title>
-
-                        <para>For L lines determines the destination
-                        path of the symlink. For c, b determines the
-                        major/minor of the device node, with major and
-                        minor formatted as integers, separated by :,
-                        e.g. "1:3". For f, F, w may be used to specify
-                        a short string that is written to the file,
-                        suffixed by a newline. Ignored for all other
-                        lines.</para>
-                </refsect2>
-
         </refsect1>
 
         <refsect1>
@@ -279,7 +217,7 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                         <title>/etc/tmpfiles.d/screen.conf example</title>
                         <para><command>screen</command> needs two directories created at boot with specific modes and ownership.</para>
 
-                        <programlisting>d /var/run/screens  1777 root root 10d
+                        <programlisting>d /var/run/screens 1777 root root 10d
 d /var/run/uscreens 0755 root root 10d12h</programlisting>
                 </example>
         </refsect1>
diff --git a/man/vconsole.conf.5 b/man/vconsole.conf.5
deleted file mode 100644 (file)
index ea766d2..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-'\" t
-.\"     Title: vconsole.conf
-.\"    Author: Lennart Poettering <lennart@poettering.net>
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 02/15/2012
-.\"    Manual: vconsole.conf
-.\"    Source: systemd
-.\"  Language: English
-.\"
-.TH "VCONSOLE\&.CONF" "5" "02/15/2012" "systemd" "vconsole.conf"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-vconsole.conf \- configuration file for the virtual console
-.SH "SYNOPSIS"
-.PP
-/etc/vconsole\&.conf
-.SH "DESCRIPTION"
-.PP
-The
-/etc/vconsole\&.conf
-file configures the virtual console, i\&.e\&. keyboard mapping and console font\&.
-.PP
-The basic file format of the
-vconsole\&.conf
-is a newline\-separated list environment\-like shell\-compatible variable assignments\&. It is possible to source the configuration from shell scripts, however, beyond mere variable assignments no shell features are supported, allowing applications to read the file without implementing a shell compatible execution engine\&.
-.PP
-Note that the kernel command line options
-\fIvconsole\&.keymap=\fR,
-\fIvconsole\&.keymap\&.toggle=\fR,
-\fIvconsole\&.font=\fR,
-\fIvconsole\&.font\&.map=\fR,
-\fIvconsole\&.font\&.unimap=\fR
-may be used to override the console settings at boot\&.
-.PP
-Depending on the operating system other configuration files might be checked for configuration of the virtual console as well, however only as fallback\&.
-.SH "OPTIONS"
-.PP
-The following options are understood:
-.PP
-\fIKEYMAP=\fR, \fIKEYMAP_TOGGLE=\fR
-.RS 4
-Configures the key mapping table of for they keyboard\&.
-\fIKEYMAP=\fR
-defaults to
-us
-if not set\&. The
-\fIKEYMAP_TOGGLE=\fR
-can be used to configured a second toggle keymap and is by default unset\&.
-.RE
-.PP
-\fIFONT=\fR, \fIFONT_MAP=\fR, \fIFONT_UNIMAP=\fR
-.RS 4
-Configures the console font, the console map and the unicode font map\&.
-\fIFONT=\fR
-defaults to
-latarcyrheb\-sun16\&.
-.RE
-.SH "EXAMPLE"
-.PP
-\fBExample\ \&1.\ \&German keyboard and console\fR
-.PP
-/etc/vconsole\&.conf:
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-KEYMAP=de\-latin1
-FONT=latarcyrheb\-sun16
-.fi
-.if n \{\
-.RE
-.\}
-.SH "SEE ALSO"
-.PP
-
-\fBsystemd\fR(1),
-\fBloadkeys\fR(1),
-\fBsetfont\fR(8),
-\fBlocale.conf\fR(5)
-.SH "AUTHOR"
-.PP
-\fBLennart Poettering\fR <\&lennart@poettering\&.net\&>
-.RS 4
-Developer
-.RE
diff --git a/missing b/missing
deleted file mode 100755 (executable)
index 86a8fc3..0000000
--- a/missing
+++ /dev/null
@@ -1,331 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2012-01-06.13; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-                                      sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-          sed 's/\.am$/.in/' |
-          while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-       touch $file
-    else
-       test -z "$file" || exec >$file
-       echo "#! /bin/sh"
-       echo "# Created by GNU Automake missing as a replacement of"
-       echo "#  $ $@"
-       echo "exit 0"
-       chmod +x $file
-       exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-       case $LASTARG in
-       *.y)
-           SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-           if test -f "$SRCFILE"; then
-                cp "$SRCFILE" y.tab.c
-           fi
-           SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-           if test -f "$SRCFILE"; then
-                cp "$SRCFILE" y.tab.h
-           fi
-         ;;
-       esac
-    fi
-    if test ! -f y.tab.h; then
-       echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-       echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-       case $LASTARG in
-       *.l)
-           SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-           if test -f "$SRCFILE"; then
-                cp "$SRCFILE" lex.yy.c
-           fi
-         ;;
-       esac
-    fi
-    if test ! -f lex.yy.c; then
-       echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-        you modified a dependency of a manual page.  You may need the
-        \`Help2man' package in order for those modifications to take
-        effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-       touch $file
-    else
-       test -z "$file" || exec >$file
-       echo ".ab help2man is required to generate this page"
-       exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-       /^@setfilename/{
-         s/.* \([^ ]*\) *$/\1/
-         p
-         q
-       }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/packaging/0002-systemd-fsck-disable-l-until-linux.patch b/packaging/0002-systemd-fsck-disable-l-until-linux.patch
deleted file mode 100644 (file)
index e7b50c5..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 69e7f67292ce52bf123958f392084ddae90a2ec1 Mon Sep 17 00:00:00 2001
-From: Chris E Ferron <chris.e.ferron@linux.intel.com>
-Date: Fri, 20 Jan 2012 11:27:56 -0800
-Subject: [PATCH 2/2] systemd fsck disable l until linux
-
----
- src/fsck.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/fsck.c b/src/fsck.c
-index c5088ad..7408654 100644
---- a/src/fsck.c
-+++ b/src/fsck.c
-@@ -322,7 +322,7 @@ int main(int argc, char *argv[]) {
-         cmdline[i++] = "/sbin/fsck";
-         cmdline[i++] = "-a";
-         cmdline[i++] = "-T";
--        cmdline[i++] = "-l";
-+        /* cmdline[i++] = "-l"; */ /* not supported in meego's util-linux */
-         if (!root_directory)
-                 cmdline[i++] = "-M";
--- 
-1.7.7.5
-
diff --git a/packaging/add-tmp.mount-as-tmpfs.patch b/packaging/add-tmp.mount-as-tmpfs.patch
deleted file mode 100644 (file)
index a37f174..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8598715564c7c8d7b7ed75e98bd57cc44b16b318 Mon Sep 17 00:00:00 2001
-From: William Douglas <william.douglas@intel.com>
-Date: Fri, 20 Apr 2012 14:20:14 -0700
-Subject: [PATCH 1/3] add tmp.mount to mount /tmp as tmpfs
-
----
- Makefile.am           |    7 +++++++
- units/tizen/tmp.mount |   10 ++++++++++
- 2 files changed, 17 insertions(+)
- create mode 100644 units/tizen/tmp.mount
-
-diff --git a/Makefile.am b/Makefile.am
-index 9762da1..d24649e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -380,6 +380,11 @@ systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
- endif
-+if TARGET_MEEGO
-+dist_systemunit_DATA += \
-+      units/tizen/tmp.mount
-+endif
-+
- if TARGET_MANDRIVA
- dist_systemunit_DATA += \
-       units/mandriva/prefdm.service \
-@@ -2433,6 +2438,8 @@ if TARGET_MEEGO
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
-               rm -f * )
-+      ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-+              $(LN_S) $(systemunitdir)/tmp.mount tmp.mount )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f * )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-diff --git a/units/tizen/tmp.mount b/units/tizen/tmp.mount
-new file mode 100644
-index 0000000..7c3e98c
---- /dev/null
-+++ b/units/tizen/tmp.mount
-@@ -0,0 +1,10 @@
-+
-+[Unit]
-+Description=Runtime Directory
-+Before=local-fs.target
-+
-+[Mount]
-+What=tmpfs
-+Where=/tmp
-+Type=tmpfs
-+Options=relatime,nodev,nosuid,noexec,size=128M
--- 
-1.7.10
-
diff --git a/packaging/pamconsole-tmp.conf b/packaging/pamconsole-tmp.conf
deleted file mode 100644 (file)
index e57aa60..0000000
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/console 0755 root root -
diff --git a/packaging/systemd.changes b/packaging/systemd.changes
deleted file mode 100644 (file)
index 0168c9a..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-* Wed Jul 25 2012 William Douglas <william.douglas@intel.com> 20120702.1314@98c0af0
-[ William Douglas ]
-- Fix the default PATH environment variable.
-
-* Mon Jul 02 2012 Chris Ferron <chris.e.ferron@linux.intel.com> - 43
-- re-add Obsoletes/Provides for sysvinit so we can remove sysvinit.
-
-* Fri Jun 29 2012 Chris Ferron <chris.e.ferron@linux.intel.com> - 43
-- temp removal of Obsoletes/Provides for sysvinit until we are ready to really remove sysvinit.
-* Wed Jun 27 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> - 43
-- Add an Obsoletes/Provides for sysvinit
-
-* Wed Jun 13 2012 William Douglas <william.douglas@intel.com> - 43
-- Add systemd 43
diff --git a/packaging/systemd.manifest b/packaging/systemd.manifest
deleted file mode 100644 (file)
index 4ef1828..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-  <request>
-    <domain name="_"/>
-  </request>
-</manifest>
\ No newline at end of file
index 5140721..26b608c 100644 (file)
-%define _sbindir /sbin
 Name:       systemd
-Summary:    System and Session Manager
-Version:    43
+Summary:    Systemd System and Service Manager
+Version:    25.10
 Release:    1
-Group:      System/System Control
+Group:      System/Base
 License:    GPLv2
-URL:        http://www.freedesktop.org/wiki/Software/systemd
-Source0:    http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-Source1:    pamconsole-tmp.conf
-Source1001: systemd.manifest
-Patch1:     0002-systemd-fsck-disable-l-until-linux.patch
-Patch2:     add-tmp.mount-as-tmpfs.patch
-Patch3:     tizen-login-location.patch
-Patch4:     tizen-service-file-workaround.patch
-
-BuildRequires:  pkgconfig(dbus-1) >= 1.4.0
-BuildRequires:  pkgconfig(dbus-glib-1)
+Source0:    %{name}-%{version}.tar.gz
+BuildRequires:  pkgconfig(dbus-1) >= 1.3.2
 BuildRequires:  pkgconfig(gio-unix-2.0)
-BuildRequires:  pkgconfig(libudev) >= 174
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libudev) >= 160
 BuildRequires:  libcap-devel
-BuildRequires:  gperf
-BuildRequires:  libxslt
-BuildRequires:  docbook-dtds
-BuildRequires:  docbook-xsl
-BuildRequires:  pam-devel
-BuildRequires:  intltool >= 0.40.0
 BuildRequires:  libacl-devel
+BuildRequires:  intltool
 BuildRequires:  fdupes
-BuildRequires:  pkgconfig(libkmod)
-Requires(post): %{_sbindir}/ldconfig
-Requires(postun): %{_sbindir}/ldconfig
 
 %description
-system and session manager for Linux, compatible with SysV and
-LSB init scripts. systemd provides aggressive parallelization
-capabilities, uses socket and D-Bus activation for starting
-services, offers on-demand starting of daemons, keeps track of
-processes using Linux cgroups, supports snapshotting and restoring
-of the system state, maintains mount and automount points and
-implements an elaborate transactional dependency-based service
-control logic. It can work as a drop-in replacement for sysvinit.
-
-%package tools
-Summary:    Analyze systemd startup timing
-Group:      Development/Tools
-Requires:   pycairo
-Requires:   python-xml
-Requires:   %{name} = %{version}-%{release}
-
-%description tools
-This package installs the systemd-analyze tool, which allows one to
-inspect and graph service startup timing in table or graph format.
-
-%package devel
-Summary:    Development tools for systemd
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
-Requires(post): %{_sbindir}/ldconfig
-Requires(postun): %{_sbindir}/ldconfig
-
-%description devel
-This package includes the libraries and header files you will need
-to compile applications for systemd.
-
-%package console-ttyS0
-Summary:    Systemd console ttyS0
-Group:      System/System Control
-Requires:   %{name}
-
-%description console-ttyS0
-This package will setup a serial getty for ttyS0 is desired.
-
-
-%package console-ttyS1
-Summary:    Systemd console ttyS1
-Group:      System/System Control
-Requires:   %{name}
-
-%description console-ttyS1
-This package will setup a serial getty for ttyS1 is desired.
-
-
-%package console-tty01
-Summary:    Systemd console tty01
-Group:      System/System Control
-Requires:   %{name}
-
-%description console-tty01
-This package will setup a serial getty for tty01 is desired.
-
-
-%package console-ttyO2
-Summary:    Systemd console ttyO2
-Group:      System/System Control
-Requires:   %{name}
-
-%description console-ttyO2
-This package will setup a serial getty for ttyO2 is desired.
-
-%package console-ttyMFD2
-Summary:    Systemd console ttyMFD2
-Group:      System/System Control
-Requires:   %{name}
-
-%description console-ttyMFD2
-This package will setup a serial getty for ttyMFD2 is desired.
-
-%package console-ttySAC2
-Summary:    Systemd console ttySAC2
-Group:      System/System Control
-Requires:   %{name}
-
-%description console-ttySAC2
-This package will setup a serial getty for ttySAC2 is desired.
-
-
-%package docs
-Summary:   System and session manager man pages
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-
-%description docs
-This package includes the man pages for systemd.
-
-
-%package sysv-docs
-Summary:   System and session manager man pages - SysV links
-Group:     Development/Libraries
-Requires:  %{name} = %{version}-%{release}
-
-%description sysv-docs
-This package provides the manual pages needed for systemd
-to replace sysvinit.
-
-%package sysv
-Summary:   System and session manager - SysV links
-Group:     System/Startup Services
-Requires:  %{name} = %{version}-%{release}
-Obsoletes: sysvinit < 3.0
-Obsoletes: sysvinit-utils < 3.0
-Provides:  sysvinit = 3.0
-Provides:  sysvinit-utils = 3.0
-
-
-%description sysv
-Systemd is a replacement for sysvinit.  It is dependency-based and
-able to read the LSB init script headers in addition to parsing rcN.d
-links as hints.
-
-It also provides process supervision using cgroups and the ability to
-not only depend on other init script being started, but also
-availability of a given mount point or dbus service.
-
-This package provides the links needed for systemd
-to replace sysvinit.
+system and service manager systemd is a replacement for sysvinit.
+It is dependency-based and able to read the LSB init script headers
+in addition to parsing rcN.d links as hints.  .  It also provides
+process supervision using cgroups and the ability to not only depend
+on other init script being started, but also availability of a given
+mount point or dbus service.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%setup -q
 
 %build
-cp %{SOURCE1001} .
-%configure --disable-static \
-    --with-rootdir="" \
-    --with-distro=meego \
-    --disable-gtk \
-    --disable-selinux \
-    --disable-tcpwrap \
-    --enable-split-usr \
-    --enable-manpages \
-    --with-pamlibdir="/%{_libdir}/security" \
-    --with-udevrulesdir="%{_libdir}/udev/rules.d"
 
-make %{?_smp_mflags}
+%autogen --disable-static
+%configure --disable-static \
+           --with-rootdir= \
+           --with-udevrulesdir=/lib/udev/rules.d \
+           --disable-gtk \
+           --disable-libcryptsetup \
+           --disable-audit \
+           --disable-pam \
+           --disable-tcpwrap \
+           --disable-selinux \
+           --with-distro=slp
+make %{?jobs:-j%jobs}
 
 %install
+rm -rf %{buildroot}
 %make_install
 
-# Create SysV compatibility symlinks. systemctl/systemd are smart
-# enough to detect in which way they are called.
-install -d %{buildroot}%{_sbindir}/
-ln -s ..%{_libdir}/systemd/systemd %{buildroot}%{_sbindir}/init
-ln -s ..%{_bindir}/systemctl %{buildroot}%{_sbindir}/halt
-ln -s ..%{_bindir}/systemctl %{buildroot}%{_sbindir}/poweroff
-ln -s ..%{_bindir}/systemctl %{buildroot}%{_sbindir}/reboot
-ln -s ..%{_bindir}/systemctl %{buildroot}%{_sbindir}/runlevel
-ln -s ..%{_bindir}/systemctl %{buildroot}%{_sbindir}/shutdown
-ln -s ..%{_bindir}/systemctl %{buildroot}%{_sbindir}/telinit
-
-# /usr compat - delete when no longer needed
-install -d %{buildroot}/bin/
-ln -s ..%{_bindir}/systemctl %{buildroot}/bin/systemctl
-
-mkdir %{buildroot}/run
-
-# Make sure these directories are properly owned
-mkdir -p %{buildroot}%{_libdir}/systemd/system/basic.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/dbus.target.wants
-
-# enable readahead by default
-ln -s ../systemd-readahead-collect.service %{buildroot}%{_libdir}/systemd/system/sysinit.target.wants/systemd-readahead-collect.service
-ln -s ../systemd-readahead-replay.service %{buildroot}%{_libdir}/systemd/system/sysinit.target.wants/systemd-readahead-replay.service
-
-# Don't ship documentation in the wrong place
-rm %{buildroot}/%{_docdir}/systemd/*
-
-mkdir -p %{buildroot}/etc/systemd/system/basic.target.wants
-mkdir -p %{buildroot}/etc/systemd/system/getty.target.wants
-mkdir -p %{buildroot}%{_libdir}/systemd/system/getty.target.wants
-
-#console-ttyMFD2
-ln -s ../serial-getty@.service %{buildroot}%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyMFD2.service
-
-#console-ttySAC2
-ln -s ../serial-getty@.service %{buildroot}%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttySAC2.service
-
-#console-ttyS0
-ln -s ../serial-getty@.service %{buildroot}%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyS0.service
-
-#console-ttyS1
-ln -s ../serial-getty@.service %{buildroot}%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyS1.service
-
-#console-tty01
-ln -s ../serial-getty@.service %{buildroot}%{_libdir}/systemd/system/getty.target.wants/serial-getty@tty01.service
-
-#console-ttyO2
-ln -s ../serial-getty@.service %{buildroot}%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyO2.service
-
-%fdupes  %{buildroot}/%{_datadir}/man/
-
-%post
-if [ "`readlink /etc/mtab`" != "/proc/self/mounts" ]; then
-       rm -f /etc/mtab
-       ln -s /proc/self/mounts /etc/mtab
-fi
-
-/usr/bin/systemd-machine-id-setup >/dev/null 2>&1 || :
-
-%{_sbindir}/ldconfig
-
-%postun -p %{_sbindir}/ldconfig
-%post devel -p %{_sbindir}/ldconfig
-%postun devel -p %{_sbindir}/ldconfig
-
+mkdir -p $RPM_BUILD_ROOT/usr/include
+cp $RPM_BUILD_ROOT/usr/share/doc/systemd/sd-daemon.h $RPM_BUILD_ROOT/usr/include
 
 %files
 %defattr(-,root,root,-)
-%manifest systemd.manifest
 /bin/systemctl
-%{_bindir}/*
-/run
-%config %{_libdir}/sysctl.d/coredump.conf
-%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf
-%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf
-%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf
-%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf
-%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf
-%attr(0644,root,root) %{_libdir}/udev/rules.d/70-uaccess.rules
-%attr(0644,root,root) %{_libdir}/udev/rules.d/71-seat.rules
-%attr(0644,root,root) %{_libdir}/udev/rules.d/73-seat-late.rules
-%config %{_sysconfdir}/systemd
-%config %{_sysconfdir}/xdg/systemd/user
-%config %{_sysconfdir}/bash_completion.d/systemd-bash-completion.sh
-%{_prefix}/%{_lib}/tmpfiles.d/*
-%{_libdir}/systemd
-/%{_libdir}/security/pam_systemd.so
-%{_libdir}/udev/rules.d/99-systemd.rules
-%{_libdir}/libsystemd-daemon.so.0
-%{_libdir}/libsystemd-daemon.so.0.0.1
-%{_libdir}/libsystemd-login.so.0
-%{_libdir}/libsystemd-login.so.0.2.0
-%{_libdir}/libsystemd-id128.so.0
-%{_libdir}/libsystemd-id128.so.0.0.2
-%{_libdir}/libsystemd-journal.so.0
-%{_libdir}/libsystemd-journal.so.0.0.2
-%{_datadir}/dbus-1/*/org.freedesktop.systemd1.*
-%{_defaultdocdir}/systemd
-%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy
-%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service
-%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml
-%{_mandir}/man1/*
-%{_mandir}/man3/*
-%{_mandir}/man5/*
-%{_mandir}/man7/*
-%{_mandir}/man8/*
-%exclude %{_libdir}/systemd/system/getty.target.wants/serial-getty@tty01.service
-%exclude %{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyMFD2.service
-%exclude %{_libdir}/systemd/system/getty.target.wants/serial-getty@ttySAC2.service
-%exclude %{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyO2.service
-%exclude %{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyS0.service
-%exclude %{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyS1.service
-%exclude %{_libdir}/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service
-%exclude %{_libdir}/systemd/user/default.target
-
-%files console-ttySAC2
-%defattr(-,root,root,-)
-%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttySAC2.service
-
-%files console-ttyMFD2
-%defattr(-,root,root,-)
-%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyMFD2.service
-
-%files console-ttyS0
-%defattr(-,root,root,-)
-%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyS0.service
-
-%files console-ttyS1
-%defattr(-,root,root,-)
-%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyS1.service
-
-%files console-tty01
-%defattr(-,root,root,-)
-%{_libdir}/systemd/system/getty.target.wants/serial-getty@tty01.service
+/bin/systemd
+/bin/systemd-ask-password
+/bin/systemd-machine-id-setup
+/bin/systemd-notify
+/bin/systemd-tmpfiles
+/bin/systemd-tty-ask-password-agent
+/etc/bash_completion.d/systemctl-bash-completion.sh
+/etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+/etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+/etc/systemd/system.conf
+/etc/systemd/system/getty.target.wants/serial-getty@serial_console.service
+/etc/systemd/system/multi-user.target.wants/remote-fs.target
+/etc/systemd/system/sysinit.target.wants/hwclock-load.service
+/etc/tmpfiles.d/systemd.conf
+/etc/tmpfiles.d/x11.conf
+/etc/xdg/systemd/user
+/lib/systemd/system*
+/lib/udev/rules.d/99-systemd.rules
+/usr/bin/systemd*
+/usr/share/dbus-1/interfaces/org.freedesktop.systemd1*
+/usr/share/dbus-1/services/org.freedesktop.systemd1.service
+/usr/share/dbus-1/system-services/org.freedesktop.hostname1.service
+/usr/share/dbus-1/system-services/org.freedesktop.systemd1.service
+%exclude /usr/share/doc/systemd/*
+/usr/include/sd-daemon.h
+/usr/lib/pkgconfig/libsystemd-daemon.pc
+/usr/share/pkgconfig/systemd.pc
+/usr/share/polkit-1/actions/org.freedesktop.hostname1.policy
+/usr/share/polkit-1/actions/org.freedesktop.systemd1.policy
+/usr/lib/systemd*
 
-%files console-ttyO2
-%defattr(-,root,root,-)
-%{_libdir}/systemd/system/getty.target.wants/serial-getty@ttyO2.service
-
-
-%files tools
-%defattr(-,root,root,-)
-%manifest systemd.manifest
-%{_bindir}/systemd-analyze
-
-%files devel
-%defattr(-,root,root,-)
-%manifest systemd.manifest
-%{_datadir}/pkgconfig/systemd.pc
-%{_includedir}/systemd/sd-daemon.h
-%{_includedir}/systemd/sd-login.h
-%{_includedir}/systemd/sd-id128.h
-%{_includedir}/systemd/sd-journal.h
-%{_includedir}/systemd/sd-messages.h
-%{_libdir}/libsystemd-daemon.so
-%{_libdir}/libsystemd-login.so
-%{_libdir}/libsystemd-journal.so
-%{_libdir}/libsystemd-id128.so
-%{_libdir}/pkgconfig/libsystemd-daemon.pc
-%{_libdir}/pkgconfig/libsystemd-login.pc
-%{_libdir}/pkgconfig/libsystemd-id128.pc
-%{_libdir}/pkgconfig/libsystemd-journal.pc
-%{_datadir}/systemd/kbd-model-map
-
-%files sysv
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_sbindir}/halt
-%{_sbindir}/init
-%{_sbindir}/poweroff
-%{_sbindir}/reboot
-%{_sbindir}/runlevel
-%{_sbindir}/shutdown
-%{_sbindir}/telinit
diff --git a/packaging/tizen-login-location.patch b/packaging/tizen-login-location.patch
deleted file mode 100644 (file)
index 4befbdf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 17860355fe8401140c15bfe207c3f925eb88db6c Mon Sep 17 00:00:00 2001
-From: William Douglas <william.douglas@intel.com>
-Date: Fri, 20 Apr 2012 14:25:58 -0700
-Subject: [PATCH 2/3] update login path for emergency in tizen distro
-
----
- units/emergency.service |    2 +-
- units/rescue.service.m4 |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/units/emergency.service b/units/emergency.service
-index 234bafc..b1afa68 100644
---- a/units/emergency.service
-+++ b/units/emergency.service
-@@ -18,7 +18,7 @@ Environment=HOME=/root
- WorkingDirectory=/root
- ExecStartPre=-/bin/plymouth quit
- ExecStartPre=-/bin/echo 'Welcome to emergency mode. Use "systemctl default" or ^D to activate default mode.'
--ExecStart=-/sbin/sulogin
-+ExecStart=-/bin/login
- ExecStopPost=/bin/systemctl --fail --no-block default
- StandardInput=tty-force
- StandardOutput=inherit
-diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
-index 7dd8a22..7f60aca 100644
---- a/units/rescue.service.m4
-+++ b/units/rescue.service.m4
-@@ -31,7 +31,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
- m4_ifdef(`TARGET_MEEGO',
- `EnvironmentFile=/etc/sysconfig/init
- ExecStart=-/bin/bash -c "exec ${SINGLE}"',
--`ExecStart=-/sbin/sulogin'))))
-+`ExecStart=-/bin/login'))))
- ExecStopPost=-/bin/systemctl --fail --no-block default
- StandardInput=tty-force
- StandardOutput=inherit
--- 
-1.7.10
-
diff --git a/packaging/tizen-service-file-workaround.patch b/packaging/tizen-service-file-workaround.patch
deleted file mode 100644 (file)
index 0703bcd..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 3a1ebb879b113370519e657aff3275c48ac50e7f Mon Sep 17 00:00:00 2001
-From: William Douglas <william.douglas@intel.com>
-Date: Fri, 20 Apr 2012 14:28:58 -0700
-Subject: [PATCH 3/3] update random-seed-load and tmpfile-setup services
-
----
- Makefile.am                               |    2 ++
- units/systemd-random-seed-load.service.in |    2 +-
- units/systemd-tmpfiles-clean.service.in   |    2 +-
- units/systemd-tmpfiles-setup.service.in   |    2 +-
- 4 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d24649e..045dbd9 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2433,6 +2433,8 @@ if TARGET_MEEGO
-       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f network.target && \
-+              $(LN_S) $(systemunitdir)/systemd-random-seed-load.service systemd-random-seed-load.service && \
-+              $(LN_S) $(systemunitdir)/systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
-               $(LN_S) $(systemunitdir)/network.target network.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
-               rm -f * )
-diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
-index a2b6a55..867fcd1 100644
---- a/units/systemd-random-seed-load.service.in
-+++ b/units/systemd-random-seed-load.service.in
-@@ -11,7 +11,7 @@ DefaultDependencies=no
- Wants=local-fs.target
- Conflicts=shutdown.target
- After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
--Before=sysinit.target shutdown.target
-+##Before=sysinit.target shutdown.target
- [Service]
- Type=oneshot
-diff --git a/units/systemd-tmpfiles-clean.service.in b/units/systemd-tmpfiles-clean.service.in
-index 3c8e72e..14cd18a 100644
---- a/units/systemd-tmpfiles-clean.service.in
-+++ b/units/systemd-tmpfiles-clean.service.in
-@@ -18,5 +18,5 @@ ConditionDirectoryNotEmpty=|/run/tmpfiles.d
- [Service]
- Type=oneshot
--ExecStart=@rootbindir@/systemd-tmpfiles --clean
-+ExecStart=@rootbindir@/systemd-tmpfiles --clean --remove
- IOSchedulingClass=idle
-diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in
-index f90121e..dec3f6d 100644
---- a/units/systemd-tmpfiles-setup.service.in
-+++ b/units/systemd-tmpfiles-setup.service.in
-@@ -10,7 +10,7 @@ Description=Recreate Volatile Files and Directories
- DefaultDependencies=no
- Wants=local-fs.target
- After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
--Before=sysinit.target shutdown.target
-+##Before=sysinit.target shutdown.target
- ConditionDirectoryNotEmpty=|/usr/lib/tmpfiles.d
- ConditionDirectoryNotEmpty=|/usr/local/lib/tmpfiles.d
- ConditionDirectoryNotEmpty=|/etc/tmpfiles.d
--- 
-1.7.10
-
diff --git a/pam_systemd_la_vala.stamp b/pam_systemd_la_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644 (file)
index 0000000..251edd4
--- /dev/null
@@ -0,0 +1,3 @@
+POTFILES
+Makefile.in.in
+.intltool-merge-cache
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644 (file)
index 5eb4fe8..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-#
-# This file may be copied and used freely without restrictions.  It may
-# be used in projects which are not available under a GNU Public License,
-# but which still want to provide support for the GNU gettext functionality.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-#
-# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-#
-# We have the following line for use by intltoolize:
-# INTLTOOL_MAKEFILE
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-datarootdir = @datarootdir@
-libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-subdir = po
-install_sh = @install_sh@
-# Automake >= 1.8 provides @mkdir_p@.
-# Until it can be supposed, use the safe fallback:
-mkdir_p = $(install_sh) -d
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-ALL_LINGUAS = @ALL_LINGUAS@
-
-PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
-USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
-DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
-EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
-
-POTFILES = \
-# This comment gets stripped out
-
-CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
-.SUFFIXES:
-.SUFFIXES: .po .pox .gmo .mo .msg .cat
-
-.po.pox:
-       $(MAKE) $(GETTEXT_PACKAGE).pot
-       $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-
-.po.mo:
-       $(MSGFMT) -o $@ $<
-
-.po.gmo:
-       file=`echo $* | sed 's,.*/,,'`.gmo \
-         && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-       sed -f ../intl/po2msg.sed < $< > $*.msg \
-         && rm -f $@ && gencat $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(GETTEXT_PACKAGE).pot: $(POTFILES)
-       $(GENPOT)
-
-install: install-data
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-       linguas="$(USE_LINGUAS)"; \
-       for lang in $$linguas; do \
-         dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-         $(mkdir_p) $$dir; \
-         if test -r $$lang.gmo; then \
-           $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-           echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-         else \
-           $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-           echo "installing $(srcdir)/$$lang.gmo as" \
-                "$$dir/$(GETTEXT_PACKAGE).mo"; \
-         fi; \
-         if test -r $$lang.gmo.m; then \
-           $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-           echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-         else \
-           if test -r $(srcdir)/$$lang.gmo.m ; then \
-             $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-               $$dir/$(GETTEXT_PACKAGE).mo.m; \
-             echo "installing $(srcdir)/$$lang.gmo.m as" \
-                  "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-           else \
-             true; \
-           fi; \
-         fi; \
-       done
-
-# Empty stubs to satisfy archaic automake needs
-dvi info ctags tags CTAGS TAGS ID:
-
-# Define this as empty until I found a useful application.
-install-exec installcheck:
-
-uninstall:
-       linguas="$(USE_LINGUAS)"; \
-       for lang in $$linguas; do \
-         rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-         rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-       done
-
-check: all $(GETTEXT_PACKAGE).pot
-       rm -f missing notexist
-       srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-       if [ -r missing -o -r notexist ]; then \
-         exit 1; \
-       fi
-
-mostlyclean:
-       rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-       rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-       rm -f Makefile Makefile.in POTFILES stamp-it
-       rm -f *.mo *.msg *.cat *.cat.m *.gmo
-
-maintainer-clean: distclean
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
-       rm -f Makefile.in.in
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: $(DISTFILES)
-       dists="$(DISTFILES)"; \
-       extra_dists="$(EXTRA_DISTFILES)"; \
-       for file in $$extra_dists; do \
-         test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-       done; \
-       for file in $$dists; do \
-         test -f $$file || file="$(srcdir)/$$file"; \
-         ln $$file $(distdir) 2> /dev/null \
-           || cp -p $$file $(distdir); \
-       done
-
-update-po: Makefile
-       $(MAKE) $(GETTEXT_PACKAGE).pot
-       tmpdir=`pwd`; \
-       linguas="$(USE_LINGUAS)"; \
-       for lang in $$linguas; do \
-         echo "$$lang:"; \
-         result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-         if $$result; then \
-           if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-             rm -f $$tmpdir/$$lang.new.po; \
-            else \
-             if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-               :; \
-             else \
-               echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-               rm -f $$tmpdir/$$lang.new.po; \
-               exit 1; \
-             fi; \
-           fi; \
-         else \
-           echo "msgmerge for $$lang.gmo failed!"; \
-           rm -f $$tmpdir/$$lang.new.po; \
-         fi; \
-       done
-
-Makefile POTFILES: stamp-it
-       @if test ! -f $@; then \
-         rm -f stamp-it; \
-         $(MAKE) stamp-it; \
-       fi
-
-stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-              $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
index ed2c308..29be44e 100644 (file)
@@ -1,4 +1,4 @@
-src/hostname/org.freedesktop.hostname1.policy.in
-src/locale/org.freedesktop.locale1.policy.in
-src/login/org.freedesktop.login1.policy.in
-src/timedate/org.freedesktop.timedate1.policy.in
+src/org.freedesktop.hostname1.policy.in
+src/org.freedesktop.locale1.policy.in
+src/org.freedesktop.login1.policy.in
+src/org.freedesktop.timedate1.policy.in
index 5a5d027..192f3b6 100644 (file)
@@ -11,9 +11,9 @@ src/dbus-swap.c
 src/dbus-target.c
 src/dbus-timer.c
 src/dbus-unit.c
-src/hostname/hostnamed.c
-src/locale/localed.c
+src/hostnamed.c
+src/localed.c
 src/org.freedesktop.systemd1.policy.in.in
-src/timedate/timedated.c
+src/timedated.c
 units/systemd-readahead-done.service.in
 units/user@.service.in
diff --git a/po/pl.po b/po/pl.po
new file mode 100644 (file)
index 0000000..3816864
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,166 @@
+# translation of pl.po to Polish
+# Piotr DrÄ…g <piotrdrag@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: systemd\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-22 15:43+0200\n"
+"PO-Revision-Date: 2011-08-22 15:45+0200\n"
+"Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
+"Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/org.freedesktop.hostname1.policy.in.h:1
+msgid "Authentication is required to set local machine information."
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby ustawić informacje o lokalnym komputerze."
+
+#: ../src/org.freedesktop.hostname1.policy.in.h:2
+msgid "Authentication is required to set the local host name."
+msgstr "Wymagane jest uwierzytelnienie, aby ustawić nazwÄ™ lokalnego komputera."
+
+#: ../src/org.freedesktop.hostname1.policy.in.h:3
+msgid ""
+"Authentication is required to set the statically configured local host name, "
+"as well as the pretty host name."
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby ustawić statycznie skonfigurowanÄ… nazwÄ™ "
+"lokalnego komputera, a także jego Å‚adnÄ… nazwÄ™."
+
+#: ../src/org.freedesktop.hostname1.policy.in.h:4
+msgid "Set host name"
+msgstr "Ustawienie nazwy komputera"
+
+#: ../src/org.freedesktop.hostname1.policy.in.h:5
+msgid "Set machine information"
+msgstr "Ustawienie informacji o komputerze"
+
+#: ../src/org.freedesktop.hostname1.policy.in.h:6
+msgid "Set static host name"
+msgstr "Ustawienie statycznej nazwy komputera"
+
+#: ../src/org.freedesktop.locale1.policy.in.h:1
+msgid "Authentication is required to set the system locale."
+msgstr "Wymagane jest uwierzytelnienie, aby ustawić lokalizacjÄ™ systemu."
+
+#: ../src/org.freedesktop.locale1.policy.in.h:2
+msgid "Set system locale"
+msgstr "Ustawienie lokalizacji systemu"
+
+#: ../src/org.freedesktop.login1.policy.in.h:1
+msgid "Allow attaching devices to seats"
+msgstr "Zezwolenie na podÅ‚Ä…czanie urzÄ…dzeÅ„ do stanowisk"
+
+#: ../src/org.freedesktop.login1.policy.in.h:2
+msgid "Allow non-logged-in users to run programs"
+msgstr "Zezwolenie niezalogowanym użytkownikom na uruchamianie programów"
+
+#: ../src/org.freedesktop.login1.policy.in.h:3
+msgid ""
+"Authentication is required to allow a non-logged-in user to run programs"
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby ustawić zezwolić niezalogowanym "
+"użytkownikom na uruchamianie programów"
+
+#: ../src/org.freedesktop.login1.policy.in.h:4
+msgid "Authentication is required to allow attaching a device to a seat"
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby zezwolić na podÅ‚Ä…czenie urzÄ…dzenia do "
+"stanowiska"
+
+#: ../src/org.freedesktop.login1.policy.in.h:5
+msgid "Authentication is required to allow powering off the system"
+msgstr "Wymagane jest uwierzytelnienie, aby zezwolić na wyÅ‚Ä…czanie systemu"
+
+#: ../src/org.freedesktop.login1.policy.in.h:6
+msgid ""
+"Authentication is required to allow powering off the system while other "
+"users are logged in"
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby zezwolić na wyÅ‚Ä…czanie systemu, kiedy sÄ… "
+"zalogowani inni użytkownicy"
+
+#: ../src/org.freedesktop.login1.policy.in.h:7
+msgid "Authentication is required to allow rebooting the system"
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby zezwolić na ponowne uruchamianie systemu"
+
+#: ../src/org.freedesktop.login1.policy.in.h:8
+msgid ""
+"Authentication is required to allow rebooting the system while other users "
+"are logged in"
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby zezwolić na ponowne uruchamianie "
+"systemu, kiedy sÄ… zalogowani inni użytkownicy"
+
+#: ../src/org.freedesktop.login1.policy.in.h:9
+msgid ""
+"Authentication is required to allow resetting how devices are attached to "
+"seats"
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby zezwolić na ponowne ustawianie sposobu "
+"podÅ‚Ä…czenia urzÄ…dzeÅ„ do stanowisk"
+
+#: ../src/org.freedesktop.login1.policy.in.h:10
+msgid "Flush device to seat attachments"
+msgstr "UsuniÄ™cie podÅ‚Ä…czenia urzÄ…dzeÅ„ do stanowisk"
+
+#: ../src/org.freedesktop.login1.policy.in.h:11
+msgid "Power off the system"
+msgstr "WyÅ‚Ä…czenie systemu"
+
+#: ../src/org.freedesktop.login1.policy.in.h:12
+msgid "Power off the system when other users are logged in"
+msgstr "WyÅ‚Ä…czenie systemu, kiedy sÄ… zalogowani inni użytkownicy"
+
+#: ../src/org.freedesktop.login1.policy.in.h:13
+msgid "Reboot the system"
+msgstr "Ponowne uruchomienie systemu"
+
+#: ../src/org.freedesktop.login1.policy.in.h:14
+msgid "Reboot the system when other users are logged in"
+msgstr "Ponowne uruchomienie systemu, kiedy sÄ… zalogowani inni użytkownicy"
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:1
+msgid ""
+"Authentication is required to control whether network time synchronization "
+"shall be enabled."
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby kontrolować, czy wÅ‚Ä…czyć synchronizacjÄ™ "
+"czasu przez sieć."
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:2
+msgid ""
+"Authentication is required to control whether the RTC stores the local or "
+"UTC time."
+msgstr ""
+"Wymagane jest uwierzytelnienie, aby kontrolować, czy RTC przechowuje czas "
+"lokalny lub czas UTC."
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:3
+msgid "Authentication is required to set the system time."
+msgstr "Wymagane jest uwierzytelnienie, aby ustawić czas systemu."
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:4
+msgid "Authentication is required to set the system timezone."
+msgstr "Wymagane jest uwierzytelnienie, aby ustawić strefÄ™ czasowÄ… systemu."
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:5
+msgid "Set RTC to local timezone or UTC"
+msgstr "Ustawienie RTC na lokalnÄ… strefÄ™ czasowÄ… lub strefÄ™ UTC"
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:6
+msgid "Set system time"
+msgstr "Ustawienie czasu systemu"
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:7
+msgid "Set system timezone"
+msgstr "Ustawienie strefy czasowej systemu"
+
+#: ../src/org.freedesktop.timedate1.policy.in.h:8
+msgid "Turn network time synchronization on or off"
+msgstr "WÅ‚Ä…czenie lub wyÅ‚Ä…czenie synchronizacji czasu przez sieć"
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644 (file)
index 0000000..cafff82
--- /dev/null
@@ -0,0 +1,15 @@
+load-fragment-gperf-nulstr.c
+load-fragment-gperf.c
+load-fragment-gperf.gperf
+logind-gperf.c
+org.freedesktop.systemd1.policy.in
+99-systemd.rules
+org.freedesktop.hostname1.policy
+org.freedesktop.locale1.policy
+org.freedesktop.login1.policy
+org.freedesktop.timedate1.policy
+org.freedesktop.systemd1.policy
+gnome-ask-password-agent.c
+systemd-interfaces.c
+systemadm.c
+73-seat-late.rules
similarity index 100%
rename from src/login/71-seat.rules
rename to src/71-seat.rules
index d306f71..913373b 100644 (file)
@@ -8,7 +8,7 @@
 ACTION=="remove", GOTO="systemd_end"
 
 SUBSYSTEM=="tty", KERNEL=="tty[0-9]|tty1[0-2]", TAG+="systemd"
-SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd"
+SUBSYSTEM=="tty", KERNEL=="tty[aS][0-9]*", TAG+="systemd"
 
 KERNEL=="vport*", TAG+="systemd"
 
@@ -44,7 +44,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:
 
 # Apply sysctl variables to network devices (and only to those) as they appear.
 
-SUBSYSTEM=="net", KERNEL!="lo", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
+SUBSYSTEM=="net", RUN+="@rootlibexecdir@/systemd-sysctl --prefix=/proc/sys/net/ipv4/conf/$name --prefix=/proc/sys/net/ipv4/neigh/$name --prefix=/proc/sys/net/ipv6/conf/$name --prefix=/proc/sys/net/ipv6/neigh/$name"
 
 # Asynchronously mount file systems implemented by these modules as
 # soon as they are loaded.
diff --git a/src/Makefile b/src/Makefile
new file mode 100644 (file)
index 0000000..bc7e9fa
--- /dev/null
@@ -0,0 +1,28 @@
+#  This file is part of systemd.
+#
+#  Copyright 2010 Lennart Poettering
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+# This file is a dirty trick to simplify compilation from within
+# emacs. This file is not intended to be distributed. So, don't touch
+# it, even better ignore it!
+
+all:
+       $(MAKE) -C ..
+
+clean:
+       $(MAKE) -C .. clean
+
+.PHONY: all clean
diff --git a/src/acl-util.c b/src/acl-util.c
deleted file mode 100644 (file)
index a2a9f9a..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <assert.h>
-#include <sys/acl.h>
-#include <acl/libacl.h>
-#include <errno.h>
-#include <stdbool.h>
-
-#include "acl-util.h"
-
-int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
-        acl_entry_t i;
-        int found;
-
-        assert(acl);
-        assert(entry);
-
-        for (found = acl_get_entry(acl, ACL_FIRST_ENTRY, &i);
-             found > 0;
-             found = acl_get_entry(acl, ACL_NEXT_ENTRY, &i)) {
-
-                acl_tag_t tag;
-                uid_t *u;
-                bool b;
-
-                if (acl_get_tag_type(i, &tag) < 0)
-                        return -errno;
-
-                if (tag != ACL_USER)
-                        continue;
-
-                u = acl_get_qualifier(i);
-                if (!u)
-                        return -errno;
-
-                b = *u == uid;
-                acl_free(u);
-
-                if (b) {
-                        *entry = i;
-                        return 1;
-                }
-        }
-
-        if (found < 0)
-                return -errno;
-
-        return 0;
-}
diff --git a/src/acl-util.h b/src/acl-util.h
deleted file mode 100644 (file)
index 798ce43..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef fooaclutilhfoo
-#define fooaclutilhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
-
-#endif
index ce2f3cb..f57105c 100644 (file)
@@ -89,10 +89,10 @@ int ask_password_tty(
                         goto finish;
                 }
 
-                loop_write(ttyfd, ANSI_HIGHLIGHT_ON, sizeof(ANSI_HIGHLIGHT_ON)-1, false);
+                loop_write(ttyfd, "\x1B[1m", 4, false);
                 loop_write(ttyfd, message, strlen(message), false);
                 loop_write(ttyfd, " ", 1, false);
-                loop_write(ttyfd, ANSI_HIGHLIGHT_OFF, sizeof(ANSI_HIGHLIGHT_OFF)-1, false);
+                loop_write(ttyfd, "\x1B[0m", 4, false);
 
                 new_termios = old_termios;
                 new_termios.c_lflag &= ~(ICANON|ECHO);
index cf2fb60..29b807d 100644 (file)
@@ -52,14 +52,14 @@ static void automount_init(Unit *u) {
         Automount *a = AUTOMOUNT(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         a->pipe_watch.fd = a->pipe_fd = -1;
         a->pipe_watch.type = WATCH_INVALID;
 
         a->directory_mode = 0755;
 
-        UNIT(a)->ignore_on_isolate = true;
+        a->meta.ignore_on_isolate = true;
 }
 
 static void repeat_unmout(const char *path) {
@@ -94,8 +94,8 @@ static void unmount_autofs(Automount *a) {
         /* If we reload/reexecute things we keep the mount point
          * around */
         if (a->where &&
-            (UNIT(a)->manager->exit_code != MANAGER_RELOAD &&
-             UNIT(a)->manager->exit_code != MANAGER_REEXECUTE))
+            (a->meta.manager->exit_code != MANAGER_RELOAD &&
+             a->meta.manager->exit_code != MANAGER_REEXECUTE))
                 repeat_unmout(a->where);
 }
 
@@ -105,7 +105,7 @@ static void automount_done(Unit *u) {
         assert(a);
 
         unmount_autofs(a);
-        unit_ref_unset(&a->mount);
+        a->mount = NULL;
 
         free(a->where);
         a->where = NULL;
@@ -120,8 +120,8 @@ int automount_add_one_mount_link(Automount *a, Mount *m) {
         assert(a);
         assert(m);
 
-        if (UNIT(a)->load_state != UNIT_LOADED ||
-            UNIT(m)->load_state != UNIT_LOADED)
+        if (a->meta.load_state != UNIT_LOADED ||
+            m->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!path_startswith(a->where, m->where))
@@ -137,13 +137,13 @@ int automount_add_one_mount_link(Automount *a, Mount *m) {
 }
 
 static int automount_add_mount_links(Automount *a) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(a);
 
-        LIST_FOREACH(units_by_type, other, UNIT(a)->manager->units_by_type[UNIT_MOUNT])
-                if ((r = automount_add_one_mount_link(a, MOUNT(other))) < 0)
+        LIST_FOREACH(units_by_type, other, a->meta.manager->units_by_type[UNIT_MOUNT])
+                if ((r = automount_add_one_mount_link(a, (Mount*) other)) < 0)
                         return r;
 
         return 0;
@@ -154,7 +154,7 @@ static int automount_add_default_dependencies(Automount *a) {
 
         assert(a);
 
-        if (UNIT(a)->manager->running_as == MANAGER_SYSTEM) {
+        if (a->meta.manager->running_as == MANAGER_SYSTEM) {
 
                 if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
                         return r;
@@ -171,7 +171,7 @@ static int automount_verify(Automount *a) {
         char *e;
         assert(a);
 
-        if (UNIT(a)->load_state != UNIT_LOADED)
+        if (a->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (path_equal(a->where, "/")) {
@@ -186,7 +186,7 @@ static int automount_verify(Automount *a) {
         free(e);
 
         if (!b) {
-                log_error("%s's Where setting doesn't match unit name. Refusing.", UNIT(a)->id);
+                log_error("%s's Where setting doesn't match unit name. Refusing.", a->meta.id);
                 return -EINVAL;
         }
 
@@ -198,17 +198,16 @@ static int automount_load(Unit *u) {
         Automount *a = AUTOMOUNT(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         /* Load a .automount file */
         if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
                 return r;
 
-        if (u->load_state == UNIT_LOADED) {
-                Unit *x;
+        if (u->meta.load_state == UNIT_LOADED) {
 
                 if (!a->where)
-                        if (!(a->where = unit_name_to_path(u->id)))
+                        if (!(a->where = unit_name_to_path(u->meta.id)))
                                 return -ENOMEM;
 
                 path_kill_slashes(a->where);
@@ -216,17 +215,13 @@ static int automount_load(Unit *u) {
                 if ((r = automount_add_mount_links(a)) < 0)
                         return r;
 
-                r = unit_load_related_unit(u, ".mount", &x);
-                if (r < 0)
+                if ((r = unit_load_related_unit(u, ".mount", (Unit**) &a->mount)) < 0)
                         return r;
 
-                unit_ref_set(&a->mount, x);
-
-                r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(a->mount), true);
-                if (r < 0)
+                if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0)
                         return r;
 
-                if (UNIT(a)->default_dependencies)
+                if (a->meta.default_dependencies)
                         if ((r = automount_add_default_dependencies(a)) < 0)
                                 return r;
         }
@@ -247,7 +242,7 @@ static void automount_set_state(Automount *a, AutomountState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(a)->id,
+                          a->meta.id,
                           automount_state_to_string(old_state),
                           automount_state_to_string(state));
 
@@ -263,7 +258,7 @@ static int automount_coldplug(Unit *u) {
 
         if (a->deserialized_state != a->state) {
 
-                if ((r = open_dev_autofs(u->manager)) < 0)
+                if ((r = open_dev_autofs(u->meta.manager)) < 0)
                         return r;
 
                 if (a->deserialized_state == AUTOMOUNT_WAITING ||
@@ -288,22 +283,20 @@ static void automount_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sAutomount State: %s\n"
-                "%sResult: %s\n"
                 "%sWhere: %s\n"
                 "%sDirectoryMode: %04o\n",
                 prefix, automount_state_to_string(a->state),
-                prefix, automount_result_to_string(a->result),
                 prefix, a->where,
                 prefix, a->directory_mode);
 }
 
-static void automount_enter_dead(Automount *a, AutomountResult f) {
+static void automount_enter_dead(Automount *a, bool success) {
         assert(a);
 
-        if (f != AUTOMOUNT_SUCCESS)
-                a->result = f;
+        if (!success)
+                a->failure = true;
 
-        automount_set_state(a, a->result != AUTOMOUNT_SUCCESS ? AUTOMOUNT_FAILED : AUTOMOUNT_DEAD);
+        automount_set_state(a, a->failure ? AUTOMOUNT_FAILED : AUTOMOUNT_DEAD);
 }
 
 static int open_dev_autofs(Manager *m) {
@@ -444,7 +437,7 @@ int automount_send_ready(Automount *a, int status) {
         if (set_isempty(a->tokens))
                 return 0;
 
-        if ((ioctl_fd = open_ioctl_fd(UNIT(a)->manager->dev_autofs_fd, a->where, a->dev_id)) < 0) {
+        if ((ioctl_fd = open_ioctl_fd(a->meta.manager->dev_autofs_fd, a->where, a->dev_id)) < 0) {
                 r = ioctl_fd;
                 goto fail;
         }
@@ -465,7 +458,7 @@ int automount_send_ready(Automount *a, int status) {
                  * if you pass a positive status code here, the kernel will
                  * freeze! Yay! */
 
-                if ((k = autofs_send_ready(UNIT(a)->manager->dev_autofs_fd,
+                if ((k = autofs_send_ready(a->meta.manager->dev_autofs_fd,
                                            ioctl_fd,
                                            token,
                                            status)) < 0)
@@ -493,7 +486,7 @@ static void automount_enter_waiting(Automount *a) {
         if (a->tokens)
                 set_clear(a->tokens);
 
-        if ((dev_autofs_fd = open_dev_autofs(UNIT(a)->manager)) < 0) {
+        if ((dev_autofs_fd = open_dev_autofs(a->meta.manager)) < 0) {
                 r = dev_autofs_fd;
                 goto fail;
         }
@@ -567,7 +560,7 @@ fail:
                 repeat_unmout(a->where);
 
         log_error("Failed to initialize automounter: %s", strerror(-r));
-        automount_enter_dead(a, AUTOMOUNT_FAILURE_RESOURCES);
+        automount_enter_dead(a, false);
 }
 
 static void automount_enter_runnning(Automount *a) {
@@ -576,14 +569,14 @@ static void automount_enter_runnning(Automount *a) {
         DBusError error;
 
         assert(a);
-        assert(UNIT_DEREF(a->mount));
+        assert(a->mount);
 
         dbus_error_init(&error);
 
         /* We don't take mount requests anymore if we are supposed to
          * shut down anyway */
         if (unit_pending_inactive(UNIT(a))) {
-                log_debug("Suppressing automount request on %s since unit stop is scheduled.", UNIT(a)->id);
+                log_debug("Suppressing automount request on %s since unit stop is scheduled.", a->meta.id);
                 automount_send_ready(a, -EHOSTDOWN);
                 return;
         }
@@ -592,14 +585,14 @@ static void automount_enter_runnning(Automount *a) {
 
         /* Before we do anything, let's see if somebody is playing games with us? */
         if (lstat(a->where, &st) < 0) {
-                log_warning("%s failed to stat automount point: %m", UNIT(a)->id);
+                log_warning("%s failed to stat automount point: %m", a->meta.id);
                 goto fail;
         }
 
         if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id)
-                log_info("%s's automount point already active?", UNIT(a)->id);
-        else if ((r = manager_add_job(UNIT(a)->manager, JOB_START, UNIT_DEREF(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) {
-                log_warning("%s failed to queue mount startup job: %s", UNIT(a)->id, bus_error(&error, r));
+                log_info("%s's automount point already active?", a->meta.id);
+        else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) {
+                log_warning("%s failed to queue mount startup job: %s", a->meta.id, bus_error(&error, r));
                 goto fail;
         }
 
@@ -607,7 +600,7 @@ static void automount_enter_runnning(Automount *a) {
         return;
 
 fail:
-        automount_enter_dead(a, AUTOMOUNT_FAILURE_RESOURCES);
+        automount_enter_dead(a, false);
         dbus_error_free(&error);
 }
 
@@ -619,14 +612,14 @@ static int automount_start(Unit *u) {
         assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
 
         if (path_is_mount_point(a->where, false)) {
-                log_error("Path %s is already a mount point, refusing start for %s", a->where, u->id);
+                log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id);
                 return -EEXIST;
         }
 
-        if (UNIT_DEREF(a->mount)->load_state != UNIT_LOADED)
+        if (a->mount->meta.load_state != UNIT_LOADED)
                 return -ENOENT;
 
-        a->result = AUTOMOUNT_SUCCESS;
+        a->failure = false;
         automount_enter_waiting(a);
         return 0;
 }
@@ -638,7 +631,7 @@ static int automount_stop(Unit *u) {
 
         assert(a->state == AUTOMOUNT_WAITING || a->state == AUTOMOUNT_RUNNING);
 
-        automount_enter_dead(a, AUTOMOUNT_SUCCESS);
+        automount_enter_dead(a, true);
         return 0;
 }
 
@@ -652,7 +645,7 @@ static int automount_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", automount_state_to_string(a->state));
-        unit_serialize_item(u, f, "result", automount_result_to_string(a->result));
+        unit_serialize_item(u, f, "failure", yes_no(a->failure));
         unit_serialize_item_format(u, f, "dev-id", "%u", (unsigned) a->dev_id);
 
         SET_FOREACH(p, a->tokens, i)
@@ -684,15 +677,13 @@ static int automount_deserialize_item(Unit *u, const char *key, const char *valu
                         log_debug("Failed to parse state value %s", value);
                 else
                         a->deserialized_state = state;
-        } else if (streq(key, "result")) {
-                AutomountResult f;
-
-                f = automount_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != AUTOMOUNT_SUCCESS)
-                        a->result = f;
+        } else if (streq(key, "failure")) {
+                int b;
 
+                if ((b = parse_boolean(value)) < 0)
+                        log_debug("Failed to parse failure value %s", value);
+                else
+                        a->failure = b || a->failure;
         } else if (streq(key, "dev-id")) {
                 unsigned d;
 
@@ -747,10 +738,10 @@ static bool automount_check_gc(Unit *u) {
 
         assert(a);
 
-        if (!UNIT_DEREF(a->mount))
+        if (!a->mount)
                 return false;
 
-        return UNIT_VTABLE(UNIT_DEREF(a->mount))->check_gc(UNIT_DEREF(a->mount));
+        return UNIT_VTABLE(UNIT(a->mount))->check_gc(UNIT(a->mount));
 }
 
 static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
@@ -779,7 +770,7 @@ static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
                 if (packet.v5_packet.pid > 0) {
                         char *p = NULL;
 
-                        get_process_comm(packet.v5_packet.pid, &p);
+                        get_process_name(packet.v5_packet.pid, &p);
                         log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
                         free(p);
 
@@ -808,7 +799,7 @@ static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         return;
 
 fail:
-        automount_enter_dead(a, AUTOMOUNT_FAILURE_RESOURCES);
+        automount_enter_dead(a, false);
 }
 
 static void automount_shutdown(Manager *m) {
@@ -826,7 +817,7 @@ static void automount_reset_failed(Unit *u) {
         if (a->state == AUTOMOUNT_FAILED)
                 automount_set_state(a, AUTOMOUNT_DEAD);
 
-        a->result = AUTOMOUNT_SUCCESS;
+        a->failure = false;
 }
 
 static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = {
@@ -838,16 +829,8 @@ static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState);
 
-static const char* const automount_result_table[_AUTOMOUNT_RESULT_MAX] = {
-        [AUTOMOUNT_SUCCESS] = "success",
-        [AUTOMOUNT_FAILURE_RESOURCES] = "resources"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(automount_result, AutomountResult);
-
 const UnitVTable automount_vtable = {
         .suffix = ".automount",
-        .object_size = sizeof(Automount),
         .sections =
                 "Unit\0"
                 "Automount\0"
@@ -881,7 +864,6 @@ const UnitVTable automount_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Automount",
         .bus_message_handler = bus_automount_message_handler,
-        .bus_invalidating_properties = bus_automount_invalidating_properties,
 
         .shutdown = automount_shutdown
 };
index 19baee2..1a6cc98 100644 (file)
@@ -35,30 +35,24 @@ typedef enum AutomountState {
         _AUTOMOUNT_STATE_INVALID = -1
 } AutomountState;
 
-typedef enum AutomountResult {
-        AUTOMOUNT_SUCCESS,
-        AUTOMOUNT_FAILURE_RESOURCES,
-        _AUTOMOUNT_RESULT_MAX,
-        _AUTOMOUNT_RESULT_INVALID = -1
-} AutomountResult;
-
 struct Automount {
-        Unit meta;
+        Meta meta;
 
         AutomountState state, deserialized_state;
 
         char *where;
 
-        UnitRef mount;
+        Mount *mount;
 
         int pipe_fd;
         mode_t directory_mode;
         Watch pipe_watch;
         dev_t dev_id;
 
+
         Set *tokens;
 
-        AutomountResult result;
+        bool failure:1;
 };
 
 extern const UnitVTable automount_vtable;
@@ -70,7 +64,4 @@ int automount_add_one_mount_link(Automount *a, Mount *m);
 const char* automount_state_to_string(AutomountState i);
 AutomountState automount_state_from_string(const char *s);
 
-const char* automount_result_to_string(AutomountResult i);
-AutomountResult automount_result_from_string(const char *s);
-
 #endif
similarity index 100%
rename from src/binfmt/binfmt.c
rename to src/binfmt.c
index 1f7cf3a..878856c 100644 (file)
@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
index d5417f9..20d6531 100644 (file)
 #include "pager.h"
 
 static bool arg_no_pager = false;
-static bool arg_kernel_threads = false;
 
 static void help(void) {
 
         printf("%s [OPTIONS...] [CGROUP...]\n\n"
                "Recursively show control group contents.\n\n"
                "  -h --help           Show this help\n"
-               "     --no-pager       Do not pipe output into a pager\n"
-               "  -k                  Include kernel threads in output\n",
+               "     --no-pager       Do not pipe output into a pager\n",
                program_invocation_short_name);
 }
 
@@ -62,7 +60,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 1);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hk", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -74,10 +72,6 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_pager = true;
                         break;
 
-                case 'k':
-                        arg_kernel_threads = true;
-                        break;
-
                 case '?':
                         return -EINVAL;
 
@@ -96,8 +90,7 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
-        r = parse_argv(argc, argv);
-        if (r < 0)
+        if ((r = parse_argv(argc, argv)) < 0)
                 goto finish;
         else if (r == 0) {
                 retval = EXIT_SUCCESS;
@@ -114,29 +107,26 @@ int main(int argc, char *argv[]) {
                         int q;
                         printf("%s:\n", argv[i]);
 
-                        q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads);
-                        if (q < 0)
+                        if ((q = show_cgroup_by_path(argv[i], NULL, 0)) < 0)
                                 r = q;
                 }
 
         } else {
                 char *p;
 
-                p = get_current_dir_name();
-                if (!p) {
+                if (!(p = get_current_dir_name())) {
                         log_error("Cannot determine current working directory: %m");
                         goto finish;
                 }
 
                 if (path_startswith(p, "/sys/fs/cgroup")) {
                         printf("Working Directory %s:\n", p);
-                        r = show_cgroup_by_path(p, NULL, 0, arg_kernel_threads);
+                        r = show_cgroup_by_path(p, NULL, 0);
                 } else {
                         char *root = NULL;
                         const char *t = NULL;
 
-                        r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
-                        if (r < 0)
+                        if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root)) < 0)
                                 t = "/";
                         else {
                                 if (endswith(root, "/system"))
@@ -145,7 +135,7 @@ int main(int argc, char *argv[]) {
                                 t = root[0] ? root : "/";
                         }
 
-                        r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0, arg_kernel_threads);
+                        r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0);
                         free(root);
                 }
 
index ee2a241..bc9c216 100644 (file)
@@ -50,7 +50,7 @@ static unsigned ilog10(unsigned long ul) {
         return n;
 }
 
-static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more, bool kernel_threads) {
+static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigned n_columns, bool more) {
         char *fn;
         FILE *f;
         size_t n = 0, n_allocated = 0;
@@ -82,9 +82,6 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
 
         while ((r = cg_read_pid(f, &pid)) > 0) {
 
-                if (!kernel_threads && is_kernel_thread(pid) > 0)
-                        continue;
-
                 if (n >= n_allocated) {
                         pid_t *npids;
 
@@ -136,7 +133,7 @@ static int show_cgroup_one_by_path(const char *path, const char *prefix, unsigne
                 for (i = 0; i < n; i++) {
                         char *t = NULL;
 
-                        get_process_cmdline(pids[i], n_columns, true, &t);
+                        get_process_cmdline(pids[i], n_columns, &t);
 
                         printf("%s%s %*lu %s\n",
                                prefix,
@@ -160,7 +157,7 @@ finish:
         return r;
 }
 
-int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns, bool kernel_threads) {
+int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns) {
         DIR *d;
         char *last = NULL;
         char *p1 = NULL, *p2 = NULL, *fn = NULL, *gn = NULL;
@@ -184,7 +181,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
         while ((r = cg_read_subgroup(d, &gn)) > 0) {
 
                 if (!shown_pids) {
-                        show_cgroup_one_by_path(path, prefix, n_columns, true, kernel_threads);
+                        show_cgroup_one_by_path(path, prefix, n_columns, true);
                         shown_pids = true;
                 }
 
@@ -197,7 +194,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
                                         goto finish;
                                 }
 
-                        show_cgroup_by_path(last, p1, n_columns-2, kernel_threads);
+                        show_cgroup_by_path(last, p1, n_columns-2);
 
                         free(last);
                         last = NULL;
@@ -216,7 +213,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
                 goto finish;
 
         if (!shown_pids)
-                show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads);
+                show_cgroup_one_by_path(path, prefix, n_columns, !!last);
 
         if (last) {
                 printf("%s\342\224\224 %s\n", prefix, file_name_from_path(last));
@@ -227,7 +224,7 @@ int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
                                 goto finish;
                         }
 
-                show_cgroup_by_path(last, p2, n_columns-2, kernel_threads);
+                show_cgroup_by_path(last, p2, n_columns-2);
         }
 
         r = 0;
@@ -243,18 +240,17 @@ finish:
         return r;
 }
 
-int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns, bool kernel_threads) {
+int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned n_columns) {
         char *p;
         int r;
 
         assert(controller);
         assert(path);
 
-        r = cg_get_path(controller, path, NULL, &p);
-        if (r < 0)
+        if ((r = cg_get_path(controller, path, NULL, &p)) < 0)
                 return r;
 
-        r = show_cgroup_by_path(p, prefix, n_columns, kernel_threads);
+        r = show_cgroup_by_path(p, prefix, n_columns);
         free(p);
 
         return r;
index 992e17b..ae5b13b 100644 (file)
@@ -22,9 +22,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <stdbool.h>
-
-int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, bool kernel_threads);
-int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns, bool kernel_threads);
+int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns);
+int show_cgroup(const char *controller, const char *path, const char *prefix, unsigned columns);
 
 #endif
index 904d300..f74280f 100644 (file)
@@ -173,7 +173,7 @@ int cg_rmdir(const char *controller, const char *path, bool honour_sticky) {
                         return -ENOMEM;
                 }
 
-                r = file_is_priv_sticky(tasks);
+                r = file_is_sticky(tasks);
                 free(tasks);
 
                 if (r > 0) {
@@ -571,7 +571,7 @@ static int trim_cb(const char *path, const struct stat *sb, int typeflag, struct
                 return 1;
         }
 
-        is_sticky = file_is_priv_sticky(p) > 0;
+        is_sticky = file_is_sticky(p) > 0;
         free(p);
 
         if (is_sticky)
@@ -606,7 +606,7 @@ int cg_trim(const char *controller, const char *path, bool delete_root) {
                         return -ENOMEM;
                 }
 
-                is_sticky = file_is_priv_sticky(p) > 0;
+                is_sticky = file_is_sticky(p) > 0;
                 free(p);
 
                 if (!is_sticky)
@@ -712,11 +712,7 @@ int cg_set_group_access(const char *controller, const char *path, mode_t mode, u
         assert(controller);
         assert(path);
 
-        if (mode != (mode_t) -1)
-                mode &= 0777;
-
-        r = cg_get_path(controller, path, NULL, &fs);
-        if (r < 0)
+        if ((r = cg_get_path(controller, path, NULL, &fs)) < 0)
                 return r;
 
         r = chmod_and_chown(fs, mode, uid, gid);
@@ -725,47 +721,16 @@ int cg_set_group_access(const char *controller, const char *path, mode_t mode, u
         return r;
 }
 
-int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid, int sticky) {
+int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid) {
         char *fs;
         int r;
 
         assert(controller);
         assert(path);
 
-        if (mode == (mode_t) -1 && uid == (uid_t) -1 && gid == (gid_t) -1 && sticky < 0)
-                return 0;
-
-        if (mode != (mode_t) -1)
-                mode &= 0666;
-
-        r = cg_get_path(controller, path, "tasks", &fs);
-        if (r < 0)
+        if ((r = cg_get_path(controller, path, "tasks", &fs)) < 0)
                 return r;
 
-        if (sticky >= 0 && mode != (mode_t) -1)
-                /* Both mode and sticky param are passed */
-                mode |= (sticky ? S_ISVTX : 0);
-        else if ((sticky >= 0 && mode == (mode_t) -1) ||
-                 (mode != (mode_t) -1 && sticky < 0)) {
-                struct stat st;
-
-                /* Only one param is passed, hence read the current
-                 * mode from the file itself */
-
-                r = lstat(fs, &st);
-                if (r < 0) {
-                        free(fs);
-                        return -errno;
-                }
-
-                if (mode == (mode_t) -1)
-                        /* No mode set, we just shall set the sticky bit */
-                        mode = (st.st_mode & ~S_ISVTX) | (sticky ? S_ISVTX : 0);
-                else
-                        /* Only mode set, leave sticky bit untouched */
-                        mode = (st.st_mode & ~0777) | mode;
-        }
-
         r = chmod_and_chown(fs, mode, uid, gid);
         free(fs);
 
index 37e4255..f09373b 100644 (file)
@@ -60,7 +60,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid);
 int cg_create_and_attach(const char *controller, const char *path, pid_t pid);
 
 int cg_set_group_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
-int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid, int sticky);
+int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
 
 int cg_install_release_agent(const char *controller, const char *agent);
 
index 1f6139e..dcf2c2f 100644 (file)
@@ -38,6 +38,9 @@ int cgroup_bonding_realize(CGroupBonding *b) {
         assert(b->path);
         assert(b->controller);
 
+        if (b->realized)
+                return 0;
+
         r = cg_create(b->controller, b->path);
         if (r < 0) {
                 log_warning("Failed to create cgroup %s:%s: %s", b->controller, b->path, strerror(-r));
@@ -60,27 +63,32 @@ int cgroup_bonding_realize_list(CGroupBonding *first) {
         return 0;
 }
 
-void cgroup_bonding_free(CGroupBonding *b, bool trim) {
+void cgroup_bonding_free(CGroupBonding *b, bool remove_or_trim) {
         assert(b);
 
         if (b->unit) {
                 CGroupBonding *f;
 
-                LIST_REMOVE(CGroupBonding, by_unit, b->unit->cgroup_bondings, b);
+                LIST_REMOVE(CGroupBonding, by_unit, b->unit->meta.cgroup_bondings, b);
 
                 if (streq(b->controller, SYSTEMD_CGROUP_CONTROLLER)) {
-                        assert_se(f = hashmap_get(b->unit->manager->cgroup_bondings, b->path));
+                        assert_se(f = hashmap_get(b->unit->meta.manager->cgroup_bondings, b->path));
                         LIST_REMOVE(CGroupBonding, by_path, f, b);
 
                         if (f)
-                                hashmap_replace(b->unit->manager->cgroup_bondings, b->path, f);
+                                hashmap_replace(b->unit->meta.manager->cgroup_bondings, b->path, f);
                         else
-                                hashmap_remove(b->unit->manager->cgroup_bondings, b->path);
+                                hashmap_remove(b->unit->meta.manager->cgroup_bondings, b->path);
                 }
         }
 
-        if (b->realized && b->ours && trim)
-                cg_trim(b->controller, b->path, false);
+        if (b->realized && b->ours && remove_or_trim) {
+
+                if (cgroup_bonding_is_empty(b) > 0)
+                        cg_delete(b->controller, b->path);
+                else
+                        cg_trim(b->controller, b->path, false);
+        }
 
         free(b->controller);
         free(b->path);
@@ -154,21 +162,21 @@ int cgroup_bonding_set_group_access_list(CGroupBonding *first, mode_t mode, uid_
         return 0;
 }
 
-int cgroup_bonding_set_task_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid, int sticky) {
+int cgroup_bonding_set_task_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid) {
         assert(b);
 
         if (!b->realized)
                 return -EINVAL;
 
-        return cg_set_task_access(b->controller, b->path, mode, uid, gid, sticky);
+        return cg_set_task_access(b->controller, b->path, mode, uid, gid);
 }
 
-int cgroup_bonding_set_task_access_list(CGroupBonding *first, mode_t mode, uid_t uid, gid_t gid, int sticky) {
+int cgroup_bonding_set_task_access_list(CGroupBonding *first, mode_t mode, uid_t uid, gid_t gid) {
         CGroupBonding *b;
         int r;
 
         LIST_FOREACH(by_unit, b, first) {
-                r = cgroup_bonding_set_task_access(b, mode, uid, gid, sticky);
+                r = cgroup_bonding_set_task_access(b, mode, uid, gid);
                 if (r < 0)
                         return r;
         }
@@ -192,9 +200,6 @@ int cgroup_bonding_kill_list(CGroupBonding *first, int sig, bool sigcont, Set *s
         Set *allocated_set = NULL;
         int ret = -EAGAIN, r;
 
-        if (!first)
-                return 0;
-
         if (!s)
                 if (!(s = allocated_set = set_new(trivial_hash_func, trivial_compare_func)))
                         return -ENOMEM;
@@ -355,55 +360,14 @@ void manager_shutdown_cgroup(Manager *m, bool delete) {
         m->cgroup_hierarchy = NULL;
 }
 
-int cgroup_bonding_get(Manager *m, const char *cgroup, CGroupBonding **bonding) {
-        CGroupBonding *b;
-        char *p;
-
-        assert(m);
-        assert(cgroup);
-        assert(bonding);
-
-        b = hashmap_get(m->cgroup_bondings, cgroup);
-        if (b) {
-                *bonding = b;
-                return 1;
-        }
-
-        p = strdup(cgroup);
-        if (!p)
-                return -ENOMEM;
-
-        for (;;) {
-                char *e;
-
-                e = strrchr(p, '/');
-                if (!e || e == p) {
-                        free(p);
-                        *bonding = NULL;
-                        return 0;
-                }
-
-                *e = 0;
-
-                b = hashmap_get(m->cgroup_bondings, p);
-                if (b) {
-                        free(p);
-                        *bonding = b;
-                        return 1;
-                }
-        }
-}
-
 int cgroup_notify_empty(Manager *m, const char *group) {
         CGroupBonding *l, *b;
-        int r;
 
         assert(m);
         assert(group);
 
-        r = cgroup_bonding_get(m, group, &l);
-        if (r <= 0)
-                return r;
+        if (!(l = hashmap_get(m->cgroup_bondings, group)))
+                return 0;
 
         LIST_FOREACH(by_path, b, l) {
                 int t;
@@ -411,8 +375,7 @@ int cgroup_notify_empty(Manager *m, const char *group) {
                 if (!b->unit)
                         continue;
 
-                t = cgroup_bonding_is_empty_list(b);
-                if (t < 0) {
+                if ((t = cgroup_bonding_is_empty_list(b)) < 0) {
 
                         /* If we don't know, we don't know */
                         if (t != -EAGAIN)
@@ -421,13 +384,9 @@ int cgroup_notify_empty(Manager *m, const char *group) {
                         continue;
                 }
 
-                if (t > 0) {
-                        /* If it is empty, let's delete it */
-                        cgroup_bonding_trim_list(b->unit->cgroup_bondings, true);
-
+                if (t > 0)
                         if (UNIT_VTABLE(b->unit)->cgroup_notify_empty)
                                 UNIT_VTABLE(b->unit)->cgroup_notify_empty(b->unit);
-                }
         }
 
         return 0;
index 5faa7dc..f33d844 100644 (file)
@@ -53,8 +53,8 @@ struct CGroupBonding {
 int cgroup_bonding_realize(CGroupBonding *b);
 int cgroup_bonding_realize_list(CGroupBonding *first);
 
-void cgroup_bonding_free(CGroupBonding *b, bool trim);
-void cgroup_bonding_free_list(CGroupBonding *first, bool trim);
+void cgroup_bonding_free(CGroupBonding *b, bool remove_or_trim);
+void cgroup_bonding_free_list(CGroupBonding *first, bool remove_or_trim);
 
 int cgroup_bonding_install(CGroupBonding *b, pid_t pid);
 int cgroup_bonding_install_list(CGroupBonding *first, pid_t pid);
@@ -62,8 +62,8 @@ int cgroup_bonding_install_list(CGroupBonding *first, pid_t pid);
 int cgroup_bonding_set_group_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid);
 int cgroup_bonding_set_group_access_list(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid);
 
-int cgroup_bonding_set_task_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid, int sticky);
-int cgroup_bonding_set_task_access_list(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid, int sticky);
+int cgroup_bonding_set_task_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid);
+int cgroup_bonding_set_task_access_list(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid);
 
 int cgroup_bonding_kill(CGroupBonding *b, int sig, bool sigcont, Set *s);
 int cgroup_bonding_kill_list(CGroupBonding *first, int sig, bool sigcont, Set *s);
@@ -86,7 +86,6 @@ pid_t cgroup_bonding_search_main_pid_list(CGroupBonding *b);
 int manager_setup_cgroup(Manager *m);
 void manager_shutdown_cgroup(Manager *m, bool delete);
 
-int cgroup_bonding_get(Manager *m, const char *cgroup, CGroupBonding **bonding);
 int cgroup_notify_empty(Manager *m, const char *group);
 
 Unit* cgroup_unit_by_pid(Manager *m, pid_t pid);
index 1bbc882..7f001e6 100644 (file)
@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
diff --git a/src/cgtop.c b/src/cgtop.c
deleted file mode 100644 (file)
index 8b8617d..0000000
+++ /dev/null
@@ -1,729 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <alloca.h>
-#include <getopt.h>
-
-#include "util.h"
-#include "hashmap.h"
-#include "cgroup-util.h"
-
-typedef struct Group {
-        char *path;
-
-        bool n_tasks_valid:1;
-        bool cpu_valid:1;
-        bool memory_valid:1;
-        bool io_valid:1;
-
-        unsigned n_tasks;
-
-        unsigned cpu_iteration;
-        uint64_t cpu_usage;
-        struct timespec cpu_timestamp;
-        double cpu_fraction;
-
-        uint64_t memory;
-
-        unsigned io_iteration;
-        uint64_t io_input, io_output;
-        struct timespec io_timestamp;
-        uint64_t io_input_bps, io_output_bps;
-} Group;
-
-static unsigned arg_depth = 2;
-static usec_t arg_delay = 1*USEC_PER_SEC;
-
-static enum {
-        ORDER_PATH,
-        ORDER_TASKS,
-        ORDER_CPU,
-        ORDER_MEMORY,
-        ORDER_IO
-} arg_order = ORDER_CPU;
-
-static void group_free(Group *g) {
-        assert(g);
-
-        free(g->path);
-        free(g);
-}
-
-static void group_hashmap_clear(Hashmap *h) {
-        Group *g;
-
-        while ((g = hashmap_steal_first(h)))
-                group_free(g);
-}
-
-static void group_hashmap_free(Hashmap *h) {
-        group_hashmap_clear(h);
-        hashmap_free(h);
-}
-
-static int process(const char *controller, const char *path, Hashmap *a, Hashmap *b, unsigned iteration) {
-        Group *g;
-        int r;
-        FILE *f;
-        pid_t pid;
-        unsigned n;
-
-        assert(controller);
-        assert(path);
-        assert(a);
-
-        g = hashmap_get(a, path);
-        if (!g) {
-                g = hashmap_get(b, path);
-                if (!g) {
-                        g = new0(Group, 1);
-                        if (!g)
-                                return -ENOMEM;
-
-                        g->path = strdup(path);
-                        if (!g->path) {
-                                group_free(g);
-                                return -ENOMEM;
-                        }
-
-                        r = hashmap_put(a, g->path, g);
-                        if (r < 0) {
-                                group_free(g);
-                                return r;
-                        }
-                } else {
-                        assert_se(hashmap_move_one(a, b, path) == 0);
-                        g->cpu_valid = g->memory_valid = g->io_valid = g->n_tasks_valid = false;
-                }
-        }
-
-        /* Regardless which controller, let's find the maximum number
-         * of processes in any of it */
-
-        r = cg_enumerate_tasks(controller, path, &f);
-        if (r < 0)
-                return r;
-
-        n = 0;
-        while (cg_read_pid(f, &pid) > 0)
-                n++;
-        fclose(f);
-
-        if (n > 0) {
-                if (g->n_tasks_valid)
-                        g->n_tasks = MAX(g->n_tasks, n);
-                else
-                        g->n_tasks = n;
-
-                g->n_tasks_valid = true;
-        }
-
-        if (streq(controller, "cpuacct")) {
-                uint64_t new_usage;
-                char *p, *v;
-                struct timespec ts;
-
-                r = cg_get_path(controller, path, "cpuacct.usage", &p);
-                if (r < 0)
-                        return r;
-
-                r = read_one_line_file(p, &v);
-                free(p);
-                if (r < 0)
-                        return r;
-
-                r = safe_atou64(v, &new_usage);
-                free(v);
-                if (r < 0)
-                        return r;
-
-                assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
-
-                if (g->cpu_iteration == iteration - 1) {
-                        uint64_t x, y;
-
-                        x = ((uint64_t) ts.tv_sec * 1000000000ULL + (uint64_t) ts.tv_nsec) -
-                                ((uint64_t) g->cpu_timestamp.tv_sec * 1000000000ULL + (uint64_t) g->cpu_timestamp.tv_nsec);
-
-                        y = new_usage - g->cpu_usage;
-
-                        if (y > 0) {
-                                g->cpu_fraction = (double) y / (double) x;
-                                g->cpu_valid = true;
-                        }
-                }
-
-                g->cpu_usage = new_usage;
-                g->cpu_timestamp = ts;
-                g->cpu_iteration = iteration;
-
-        } else if (streq(controller, "memory")) {
-                char *p, *v;
-
-                r = cg_get_path(controller, path, "memory.usage_in_bytes", &p);
-                if (r < 0)
-                        return r;
-
-                r = read_one_line_file(p, &v);
-                free(p);
-                if (r < 0)
-                        return r;
-
-                r = safe_atou64(v, &g->memory);
-                free(v);
-                if (r < 0)
-                        return r;
-
-                if (g->memory > 0)
-                        g->memory_valid = true;
-
-        } else if (streq(controller, "blkio")) {
-                char *p;
-                uint64_t wr = 0, rd = 0;
-                struct timespec ts;
-
-                r = cg_get_path(controller, path, "blkio.io_service_bytes", &p);
-                if (r < 0)
-                        return r;
-
-                f = fopen(p, "re");
-                free(p);
-
-                if (!f)
-                        return -errno;
-
-                for (;;) {
-                        char line[LINE_MAX], *l;
-                        uint64_t k, *q;
-
-                        if (!fgets(line, sizeof(line), f))
-                                break;
-
-                        l = strstrip(line);
-                        l += strcspn(l, WHITESPACE);
-                        l += strspn(l, WHITESPACE);
-
-                        if (first_word(l, "Read")) {
-                                l += 4;
-                                q = &rd;
-                        } else if (first_word(l, "Write")) {
-                                l += 5;
-                                q = &wr;
-                        } else
-                                continue;
-
-                        l += strspn(l, WHITESPACE);
-                        r = safe_atou64(l, &k);
-                        if (r < 0)
-                                continue;
-
-                        *q += k;
-                }
-
-                fclose(f);
-
-                assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
-
-                if (g->io_iteration == iteration - 1) {
-                        uint64_t x, yr, yw;
-
-                        x = ((uint64_t) ts.tv_sec * 1000000000ULL + (uint64_t) ts.tv_nsec) -
-                                ((uint64_t) g->io_timestamp.tv_sec * 1000000000ULL + (uint64_t) g->io_timestamp.tv_nsec);
-
-                        yr = rd - g->io_input;
-                        yw = wr - g->io_output;
-
-                        if (yr > 0 || yw > 0) {
-                                g->io_input_bps = (yr * 1000000000ULL) / x;
-                                g->io_output_bps = (yw * 1000000000ULL) / x;
-                                g->io_valid = true;
-
-                        }
-                }
-
-                g->io_input = rd;
-                g->io_output = wr;
-                g->io_timestamp = ts;
-                g->io_iteration = iteration;
-        }
-
-        return 0;
-}
-
-static int refresh_one(
-                const char *controller,
-                const char *path,
-                Hashmap *a,
-                Hashmap *b,
-                unsigned iteration,
-                unsigned depth) {
-
-        DIR *d = NULL;
-        int r;
-
-        assert(controller);
-        assert(path);
-        assert(a);
-
-        if (depth > arg_depth)
-                return 0;
-
-        r = process(controller, path, a, b, iteration);
-        if (r < 0)
-                return r;
-
-        r = cg_enumerate_subgroups(controller, path, &d);
-        if (r < 0) {
-                if (r == ENOENT)
-                        return 0;
-
-                return r;
-        }
-
-        for (;;) {
-                char *fn, *p;
-
-                r = cg_read_subgroup(d, &fn);
-                if (r <= 0)
-                        goto finish;
-
-                p = join(path, "/", fn, NULL);
-                free(fn);
-
-                if (!p) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                path_kill_slashes(p);
-
-                r = refresh_one(controller, p, a, b, iteration, depth + 1);
-                free(p);
-
-                if (r < 0)
-                        goto finish;
-        }
-
-finish:
-        if (d)
-                closedir(d);
-
-        return r;
-}
-
-static int refresh(Hashmap *a, Hashmap *b, unsigned iteration) {
-        int r;
-
-        assert(a);
-
-        r = refresh_one("name=systemd", "/", a, b, iteration, 0);
-        if (r < 0)
-                return r;
-
-        r = refresh_one("cpuacct", "/", a, b, iteration, 0);
-        if (r < 0)
-                return r;
-
-        r = refresh_one("memory", "/", a, b, iteration, 0);
-        if (r < 0)
-                return r;
-
-        return refresh_one("blkio", "/", a, b, iteration, 0);
-}
-
-static int group_compare(const void*a, const void *b) {
-        const Group *x = *(Group**)a, *y = *(Group**)b;
-
-        if (path_startswith(y->path, x->path))
-                return -1;
-        if (path_startswith(x->path, y->path))
-                return 1;
-
-        if (arg_order == ORDER_CPU) {
-                if (x->cpu_valid && y->cpu_valid) {
-
-                        if (x->cpu_fraction > y->cpu_fraction)
-                                return -1;
-                        else if (x->cpu_fraction < y->cpu_fraction)
-                                return 1;
-                } else if (x->cpu_valid)
-                        return -1;
-                else if (y->cpu_valid)
-                        return 1;
-        }
-
-        if (arg_order == ORDER_TASKS) {
-
-                if (x->n_tasks_valid && y->n_tasks_valid) {
-                        if (x->n_tasks > y->n_tasks)
-                                return -1;
-                        else if (x->n_tasks < y->n_tasks)
-                                return 1;
-                } else if (x->n_tasks_valid)
-                        return -1;
-                else if (y->n_tasks_valid)
-                        return 1;
-        }
-
-        if (arg_order == ORDER_MEMORY) {
-                if (x->memory_valid && y->memory_valid) {
-                        if (x->memory > y->memory)
-                                return -1;
-                        else if (x->memory < y->memory)
-                                return 1;
-                } else if (x->memory_valid)
-                        return -1;
-                else if (y->memory_valid)
-                        return 1;
-        }
-
-        if (arg_order == ORDER_IO) {
-                if (x->io_valid && y->io_valid) {
-                        if (x->io_input_bps + x->io_output_bps > y->io_input_bps + y->io_output_bps)
-                                return -1;
-                        else if (x->io_input_bps + x->io_output_bps < y->io_input_bps + y->io_output_bps)
-                                return 1;
-                } else if (x->io_valid)
-                        return -1;
-                else if (y->io_valid)
-                        return 1;
-        }
-
-        return strcmp(x->path, y->path);
-}
-
-static int display(Hashmap *a) {
-        Iterator i;
-        Group *g;
-        Group **array;
-        unsigned rows, n = 0, j;
-
-        assert(a);
-
-        /* Set cursor to top left corner and clear screen */
-        fputs("\033[H"
-              "\033[2J", stdout);
-
-        array = alloca(sizeof(Group*) * hashmap_size(a));
-
-        HASHMAP_FOREACH(g, a, i)
-                if (g->n_tasks_valid || g->cpu_valid || g->memory_valid || g->io_valid)
-                        array[n++] = g;
-
-        qsort(array, n, sizeof(Group*), group_compare);
-
-        rows = fd_lines(STDOUT_FILENO);
-        if (rows <= 0)
-                rows = 25;
-
-        printf("%s%-37s%s %s%7s%s %s%6s%s %s%8s%s %s%8s%s %s%8s%s\n\n",
-               arg_order == ORDER_PATH   ? ANSI_HIGHLIGHT_ON : "", "Path",     arg_order == ORDER_PATH   ? ANSI_HIGHLIGHT_OFF : "",
-               arg_order == ORDER_TASKS  ? ANSI_HIGHLIGHT_ON : "", "Tasks",    arg_order == ORDER_TASKS  ? ANSI_HIGHLIGHT_OFF : "",
-               arg_order == ORDER_CPU    ? ANSI_HIGHLIGHT_ON : "", "%CPU",     arg_order == ORDER_CPU    ? ANSI_HIGHLIGHT_OFF : "",
-               arg_order == ORDER_MEMORY ? ANSI_HIGHLIGHT_ON : "", "Memory",   arg_order == ORDER_MEMORY ? ANSI_HIGHLIGHT_OFF : "",
-               arg_order == ORDER_IO     ? ANSI_HIGHLIGHT_ON : "", "Input/s",  arg_order == ORDER_IO     ? ANSI_HIGHLIGHT_OFF : "",
-               arg_order == ORDER_IO     ? ANSI_HIGHLIGHT_ON : "", "Output/s", arg_order == ORDER_IO     ? ANSI_HIGHLIGHT_OFF : "");
-
-        for (j = 0; j < n; j++) {
-                char *p;
-                char m[FORMAT_BYTES_MAX];
-
-                if (j + 5 > rows)
-                        break;
-
-                g = array[j];
-
-                p = ellipsize(g->path, 37, 33);
-                printf("%-37s", p ? p : g->path);
-                free(p);
-
-                if (g->n_tasks_valid)
-                        printf(" %7u", g->n_tasks);
-                else
-                        fputs("       -", stdout);
-
-                if (g->cpu_valid)
-                        printf(" %6.1f", g->cpu_fraction*100);
-                else
-                        fputs("      -", stdout);
-
-                if (g->memory_valid)
-                        printf(" %8s", format_bytes(m, sizeof(m), g->memory));
-                else
-                        fputs("        -", stdout);
-
-                if (g->io_valid) {
-                        printf(" %8s",
-                               format_bytes(m, sizeof(m), g->io_input_bps));
-                        printf(" %8s",
-                               format_bytes(m, sizeof(m), g->io_output_bps));
-                } else
-                        fputs("        -        -", stdout);
-
-                putchar('\n');
-        }
-
-        return 0;
-}
-
-static void help(void) {
-
-        printf("%s [OPTIONS...]\n\n"
-               "Show top control groups by their resource usage.\n\n"
-               "  -h --help           Show this help\n"
-               "  -p                  Order by path\n"
-               "  -t                  Order by number of tasks\n"
-               "  -c                  Order by CPU load\n"
-               "  -m                  Order by memory load\n"
-               "  -i                  Order by IO load\n"
-               "  -d --delay=DELAY    Specify delay\n"
-               "     --depth=DEPTH    Maximum traversal depth (default: 2)\n",
-               program_invocation_short_name);
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_DEPTH = 0x100
-        };
-
-        static const struct option options[] = {
-                { "help",  no_argument,       NULL, 'h'       },
-                { "delay", required_argument, NULL, 'd'       },
-                { "depth", required_argument, NULL, ARG_DEPTH },
-                { NULL,    0,                 NULL, 0         }
-        };
-
-        int c;
-        int r;
-
-        assert(argc >= 1);
-        assert(argv);
-
-        while ((c = getopt_long(argc, argv, "hptcmid:", options, NULL)) >= 0) {
-
-                switch (c) {
-
-                case 'h':
-                        help();
-                        return 0;
-
-                case ARG_DEPTH:
-                        r = safe_atou(optarg, &arg_depth);
-                        if (r < 0) {
-                                log_error("Failed to parse depth parameter.");
-                                return -EINVAL;
-                        }
-
-                        break;
-
-                case 'd':
-                        r = parse_usec(optarg, &arg_delay);
-                        if (r < 0 || arg_delay <= 0) {
-                                log_error("Failed to parse delay parameter.");
-                                return -EINVAL;
-                        }
-
-                        break;
-
-                case 'p':
-                        arg_order = ORDER_PATH;
-                        break;
-
-                case 't':
-                        arg_order = ORDER_TASKS;
-                        break;
-
-                case 'c':
-                        arg_order = ORDER_CPU;
-                        break;
-
-                case 'm':
-                        arg_order = ORDER_MEMORY;
-                        break;
-
-                case 'i':
-                        arg_order = ORDER_IO;
-                        break;
-
-                case '?':
-                        return -EINVAL;
-
-                default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
-                }
-        }
-
-        if (optind < argc) {
-                log_error("Too many arguments.");
-                return -EINVAL;
-        }
-
-        return 1;
-}
-
-int main(int argc, char *argv[]) {
-        int r;
-        Hashmap *a = NULL, *b = NULL;
-        unsigned iteration = 0;
-        usec_t last_refresh = 0;
-        bool quit = false, immediate_refresh = false;
-
-        log_parse_environment();
-        log_open();
-
-        r = parse_argv(argc, argv);
-        if (r <= 0)
-                goto finish;
-
-        a = hashmap_new(string_hash_func, string_compare_func);
-        b = hashmap_new(string_hash_func, string_compare_func);
-        if (!a || !b) {
-                log_error("Out of memory");
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        while (!quit) {
-                Hashmap *c;
-                usec_t t;
-                char key;
-                char h[FORMAT_TIMESPAN_MAX];
-
-                t = now(CLOCK_MONOTONIC);
-
-                if (t >= last_refresh + arg_delay || immediate_refresh) {
-
-                        r = refresh(a, b, iteration++);
-                        if (r < 0)
-                                goto finish;
-
-                        group_hashmap_clear(b);
-
-                        c = a;
-                        a = b;
-                        b = c;
-
-                        last_refresh = t;
-                        immediate_refresh = false;
-                }
-
-                r = display(b);
-                if (r < 0)
-                        goto finish;
-
-                r = read_one_char(stdin, &key, last_refresh + arg_delay - t, NULL);
-                if (r == -ETIMEDOUT)
-                        continue;
-                if (r < 0) {
-                        log_error("Couldn't read key: %s", strerror(-r));
-                        goto finish;
-                }
-
-                fputs("\r \r", stdout);
-                fflush(stdout);
-
-                switch (key) {
-
-                case ' ':
-                        immediate_refresh = true;
-                        break;
-
-                case 'q':
-                        quit = true;
-                        break;
-
-                case 'p':
-                        arg_order = ORDER_PATH;
-                        break;
-
-                case 't':
-                        arg_order = ORDER_TASKS;
-                        break;
-
-                case 'c':
-                        arg_order = ORDER_CPU;
-                        break;
-
-                case 'm':
-                        arg_order = ORDER_MEMORY;
-                        break;
-
-                case 'i':
-                        arg_order = ORDER_IO;
-                        break;
-
-                case '+':
-                        if (arg_delay < USEC_PER_SEC)
-                                arg_delay += USEC_PER_MSEC*250;
-                        else
-                                arg_delay += USEC_PER_SEC;
-
-                        fprintf(stdout, "\nIncreased delay to %s.", format_timespan(h, sizeof(h), arg_delay));
-                        fflush(stdout);
-                        sleep(1);
-                        break;
-
-                case '-':
-                        if (arg_delay <= USEC_PER_MSEC*500)
-                                arg_delay = USEC_PER_MSEC*250;
-                        else if (arg_delay < USEC_PER_MSEC*1250)
-                                arg_delay -= USEC_PER_MSEC*250;
-                        else
-                                arg_delay -= USEC_PER_SEC;
-
-                        fprintf(stdout, "\nDecreased delay to %s.", format_timespan(h, sizeof(h), arg_delay));
-                        fflush(stdout);
-                        sleep(1);
-                        break;
-
-                case '?':
-                case 'h':
-                        fprintf(stdout,
-                                "\t<" ANSI_HIGHLIGHT_ON "P" ANSI_HIGHLIGHT_OFF "> By path; <" ANSI_HIGHLIGHT_ON "T" ANSI_HIGHLIGHT_OFF "> By tasks; <" ANSI_HIGHLIGHT_ON "C" ANSI_HIGHLIGHT_OFF "> By CPU; <" ANSI_HIGHLIGHT_ON "M" ANSI_HIGHLIGHT_OFF "> By memory; <" ANSI_HIGHLIGHT_ON "I" ANSI_HIGHLIGHT_OFF "> By I/O\n"
-                                "\t<" ANSI_HIGHLIGHT_ON "Q" ANSI_HIGHLIGHT_OFF "> Quit; <" ANSI_HIGHLIGHT_ON "+" ANSI_HIGHLIGHT_OFF "> Increase delay; <" ANSI_HIGHLIGHT_ON "-" ANSI_HIGHLIGHT_OFF "> Decrease delay; <" ANSI_HIGHLIGHT_ON "SPACE" ANSI_HIGHLIGHT_OFF "> Refresh");
-                        fflush(stdout);
-                        sleep(3);
-                        break;
-
-                default:
-                        fprintf(stdout, "\nUnknown key '%c'. Ignoring.", key);
-                        fflush(stdout);
-                        sleep(1);
-                        break;
-                }
-        }
-
-        log_info("Exiting.");
-
-        r = 0;
-
-finish:
-        group_hashmap_free(a);
-        group_hashmap_free(b);
-
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
index 2b51a16..f18c454 100644 (file)
@@ -187,8 +187,6 @@ static bool test_capability(const char *parameter) {
                 }
         }
 
-        fclose(f);
-
         return !!(capabilities & (1ULL << value));
 }
 
index c7dd01a..a71dcd0 100644 (file)
@@ -454,7 +454,7 @@ int config_parse_unsigned(
         return 0;
 }
 
-int config_parse_bytes_size(
+int config_parse_size(
                 const char *filename,
                 unsigned line,
                 const char *section,
@@ -465,47 +465,20 @@ int config_parse_bytes_size(
                 void *userdata) {
 
         size_t *sz = data;
-        off_t o;
-
-        assert(filename);
-        assert(lvalue);
-        assert(rvalue);
-        assert(data);
-
-        if (parse_bytes(rvalue, &o) < 0 || (off_t) (size_t) o != o) {
-                log_error("[%s:%u] Failed to parse byte value, ignoring: %s", filename, line, rvalue);
-                return 0;
-        }
-
-        *sz = (size_t) o;
-        return 0;
-}
-
-
-int config_parse_bytes_off(
-                const char *filename,
-                unsigned line,
-                const char *section,
-                const char *lvalue,
-                int ltype,
-                const char *rvalue,
-                void *data,
-                void *userdata) {
-
-        off_t *bytes = data;
+        unsigned u;
+        int r;
 
         assert(filename);
         assert(lvalue);
         assert(rvalue);
         assert(data);
 
-        assert_cc(sizeof(off_t) == sizeof(uint64_t));
-
-        if (parse_bytes(rvalue, bytes) < 0) {
-                log_error("[%s:%u] Failed to parse bytes value, ignoring: %s", filename, line, rvalue);
+        if ((r = safe_atou(rvalue, &u)) < 0) {
+                log_error("[%s:%u] Failed to parse numeric value, ignoring: %s", filename, line, rvalue);
                 return 0;
         }
 
+        *sz = (size_t) u;
         return 0;
 }
 
@@ -536,36 +509,6 @@ int config_parse_bool(
         return 0;
 }
 
-int config_parse_tristate(
-                const char *filename,
-                unsigned line,
-                const char *section,
-                const char *lvalue,
-                int ltype,
-                const char *rvalue,
-                void *data,
-                void *userdata) {
-
-        int k;
-        int *b = data;
-
-        assert(filename);
-        assert(lvalue);
-        assert(rvalue);
-        assert(data);
-
-        /* Tristates are like booleans, but can also take the 'default' value, i.e. "-1" */
-
-        k = parse_boolean(rvalue);
-        if (k < 0) {
-                log_error("[%s:%u] Failed to parse boolean value, ignoring: %s", filename, line, rvalue);
-                return 0;
-        }
-
-        *b = !!k;
-        return 0;
-}
-
 int config_parse_string(
                 const char *filename,
                 unsigned line,
index be7d708..cbb4235 100644 (file)
@@ -93,10 +93,8 @@ int config_parse_int(const char *filename, unsigned line, const char *section, c
 int config_parse_unsigned(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_long(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_uint64(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_bytes_size(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_bytes_off(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_size(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_bool(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_tristate(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_string(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_path(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_strv(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
similarity index 97%
rename from src/cryptsetup/cryptsetup-generator.c
rename to src/cryptsetup-generator.c
index ba59b49..6f3aa78 100644 (file)
@@ -112,7 +112,8 @@ static int create_disk(
                 "DefaultDependencies=no\n"
                 "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=umount.target\n",
+                "Before=umount.target\n"
+                "Before=local-fs.target\n",
                 d, d);
 
         if (!nofail)
@@ -124,9 +125,6 @@ static int create_disk(
                          streq(password, "/dev/hw_random")))
                 fprintf(f,
                         "After=systemd-random-seed-load.service\n");
-        else
-                fprintf(f,
-                        "Before=local-fs.target\n");
 
         fprintf(f,
                 "\n[Service]\n"
@@ -245,7 +243,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
similarity index 100%
rename from src/cryptsetup/cryptsetup.c
rename to src/cryptsetup.c
index 8e45f81..8268425 100644 (file)
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <errno.h>
-
 #include "dbus-unit.h"
 #include "dbus-automount.h"
 #include "dbus-common.h"
@@ -29,7 +27,6 @@
         " <interface name=\"org.freedesktop.systemd1.Automount\">\n" \
         "  <property name=\"Where\" type=\"s\" access=\"read\"/>\n"  \
         "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"
 
 #define INTROSPECTION                                                \
 
 const char bus_automount_interface[] _introspect_("Automount") = BUS_AUTOMOUNT_INTERFACE;
 
-const char bus_automount_invalidating_properties[] =
-        "Result\0";
-
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_automount_append_automount_result, automount_result, AutomountResult);
-
-static const BusProperty bus_automount_properties[] = {
-        { "Where",         bus_property_append_string, "s", offsetof(Automount, where),    true },
-        { "DirectoryMode", bus_property_append_mode,   "u", offsetof(Automount, directory_mode) },
-        { "Result",        bus_automount_append_automount_result, "s", offsetof(Automount, result) },
-        { NULL, }
-};
-
 DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Automount *am = AUTOMOUNT(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",      bus_unit_properties,      u  },
-                { "org.freedesktop.systemd1.Automount", bus_automount_properties, am },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Automount", "Where", bus_property_append_string,       "s", u->automount.where           },
+                { "org.freedesktop.systemd1.Automount", "DirectoryMode", bus_property_append_mode, "u", &u->automount.directory_mode },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index 2fc8345..84b573c 100644 (file)
@@ -29,6 +29,5 @@
 DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message);
 
 extern const char bus_automount_interface[];
-extern const char bus_automount_invalidating_properties[];
 
 #endif
index 2905ac3..40754e1 100644 (file)
@@ -177,11 +177,11 @@ int bus_connect_system_ssh(const char *user, const char *host, DBusConnection **
         assert(user || host);
 
         if (user && host)
-                asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s@%s,argv3=systemd-stdio-bridge", user, host);
+                asprintf(&p, "exec:path=ssh,argv1=-xT,argv2=%s@%s,argv3=systemd-stdio-bridge", user, host);
         else if (user)
-                asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s@localhost,argv3=systemd-stdio-bridge", user);
+                asprintf(&p, "exec:path=ssh,argv1=-xT,argv2=%s@localhost,argv3=systemd-stdio-bridge", user);
         else if (host)
-                asprintf(&p, "unixexec:path=ssh,argv1=-xT,argv2=%s,argv3=systemd-stdio-bridge", host);
+                asprintf(&p, "exec:path=ssh,argv1=-xT,argv2=%s,argv3=systemd-stdio-bridge", host);
 
         if (!p) {
                 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, NULL);
@@ -222,8 +222,7 @@ int bus_connect_system_polkit(DBusConnection **_bus, DBusError *error) {
         if (geteuid() == 0)
                 return bus_connect(DBUS_BUS_SYSTEM, _bus, NULL, error);
 
-        bus = dbus_connection_open_private("unixexec:path=pkexec,argv1=" SYSTEMD_STDIO_BRIDGE_BINARY_PATH, error);
-        if (!bus)
+        if (!(bus = dbus_connection_open_private("exec:path=pkexec,argv1=" SYSTEMD_STDIO_BRIDGE_BINARY_PATH, error)))
                 return -EIO;
 
         dbus_connection_set_exit_on_disconnect(bus, FALSE);
@@ -260,7 +259,7 @@ DBusHandlerResult bus_default_message_handler(
                 DBusMessage *message,
                 const char *introspection,
                 const char *interfaces,
-                const BusBoundProperties *bound_properties) {
+                const BusProperty *properties) {
 
         DBusError error;
         DBusMessage *reply = NULL;
@@ -279,12 +278,9 @@ DBusHandlerResult bus_default_message_handler(
                 if (!dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection, DBUS_TYPE_INVALID))
                         goto oom;
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "Get") && bound_properties) {
+        } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "Get") && properties) {
                 const char *interface, *property;
-                const BusBoundProperties *bp;
                 const BusProperty *p;
-                void *data;
-                DBusMessageIter iter, sub;
 
                 if (!dbus_message_get_args(
                             message,
@@ -294,51 +290,43 @@ DBusHandlerResult bus_default_message_handler(
                             DBUS_TYPE_INVALID))
                         return bus_send_error_reply(c, message, &error, -EINVAL);
 
-                for (bp = bound_properties; bp->interface; bp++) {
-                        if (!streq(bp->interface, interface))
-                                continue;
+                for (p = properties; p->property; p++)
+                        if (streq(p->interface, interface) && streq(p->property, property))
+                                break;
 
-                        for (p = bp->properties; p->property; p++)
-                                if (streq(p->property, property))
-                                        goto get_prop;
-                }
+                if (p->property) {
+                        DBusMessageIter iter, sub;
 
-                /* no match */
-                if (!nulstr_contains(interfaces, interface))
-                        dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface");
-                else
-                        dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_PROPERTY, "Unknown property");
+                        if (!(reply = dbus_message_new_method_return(message)))
+                                goto oom;
 
-                return bus_send_error_reply(c, message, &error, -EINVAL);
+                        dbus_message_iter_init_append(reply, &iter);
 
-get_prop:
-                reply = dbus_message_new_method_return(message);
-                if (!reply)
-                        goto oom;
+                        if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, p->signature, &sub))
+                                goto oom;
 
-                dbus_message_iter_init_append(reply, &iter);
+                        if ((r = p->append(&sub, property, (void*) p->data)) < 0) {
 
-                if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, p->signature, &sub))
-                        goto oom;
+                                if (r == -ENOMEM)
+                                        goto oom;
 
-                data = (char*)bp->base + p->offset;
-                if (p->indirect)
-                        data = *(void**)data;
-                r = p->append(&sub, property, data);
-                if (r < 0) {
-                        if (r == -ENOMEM)
+                                dbus_message_unref(reply);
+                                return bus_send_error_reply(c, message, NULL, r);
+                        }
+
+                        if (!dbus_message_iter_close_container(&iter, &sub))
                                 goto oom;
+                } else {
+                        if (!nulstr_contains(interfaces, interface))
+                                dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface");
+                        else
+                                dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_PROPERTY, "Unknown property");
 
-                        dbus_message_unref(reply);
-                        return bus_send_error_reply(c, message, NULL, r);
+                        return bus_send_error_reply(c, message, &error, -EINVAL);
                 }
 
-                if (!dbus_message_iter_close_container(&iter, &sub))
-                        goto oom;
-
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "GetAll") && bound_properties) {
+        } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "GetAll") && properties) {
                 const char *interface;
-                const BusBoundProperties *bp;
                 const BusProperty *p;
                 DBusMessageIter iter, sub, sub2, sub3;
 
@@ -362,46 +350,36 @@ get_prop:
                 if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub))
                         goto oom;
 
-                for (bp = bound_properties; bp->interface; bp++) {
-                        if (interface[0] && !streq(bp->interface, interface))
+                for (p = properties; p->property; p++) {
+                        if (interface[0] && !streq(p->interface, interface))
                                 continue;
 
-                        for (p = bp->properties; p->property; p++) {
-                                void *data;
-
-                                if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
-                                    !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &p->property) ||
-                                    !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, p->signature, &sub3))
-                                        goto oom;
-
-                                data = (char*)bp->base + p->offset;
-                                if (p->indirect)
-                                        data = *(void**)data;
-                                r = p->append(&sub3, p->property, data);
-                                if (r < 0) {
-                                        if (r == -ENOMEM)
-                                                goto oom;
+                        if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &sub2) ||
+                            !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &p->property) ||
+                            !dbus_message_iter_open_container(&sub2, DBUS_TYPE_VARIANT, p->signature, &sub3))
+                                goto oom;
 
-                                        dbus_message_unref(reply);
-                                        return bus_send_error_reply(c, message, NULL, r);
-                                }
+                        if ((r = p->append(&sub3, p->property, (void*) p->data)) < 0) {
 
-                                if (!dbus_message_iter_close_container(&sub2, &sub3) ||
-                                    !dbus_message_iter_close_container(&sub, &sub2))
+                                if (r == -ENOMEM)
                                         goto oom;
+
+                                dbus_message_unref(reply);
+                                return bus_send_error_reply(c, message, NULL, r);
                         }
+
+                        if (!dbus_message_iter_close_container(&sub2, &sub3) ||
+                            !dbus_message_iter_close_container(&sub, &sub2))
+                                goto oom;
                 }
 
                 if (!dbus_message_iter_close_container(&iter, &sub))
                         goto oom;
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "Set") && bound_properties) {
+        } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Properties", "Set") && properties) {
                 const char *interface, *property;
                 DBusMessageIter iter;
-                const BusBoundProperties *bp;
                 const BusProperty *p;
-                DBusMessageIter sub;
-                char *sig;
 
                 if (!dbus_message_iter_init(message, &iter) ||
                     dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
@@ -420,52 +398,45 @@ get_prop:
                     dbus_message_iter_has_next(&iter))
                         return bus_send_error_reply(c, message, NULL, -EINVAL);
 
-                for (bp = bound_properties; bp->interface; bp++) {
-                        if (!streq(bp->interface, interface))
-                                continue;
+                for (p = properties; p->property; p++)
+                        if (streq(p->interface, interface) && streq(p->property, property))
+                                break;
 
-                        for (p = bp->properties; p->property; p++)
-                                if (streq(p->property, property))
-                                        goto set_prop;
-                }
-
-                /* no match */
-                if (!nulstr_contains(interfaces, interface))
-                        dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface");
-                else
-                        dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_PROPERTY, "Unknown property");
+                if (p->set) {
+                        DBusMessageIter sub;
+                        char *sig;
 
-                return bus_send_error_reply(c, message, &error, -EINVAL);
+                        dbus_message_iter_recurse(&iter, &sub);
 
-set_prop:
-                if (!p->set) {
-                        dbus_set_error_const(&error, DBUS_ERROR_PROPERTY_READ_ONLY, "Property read-only");
-                        return bus_send_error_reply(c, message, &error, -EINVAL);
-                }
-
-                dbus_message_iter_recurse(&iter, &sub);
+                        if (!(sig = dbus_message_iter_get_signature(&sub)))
+                                goto oom;
 
-                sig = dbus_message_iter_get_signature(&sub);
-                if (!sig)
-                        goto oom;
+                        if (!streq(sig, p->signature)) {
+                                dbus_free(sig);
+                                return bus_send_error_reply(c, message, NULL, -EINVAL);
+                        }
 
-                if (!streq(sig, p->signature)) {
                         dbus_free(sig);
-                        return bus_send_error_reply(c, message, NULL, -EINVAL);
-                }
 
-                dbus_free(sig);
+                        if ((r = p->set(&sub, property)) < 0) {
+                                if (r == -ENOMEM)
+                                        goto oom;
+                                return bus_send_error_reply(c, message, NULL, r);
+                        }
 
-                r = p->set(&sub, property);
-                if (r < 0) {
-                        if (r == -ENOMEM)
+                        if (!(reply = dbus_message_new_method_return(message)))
                                 goto oom;
-                        return bus_send_error_reply(c, message, NULL, r);
+                } else {
+                        if (p->property)
+                                dbus_set_error_const(&error, DBUS_ERROR_PROPERTY_READ_ONLY, "Property read-only");
+                        else if (!nulstr_contains(interfaces, interface))
+                                dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_INTERFACE, "Unknown interface");
+                        else
+                                dbus_set_error_const(&error, DBUS_ERROR_UNKNOWN_PROPERTY, "Unknown property");
+
+                        return bus_send_error_reply(c, message, &error, -EINVAL);
                 }
 
-                reply = dbus_message_new_method_return(message);
-                if (!reply)
-                        goto oom;
         } else {
                 const char *interface = dbus_message_get_interface(message);
 
@@ -534,22 +505,6 @@ int bus_property_append_bool(DBusMessageIter *i, const char *property, void *dat
         return 0;
 }
 
-int bus_property_append_tristate_false(DBusMessageIter *i, const char *property, void *data) {
-        int *b = data;
-        dbus_bool_t db;
-
-        assert(i);
-        assert(property);
-        assert(b);
-
-        db = *b > 0;
-
-        if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &db))
-                return -ENOMEM;
-
-        return 0;
-}
-
 int bus_property_append_uint64(DBusMessageIter *i, const char *property, void *data) {
         assert(i);
         assert(property);
index 15811a7..acd9208 100644 (file)
@@ -96,22 +96,14 @@ typedef int (*BusPropertyCallback)(DBusMessageIter *iter, const char *property,
 typedef int (*BusPropertySetCallback)(DBusMessageIter *iter, const char *property);
 
 typedef struct BusProperty {
+        const char *interface;           /* interface of the property */
         const char *property;            /* name of the property */
         BusPropertyCallback append;      /* Function that is called to serialize this property */
         const char *signature;
-        const uint16_t offset;           /* Offset from BusBoundProperties::base address to the property data.
-                                          * uint16_t is sufficient, because we have no structs too big.
-                                          * -Werror=overflow will catch it if this does not hold. */
-        bool indirect;                   /* data is indirect, ie. not base+offset, but *(base+offset) */
+        const void *data;                /* The data of this property */
         BusPropertySetCallback set;      /* Optional: Function that is called to set this property */
 } BusProperty;
 
-typedef struct BusBoundProperties {
-        const char *interface;           /* interface of the properties */
-        const BusProperty *properties;   /* array of properties, ended by a NULL-filled element */
-        const void *const base;          /* base pointer to which the offset must be added to reach data */
-} BusBoundProperties;
-
 DBusHandlerResult bus_send_error_reply(
                 DBusConnection *c,
                 DBusMessage *message,
@@ -123,12 +115,11 @@ DBusHandlerResult bus_default_message_handler(
                 DBusMessage *message,
                 const char *introspection,
                 const char *interfaces,
-                const BusBoundProperties *bound_properties);
+                const BusProperty *properties);
 
 int bus_property_append_string(DBusMessageIter *i, const char *property, void *data);
 int bus_property_append_strv(DBusMessageIter *i, const char *property, void *data);
 int bus_property_append_bool(DBusMessageIter *i, const char *property, void *data);
-int bus_property_append_tristate_false(DBusMessageIter *i, const char *property, void *data);
 int bus_property_append_int32(DBusMessageIter *i, const char *property, void *data);
 int bus_property_append_uint32(DBusMessageIter *i, const char *property, void *data);
 int bus_property_append_uint64(DBusMessageIter *i, const char *property, void *data);
index b39fb9d..f85ad2d 100644 (file)
@@ -47,19 +47,12 @@ const char bus_device_interface[] _introspect_("Device") = BUS_DEVICE_INTERFACE;
 const char bus_device_invalidating_properties[] =
         "SysFSPath\0";
 
-static const BusProperty bus_device_properties[] = {
-        { "SysFSPath", bus_property_append_string, "s", offsetof(Device, sysfs), true },
-        { NULL, }
-};
-
-
 DBusHandlerResult bus_device_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Device *d = DEVICE(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",   bus_unit_properties,   u },
-                { "org.freedesktop.systemd1.Device", bus_device_properties, d },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Device", "SysFSPath", bus_property_append_string, "s", u->device.sysfs },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index 1fd2b21..201f6b5 100644 (file)
@@ -355,68 +355,3 @@ int bus_execute_append_command(DBusMessageIter *i, const char *property, void *d
 
         return 0;
 }
-
-const BusProperty bus_exec_context_properties[] = {
-        { "Environment",              bus_property_append_strv,             "as", offsetof(ExecContext, environment),            true },
-        { "EnvironmentFiles",         bus_execute_append_env_files,      "a(sb)", offsetof(ExecContext, environment_files),      true },
-        { "UMask",                    bus_property_append_mode,              "u", offsetof(ExecContext, umask)                        },
-        { "LimitCPU",                 bus_execute_append_rlimits,            "t", 0 },
-        { "LimitFSIZE",               bus_execute_append_rlimits,            "t", 0 },
-        { "LimitDATA",                bus_execute_append_rlimits,            "t", 0 },
-        { "LimitSTACK",               bus_execute_append_rlimits,            "t", 0 },
-        { "LimitCORE",                bus_execute_append_rlimits,            "t", 0 },
-        { "LimitRSS",                 bus_execute_append_rlimits,            "t", 0 },
-        { "LimitNOFILE",              bus_execute_append_rlimits,            "t", 0 },
-        { "LimitAS",                  bus_execute_append_rlimits,            "t", 0 },
-        { "LimitNPROC",               bus_execute_append_rlimits,            "t", 0 },
-        { "LimitMEMLOCK",             bus_execute_append_rlimits,            "t", 0 },
-        { "LimitLOCKS",               bus_execute_append_rlimits,            "t", 0 },
-        { "LimitSIGPENDING",          bus_execute_append_rlimits,            "t", 0 },
-        { "LimitMSGQUEUE",            bus_execute_append_rlimits,            "t", 0 },
-        { "LimitNICE",                bus_execute_append_rlimits,            "t", 0 },
-        { "LimitRTPRIO",              bus_execute_append_rlimits,            "t", 0 },
-        { "LimitRTTIME",              bus_execute_append_rlimits,            "t", 0 },
-        { "WorkingDirectory",         bus_property_append_string,            "s", offsetof(ExecContext, working_directory),      true },
-        { "RootDirectory",            bus_property_append_string,            "s", offsetof(ExecContext, root_directory),         true },
-        { "OOMScoreAdjust",           bus_execute_append_oom_score_adjust,   "i", 0 },
-        { "Nice",                     bus_execute_append_nice,               "i", 0 },
-        { "IOScheduling",             bus_execute_append_ioprio,             "i", 0 },
-        { "CPUSchedulingPolicy",      bus_execute_append_cpu_sched_policy,   "i", 0 },
-        { "CPUSchedulingPriority",    bus_execute_append_cpu_sched_priority, "i", 0 },
-        { "CPUAffinity",              bus_execute_append_affinity,          "ay", 0 },
-        { "TimerSlackNSec",           bus_execute_append_timer_slack_nsec,   "t", 0 },
-        { "CPUSchedulingResetOnFork", bus_property_append_bool,              "b", offsetof(ExecContext, cpu_sched_reset_on_fork)      },
-        { "NonBlocking",              bus_property_append_bool,              "b", offsetof(ExecContext, non_blocking)                 },
-        { "StandardInput",            bus_execute_append_input,              "s", offsetof(ExecContext, std_input)                    },
-        { "StandardOutput",           bus_execute_append_output,             "s", offsetof(ExecContext, std_output)                   },
-        { "StandardError",            bus_execute_append_output,             "s", offsetof(ExecContext, std_error)                    },
-        { "TTYPath",                  bus_property_append_string,            "s", offsetof(ExecContext, tty_path),               true },
-        { "TTYReset",                 bus_property_append_bool,              "b", offsetof(ExecContext, tty_reset)                    },
-        { "TTYVHangup",               bus_property_append_bool,              "b", offsetof(ExecContext, tty_vhangup)                  },
-        { "TTYVTDisallocate",         bus_property_append_bool,              "b", offsetof(ExecContext, tty_vt_disallocate)           },
-        { "SyslogPriority",           bus_property_append_int,               "i", offsetof(ExecContext, syslog_priority)              },
-        { "SyslogIdentifier",         bus_property_append_string,            "s", offsetof(ExecContext, syslog_identifier),      true },
-        { "SyslogLevelPrefix",        bus_property_append_bool,              "b", offsetof(ExecContext, syslog_level_prefix)          },
-        { "Capabilities",             bus_execute_append_capabilities,       "s", 0 },
-        { "SecureBits",               bus_property_append_int,               "i", offsetof(ExecContext, secure_bits)                  },
-        { "CapabilityBoundingSet",    bus_execute_append_capability_bs,      "t", offsetof(ExecContext, capability_bounding_set_drop) },
-        { "User",                     bus_property_append_string,            "s", offsetof(ExecContext, user),                   true },
-        { "Group",                    bus_property_append_string,            "s", offsetof(ExecContext, group),                  true },
-        { "SupplementaryGroups",      bus_property_append_strv,             "as", offsetof(ExecContext, supplementary_groups),   true },
-        { "TCPWrapName",              bus_property_append_string,            "s", offsetof(ExecContext, tcpwrap_name),           true },
-        { "PAMName",                  bus_property_append_string,            "s", offsetof(ExecContext, pam_name),               true },
-        { "ReadWriteDirectories",     bus_property_append_strv,             "as", offsetof(ExecContext, read_write_dirs),        true },
-        { "ReadOnlyDirectories",      bus_property_append_strv,             "as", offsetof(ExecContext, read_only_dirs),         true },
-        { "InaccessibleDirectories",  bus_property_append_strv,             "as", offsetof(ExecContext, inaccessible_dirs),      true },
-        { "MountFlags",               bus_property_append_ul,                "t", offsetof(ExecContext, mount_flags)                  },
-        { "PrivateTmp",               bus_property_append_bool,              "b", offsetof(ExecContext, private_tmp)                  },
-        { "PrivateNetwork",           bus_property_append_bool,              "b", offsetof(ExecContext, private_network)              },
-        { "SameProcessGroup",         bus_property_append_bool,              "b", offsetof(ExecContext, same_pgrp)                    },
-        { "KillMode",                 bus_execute_append_kill_mode,          "s", offsetof(ExecContext, kill_mode)                    },
-        { "KillSignal",               bus_property_append_int,               "i", offsetof(ExecContext, kill_signal)                  },
-        { "UtmpIdentifier",           bus_property_append_string,            "s", offsetof(ExecContext, utmp_id),                true },
-        { "ControlGroupModify",       bus_property_append_bool,              "b", offsetof(ExecContext, control_group_modify)         },
-        { "ControlGroupPersistent",   bus_property_append_tristate_false,    "b", offsetof(ExecContext, control_group_persistent)     },
-        { "IgnoreSIGPIPE",            bus_property_append_bool,              "b", offsetof(ExecContext, ignore_sigpipe          )     },
-        { NULL, }
-};
index 03cd69d..2e30679 100644 (file)
@@ -25,7 +25,6 @@
 #include <dbus/dbus.h>
 
 #include "manager.h"
-#include "dbus-common.h"
 
 #define BUS_EXEC_STATUS_INTERFACE(prefix)                               \
         "  <property name=\"" prefix "StartTimestamp\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"KillSignal\" type=\"i\" access=\"read\"/>\n" \
         "  <property name=\"UtmpIdentifier\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"ControlGroupModify\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"ControlGroupPersistent\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"PrivateNetwork\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"IgnoreSIGPIPE\" type=\"b\" access=\"read\"/>\n"
+        "  <property name=\"PrivateNetwork\" type=\"b\" access=\"read\"/>\n"
 
 #define BUS_EXEC_COMMAND_INTERFACE(name)                             \
         "  <property name=\"" name "\" type=\"a(sasbttuii)\" access=\"read\"/>\n"
 
-extern const BusProperty bus_exec_context_properties[];
+#define BUS_EXEC_CONTEXT_PROPERTIES(interface, context)                 \
+        { interface, "Environment",                   bus_property_append_strv,   "as",    (context).environment                   }, \
+        { interface, "EnvironmentFiles",              bus_execute_append_env_files, "a(sb)", (context).environment_files           }, \
+        { interface, "UMask",                         bus_property_append_mode,   "u",     &(context).umask                        }, \
+        { interface, "LimitCPU",                      bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitFSIZE",                    bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitDATA",                     bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitSTACK",                    bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitCORE",                     bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitRSS",                      bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitNOFILE",                   bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitAS",                       bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitNPROC",                    bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitMEMLOCK",                  bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitLOCKS",                    bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitSIGPENDING",               bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitMSGQUEUE",                 bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitNICE",                     bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitRTPRIO",                   bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "LimitRTTIME",                   bus_execute_append_rlimits, "t",     &(context)                              }, \
+        { interface, "WorkingDirectory",              bus_property_append_string, "s",     (context).working_directory             }, \
+        { interface, "RootDirectory",                 bus_property_append_string, "s",     (context).root_directory                }, \
+        { interface, "OOMScoreAdjust",                bus_execute_append_oom_score_adjust, "i", &(context)                         }, \
+        { interface, "Nice",                          bus_execute_append_nice,    "i",     &(context)                              }, \
+        { interface, "IOScheduling",                  bus_execute_append_ioprio,  "i",     &(context)                              }, \
+        { interface, "CPUSchedulingPolicy",           bus_execute_append_cpu_sched_policy, "i", &(context)                         }, \
+        { interface, "CPUSchedulingPriority",         bus_execute_append_cpu_sched_priority, "i", &(context)                       }, \
+        { interface, "CPUAffinity",                   bus_execute_append_affinity,"ay",    &(context)                              }, \
+        { interface, "TimerSlackNSec",                bus_execute_append_timer_slack_nsec, "t", &(context)                         }, \
+        { interface, "CPUSchedulingResetOnFork",      bus_property_append_bool,   "b",     &(context).cpu_sched_reset_on_fork      }, \
+        { interface, "NonBlocking",                   bus_property_append_bool,   "b",     &(context).non_blocking                 }, \
+        { interface, "StandardInput",                 bus_execute_append_input,   "s",     &(context).std_input                    }, \
+        { interface, "StandardOutput",                bus_execute_append_output,  "s",     &(context).std_output                   }, \
+        { interface, "StandardError",                 bus_execute_append_output,  "s",     &(context).std_error                    }, \
+        { interface, "TTYPath",                       bus_property_append_string, "s",     (context).tty_path                      }, \
+        { interface, "TTYReset",                      bus_property_append_bool,   "b",     &(context).tty_reset                    }, \
+        { interface, "TTYVHangup",                    bus_property_append_bool,   "b",     &(context).tty_vhangup                  }, \
+        { interface, "TTYVTDisallocate",              bus_property_append_bool,   "b",     &(context).tty_vt_disallocate           }, \
+        { interface, "SyslogPriority",                bus_property_append_int,    "i",     &(context).syslog_priority              }, \
+        { interface, "SyslogIdentifier",              bus_property_append_string, "s",     (context).syslog_identifier             }, \
+        { interface, "SyslogLevelPrefix",             bus_property_append_bool,   "b",     &(context).syslog_level_prefix          }, \
+        { interface, "Capabilities",                  bus_execute_append_capabilities, "s",&(context)                              }, \
+        { interface, "SecureBits",                    bus_property_append_int,    "i",     &(context).secure_bits                  }, \
+        { interface, "CapabilityBoundingSet",         bus_execute_append_capability_bs, "t", &(context).capability_bounding_set_drop }, \
+        { interface, "User",                          bus_property_append_string, "s",     (context).user                          }, \
+        { interface, "Group",                         bus_property_append_string, "s",     (context).group                         }, \
+        { interface, "SupplementaryGroups",           bus_property_append_strv,   "as",    (context).supplementary_groups          }, \
+        { interface, "TCPWrapName",                   bus_property_append_string, "s",     (context).tcpwrap_name                  }, \
+        { interface, "PAMName",                       bus_property_append_string, "s",     (context).pam_name                      }, \
+        { interface, "ReadWriteDirectories",          bus_property_append_strv,   "as",    (context).read_write_dirs               }, \
+        { interface, "ReadOnlyDirectories",           bus_property_append_strv,   "as",    (context).read_only_dirs                }, \
+        { interface, "InaccessibleDirectories",       bus_property_append_strv,   "as",    (context).inaccessible_dirs             }, \
+        { interface, "MountFlags",                    bus_property_append_ul,     "t",     &(context).mount_flags                  }, \
+        { interface, "PrivateTmp",                    bus_property_append_bool,   "b",     &(context).private_tmp                  }, \
+        { interface, "PrivateNetwork",                bus_property_append_bool,   "b",     &(context).private_network              }, \
+        { interface, "SameProcessGroup",              bus_property_append_bool,   "b",     &(context).same_pgrp                    }, \
+        { interface, "KillMode",                      bus_execute_append_kill_mode, "s",   &(context).kill_mode                    }, \
+        { interface, "KillSignal",                    bus_property_append_int,    "i",     &(context).kill_signal                  }, \
+        { interface, "UtmpIdentifier",                bus_property_append_string, "s",     (context).utmp_id                       }, \
+        { interface, "ControlGroupModify",            bus_property_append_bool,   "b",     &(context).control_group_modify         }
 
-#define BUS_EXEC_COMMAND_PROPERTY(name, command, indirect)             \
-        { name, bus_execute_append_command, "a(sasbttttuii)", (command), (indirect), NULL }
+#define BUS_EXEC_STATUS_PROPERTIES(interface, estatus, prefix)           \
+        { interface, prefix "StartTimestamp",         bus_property_append_usec,   "t",     &(estatus).start_timestamp.realtime     }, \
+        { interface, prefix "StartTimestampMonotonic",bus_property_append_usec,   "t",     &(estatus).start_timestamp.monotonic    }, \
+        { interface, prefix "ExitTimestamp",          bus_property_append_usec,   "t",     &(estatus).start_timestamp.realtime     }, \
+        { interface, prefix "ExitTimestampMonotonic", bus_property_append_usec,   "t",     &(estatus).start_timestamp.monotonic    }, \
+        { interface, prefix "PID",                    bus_property_append_pid,    "u",     &(estatus).pid                          }, \
+        { interface, prefix "Code",                   bus_property_append_int,    "i",     &(estatus).code                         }, \
+        { interface, prefix "Status",                 bus_property_append_int,    "i",     &(estatus).status                       }
+
+#define BUS_EXEC_COMMAND_PROPERTY(interface, command, name)             \
+        { interface, name, bus_execute_append_command, "a(sasbttttuii)", (command) }
 
 int bus_execute_append_output(DBusMessageIter *i, const char *property, void *data);
 int bus_execute_append_input(DBusMessageIter *i, const char *property, void *data);
index ab6d610..2308be3 100644 (file)
@@ -71,7 +71,7 @@ static int bus_job_append_unit(DBusMessageIter *i, const char *property, void *d
         if (!(p = unit_dbus_path(j->unit)))
                 return -ENOMEM;
 
-        if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &j->unit->id) ||
+        if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &j->unit->meta.id) ||
             !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) {
                 free(p);
                 return -ENOMEM;
@@ -85,15 +85,15 @@ static int bus_job_append_unit(DBusMessageIter *i, const char *property, void *d
         return 0;
 }
 
-static const BusProperty bus_job_properties[] = {
-        { "Id",      bus_property_append_uint32, "u", offsetof(Job, id)    },
-        { "State",   bus_job_append_state,       "s", offsetof(Job, state) },
-        { "JobType", bus_job_append_type,        "s", offsetof(Job, type)  },
-        { "Unit",    bus_job_append_unit,     "(so)", 0 },
-        { NULL, }
-};
-
 static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connection, DBusMessage *message) {
+        const BusProperty properties[] = {
+                { "org.freedesktop.systemd1.Job", "Id",      bus_property_append_uint32, "u",    &j->id    },
+                { "org.freedesktop.systemd1.Job", "State",   bus_job_append_state,       "s",    &j->state },
+                { "org.freedesktop.systemd1.Job", "JobType", bus_job_append_type,        "s",    &j->type  },
+                { "org.freedesktop.systemd1.Job", "Unit",    bus_job_append_unit,        "(so)", j         },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusMessage *reply = NULL;
 
         if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Job", "Cancel")) {
@@ -102,13 +102,8 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec
 
                 job_finish_and_invalidate(j, JOB_CANCELED);
 
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.systemd1.Job", bus_job_properties, j },
-                        { NULL, }
-                };
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(connection, reply, NULL))
index 6d272cb..7b68156 100644 (file)
@@ -491,52 +491,46 @@ static int bus_manager_send_unit_files_changed(Manager *m) {
         return r;
 }
 
-static const char systemd_property_string[] = PACKAGE_STRING "\0" DISTRIBUTION "\0" SYSTEMD_FEATURES;
-
-static const BusProperty bus_systemd_properties[] = {
-        { "Version",       bus_property_append_string,    "s",  0                                             },
-        { "Distribution",  bus_property_append_string,    "s",  sizeof(PACKAGE_STRING)                        },
-        { "Features",      bus_property_append_string,    "s",  sizeof(PACKAGE_STRING) + sizeof(DISTRIBUTION) },
-        { NULL, }
-};
+static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
+        Manager *m = data;
 
-static const BusProperty bus_manager_properties[] = {
-        { "RunningAs",     bus_manager_append_running_as,          "s", offsetof(Manager, running_as)                  },
-        { "Tainted",       bus_manager_append_tainted,             "s", 0 },
-        { "InitRDTimestamp", bus_property_append_uint64,           "t", offsetof(Manager, initrd_timestamp.realtime)   },
-        { "InitRDTimestampMonotonic", bus_property_append_uint64,  "t", offsetof(Manager, initrd_timestamp.monotonic)  },
-        { "StartupTimestamp", bus_property_append_uint64,          "t", offsetof(Manager, startup_timestamp.realtime)  },
-        { "StartupTimestampMonotonic", bus_property_append_uint64, "t", offsetof(Manager, startup_timestamp.monotonic) },
-        { "FinishTimestamp", bus_property_append_uint64,           "t", offsetof(Manager, finish_timestamp.realtime)   },
-        { "FinishTimestampMonotonic", bus_property_append_uint64,  "t", offsetof(Manager, finish_timestamp.monotonic)  },
-        { "LogLevel",      bus_manager_append_log_level,           "s", 0,                                             0, bus_manager_set_log_level },
-        { "LogTarget",     bus_manager_append_log_target,          "s", 0,                                             0, bus_manager_set_log_target },
-        { "NNames",        bus_manager_append_n_names,             "u", 0 },
-        { "NJobs",         bus_manager_append_n_jobs,              "u", 0 },
-        { "NInstalledJobs",bus_property_append_uint32,             "u", offsetof(Manager, n_installed_jobs)            },
-        { "NFailedJobs",   bus_property_append_uint32,             "u", offsetof(Manager, n_failed_jobs)               },
-        { "Progress",      bus_manager_append_progress,            "d", 0 },
-        { "Environment",   bus_property_append_strv,              "as", offsetof(Manager, environment),                true },
-        { "ConfirmSpawn",  bus_property_append_bool,               "b", offsetof(Manager, confirm_spawn)               },
-        { "ShowStatus",    bus_property_append_bool,               "b", offsetof(Manager, show_status)                 },
-        { "UnitPath",      bus_property_append_strv,              "as", offsetof(Manager, lookup_paths.unit_path),     true },
-        { "NotifySocket",  bus_property_append_string,             "s", offsetof(Manager, notify_socket),              true },
-        { "ControlGroupHierarchy", bus_property_append_string,     "s", offsetof(Manager, cgroup_hierarchy),           true },
-        { "MountAuto",     bus_property_append_bool,               "b", offsetof(Manager, mount_auto)                  },
-        { "SwapAuto",      bus_property_append_bool,               "b", offsetof(Manager, swap_auto)                   },
-        { "DefaultControllers", bus_property_append_strv,         "as", offsetof(Manager, default_controllers),        true },
-        { "DefaultStandardOutput", bus_manager_append_exec_output, "s", offsetof(Manager, default_std_output)          },
-        { "DefaultStandardError",  bus_manager_append_exec_output, "s", offsetof(Manager, default_std_error)           },
+        const BusProperty properties[] = {
+                { "org.freedesktop.systemd1.Manager", "Version",       bus_property_append_string,    "s",  PACKAGE_STRING     },
+                { "org.freedesktop.systemd1.Manager", "Distribution",  bus_property_append_string,    "s",  DISTRIBUTION       },
+                { "org.freedesktop.systemd1.Manager", "Features",      bus_property_append_string,    "s",  SYSTEMD_FEATURES   },
+                { "org.freedesktop.systemd1.Manager", "RunningAs",     bus_manager_append_running_as, "s",  &m->running_as     },
+                { "org.freedesktop.systemd1.Manager", "Tainted",       bus_manager_append_tainted,    "s",  m                  },
+                { "org.freedesktop.systemd1.Manager", "InitRDTimestamp", bus_property_append_uint64,  "t",  &m->initrd_timestamp.realtime },
+                { "org.freedesktop.systemd1.Manager", "InitRDTimestampMonotonic", bus_property_append_uint64, "t", &m->initrd_timestamp.monotonic },
+                { "org.freedesktop.systemd1.Manager", "StartupTimestamp", bus_property_append_uint64, "t",  &m->startup_timestamp.realtime },
+                { "org.freedesktop.systemd1.Manager", "StartupTimestampMonotonic", bus_property_append_uint64, "t", &m->startup_timestamp.monotonic },
+                { "org.freedesktop.systemd1.Manager", "FinishTimestamp", bus_property_append_uint64,  "t",  &m->finish_timestamp.realtime },
+                { "org.freedesktop.systemd1.Manager", "FinishTimestampMonotonic", bus_property_append_uint64, "t",&m->finish_timestamp.monotonic },
+                { "org.freedesktop.systemd1.Manager", "LogLevel",      bus_manager_append_log_level,  "s",  m, bus_manager_set_log_level },
+                { "org.freedesktop.systemd1.Manager", "LogTarget",     bus_manager_append_log_target, "s",  m, bus_manager_set_log_target },
+                { "org.freedesktop.systemd1.Manager", "NNames",        bus_manager_append_n_names,    "u",  m                  },
+                { "org.freedesktop.systemd1.Manager", "NJobs",         bus_manager_append_n_jobs,     "u",  m                  },
+                { "org.freedesktop.systemd1.Manager", "NInstalledJobs",bus_property_append_uint32,    "u",  &m->n_installed_jobs },
+                { "org.freedesktop.systemd1.Manager", "NFailedJobs",   bus_property_append_uint32,    "u",  &m->n_failed_jobs  },
+                { "org.freedesktop.systemd1.Manager", "Progress",      bus_manager_append_progress,   "d",  m                  },
+                { "org.freedesktop.systemd1.Manager", "Environment",   bus_property_append_strv,      "as", m->environment     },
+                { "org.freedesktop.systemd1.Manager", "ConfirmSpawn",  bus_property_append_bool,      "b",  &m->confirm_spawn  },
+                { "org.freedesktop.systemd1.Manager", "ShowStatus",    bus_property_append_bool,      "b",  &m->show_status    },
+                { "org.freedesktop.systemd1.Manager", "UnitPath",      bus_property_append_strv,      "as", m->lookup_paths.unit_path },
+                { "org.freedesktop.systemd1.Manager", "NotifySocket",  bus_property_append_string,    "s",  m->notify_socket   },
+                { "org.freedesktop.systemd1.Manager", "ControlGroupHierarchy", bus_property_append_string, "s", m->cgroup_hierarchy },
+                { "org.freedesktop.systemd1.Manager", "MountAuto",     bus_property_append_bool,      "b",  &m->mount_auto     },
+                { "org.freedesktop.systemd1.Manager", "SwapAuto",      bus_property_append_bool,      "b",  &m->swap_auto      },
+                { "org.freedesktop.systemd1.Manager", "DefaultControllers", bus_property_append_strv, "as", m->default_controllers },
+                { "org.freedesktop.systemd1.Manager", "DefaultStandardOutput", bus_manager_append_exec_output, "s", &m->default_std_output },
+                { "org.freedesktop.systemd1.Manager", "DefaultStandardError",  bus_manager_append_exec_output, "s", &m->default_std_error  },
 #ifdef HAVE_SYSV_COMPAT
-        { "SysVConsole",   bus_property_append_bool,               "b", offsetof(Manager, sysv_console)                },
-        { "SysVInitPath",  bus_property_append_strv,              "as", offsetof(Manager, lookup_paths.sysvinit_path), true },
-        { "SysVRcndPath",  bus_property_append_strv,              "as", offsetof(Manager, lookup_paths.sysvrcnd_path), true },
+                { "org.freedesktop.systemd1.Manager", "SysVConsole",   bus_property_append_bool,      "b",  &m->sysv_console   },
+                { "org.freedesktop.systemd1.Manager", "SysVInitPath",  bus_property_append_strv,      "as", m->lookup_paths.sysvinit_path },
+                { "org.freedesktop.systemd1.Manager", "SysVRcndPath",  bus_property_append_strv,      "as", m->lookup_paths.sysvrcnd_path },
 #endif
-        { NULL, }
-};
-
-static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, DBusMessage *message, void *data) {
-        Manager *m = data;
+                { NULL, NULL, NULL, NULL, NULL }
+        };
 
         int r;
         DBusError error;
@@ -783,39 +777,39 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                         uint32_t job_id;
                         Unit *f;
 
-                        if (k != u->id)
+                        if (k != u->meta.id)
                                 continue;
 
                         if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2))
                                 goto oom;
 
                         description = unit_description(u);
-                        load_state = unit_load_state_to_string(u->load_state);
+                        load_state = unit_load_state_to_string(u->meta.load_state);
                         active_state = unit_active_state_to_string(unit_active_state(u));
                         sub_state = unit_sub_state_to_string(u);
 
                         f = unit_following(u);
-                        following = f ? f->id : "";
+                        following = f ? f->meta.id : "";
 
                         if (!(u_path = unit_dbus_path(u)))
                                 goto oom;
 
-                        if (u->job) {
-                                job_id = (uint32_t) u->job->id;
+                        if (u->meta.job) {
+                                job_id = (uint32_t) u->meta.job->id;
 
-                                if (!(j_path = job_dbus_path(u->job))) {
+                                if (!(j_path = job_dbus_path(u->meta.job))) {
                                         free(u_path);
                                         goto oom;
                                 }
 
-                                sjob_type = job_type_to_string(u->job->type);
+                                sjob_type = job_type_to_string(u->meta.job->type);
                         } else {
                                 job_id = 0;
                                 j_path = u_path;
                                 sjob_type = "";
                         }
 
-                        if (!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &u->id) ||
+                        if (!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &u->meta.id) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &description) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &load_state) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &active_state) ||
@@ -826,13 +820,13 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &sjob_type) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_OBJECT_PATH, &j_path)) {
                                 free(u_path);
-                                if (u->job)
+                                if (u->meta.job)
                                         free(j_path);
                                 goto oom;
                         }
 
                         free(u_path);
-                        if (u->job)
+                        if (u->meta.job)
                                 free(j_path);
 
                         if (!dbus_message_iter_close_container(&sub, &sub2))
@@ -877,7 +871,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                         }
 
                         if (!dbus_message_iter_append_basic(&sub2, DBUS_TYPE_UINT32, &id) ||
-                            !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &j->unit->id) ||
+                            !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &j->unit->meta.id) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &type) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_STRING, &state) ||
                             !dbus_message_iter_append_basic(&sub2, DBUS_TYPE_OBJECT_PATH, &j_path) ||
@@ -1019,7 +1013,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                 HASHMAP_FOREACH_KEY(u, k, m->units, i) {
                         char *p;
 
-                        if (k != u->id)
+                        if (k != u->meta.id)
                                 continue;
 
                         if (!(p = bus_path_escape(k))) {
@@ -1422,14 +1416,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                 if (!reply)
                         goto oom;
 
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.systemd1.Manager", bus_systemd_properties, systemd_property_string },
-                        { "org.freedesktop.systemd1.Manager", bus_manager_properties, m },
-                        { NULL, }
-                };
-                return bus_default_message_handler(connection, message, NULL, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(connection, message, NULL, INTERFACES_LIST, properties);
 
         if (job_type != _JOB_TYPE_INVALID) {
                 const char *name, *smode, *old_name = NULL;
@@ -1459,8 +1447,8 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
 
                 if (old_name)
                         if (!(u = manager_get_unit(m, old_name)) ||
-                            !u->job ||
-                            u->job->type != JOB_START) {
+                            !u->meta.job ||
+                            u->meta.job->type != JOB_START) {
                                 dbus_set_error(&error, BUS_ERROR_NO_SUCH_JOB, "No job queued for unit %s", old_name);
                                 return bus_send_error_reply(connection, message, &error, -ENOENT);
                         }
@@ -1481,10 +1469,10 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
                                 job_type = JOB_RELOAD;
                 }
 
-                if ((job_type == JOB_START && u->refuse_manual_start) ||
-                    (job_type == JOB_STOP && u->refuse_manual_stop) ||
+                if ((job_type == JOB_START && u->meta.refuse_manual_start) ||
+                    (job_type == JOB_STOP && u->meta.refuse_manual_stop) ||
                     ((job_type == JOB_RESTART || job_type == JOB_TRY_RESTART) &&
-                     (u->refuse_manual_start || u->refuse_manual_stop))) {
+                     (u->meta.refuse_manual_start || u->meta.refuse_manual_stop))) {
                         dbus_set_error(&error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, may be requested by dependency only.");
                         return bus_send_error_reply(connection, message, &error, -EPERM);
                 }
index 35d6ea7..cfbfd45 100644 (file)
@@ -39,7 +39,6 @@
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -65,8 +64,7 @@ const char bus_mount_invalidating_properties[] =
         "ExecMount\0"
         "ExecUnmount\0"
         "ExecRemount\0"
-        "ControlPID\0"
-        "Result\0";
+        "ControlPID\0";
 
 static int bus_mount_append_what(DBusMessageIter *i, const char *property, void *data) {
         Mount *m = data;
@@ -137,32 +135,23 @@ static int bus_mount_append_type(DBusMessageIter *i, const char *property, void
         return 0;
 }
 
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_mount_append_mount_result, mount_result, MountResult);
-
-static const BusProperty bus_mount_properties[] = {
-        { "Where",         bus_property_append_string, "s", offsetof(Mount, where),    true },
-        { "What",          bus_mount_append_what,      "s", 0 },
-        { "Options",       bus_mount_append_options,   "s", 0 },
-        { "Type",          bus_mount_append_type,      "s", 0 },
-        { "TimeoutUSec",   bus_property_append_usec,   "t", offsetof(Mount, timeout_usec)   },
-        BUS_EXEC_COMMAND_PROPERTY("ExecMount",   offsetof(Mount, exec_command[MOUNT_EXEC_MOUNT]),   false),
-        BUS_EXEC_COMMAND_PROPERTY("ExecUnmount", offsetof(Mount, exec_command[MOUNT_EXEC_UNMOUNT]), false),
-        BUS_EXEC_COMMAND_PROPERTY("ExecRemount", offsetof(Mount, exec_command[MOUNT_EXEC_REMOUNT]), false),
-        { "ControlPID",    bus_property_append_pid,    "u", offsetof(Mount, control_pid)    },
-        { "DirectoryMode", bus_property_append_mode,   "u", offsetof(Mount, directory_mode) },
-        { "Result",        bus_mount_append_mount_result, "s", offsetof(Mount, result)      },
-        { NULL, }
-};
-
 DBusHandlerResult bus_mount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Mount *m = MOUNT(u);
 
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",  bus_unit_properties,         u },
-                { "org.freedesktop.systemd1.Mount", bus_mount_properties,        m },
-                { "org.freedesktop.systemd1.Mount", bus_exec_context_properties, &m->exec_context },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Mount", "Where",         bus_property_append_string, "s", u->mount.where           },
+                { "org.freedesktop.systemd1.Mount", "What",          bus_mount_append_what,      "s", u                        },
+                { "org.freedesktop.systemd1.Mount", "Options",       bus_mount_append_options,   "s", u                        },
+                { "org.freedesktop.systemd1.Mount", "Type",          bus_mount_append_type,      "s", u                        },
+                { "org.freedesktop.systemd1.Mount", "TimeoutUSec",   bus_property_append_usec,   "t", &u->mount.timeout_usec   },
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Mount", u->mount.exec_command+MOUNT_EXEC_MOUNT,   "ExecMount"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Mount", u->mount.exec_command+MOUNT_EXEC_UNMOUNT, "ExecUnmount"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Mount", u->mount.exec_command+MOUNT_EXEC_REMOUNT, "ExecRemount"),
+                BUS_EXEC_CONTEXT_PROPERTIES("org.freedesktop.systemd1.Mount", u->mount.exec_context),
+                { "org.freedesktop.systemd1.Mount", "ControlPID",    bus_property_append_pid,    "u", &u->mount.control_pid    },
+                { "org.freedesktop.systemd1.Mount", "DirectoryMode", bus_property_append_mode,   "u", &u->mount.directory_mode },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps );
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index 5506784..1523879 100644 (file)
@@ -32,7 +32,6 @@
         "  <property name=\"Paths\" type=\"a(ss)\" access=\"read\"/>\n" \
         "  <property name=\"MakeDirectory\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"DirectoryMode\" type=\"u\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -51,9 +50,6 @@
 
 const char bus_path_interface[] _introspect_("Path") = BUS_PATH_INTERFACE;
 
-const char bus_path_invalidating_properties[] =
-        "Result\0";
-
 static int bus_path_append_paths(DBusMessageIter *i, const char *property, void *data) {
         Path *p = data;
         DBusMessageIter sub, sub2;
@@ -84,36 +80,26 @@ static int bus_path_append_paths(DBusMessageIter *i, const char *property, void
 
 static int bus_path_append_unit(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
-        Path *p = PATH(u);
         const char *t;
 
         assert(i);
         assert(property);
         assert(u);
 
-        t = UNIT_DEREF(p->unit) ? UNIT_DEREF(p->unit)->id : "";
+        t = u->path.unit ? u->path.unit->meta.id : "";
 
         return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
 }
 
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_path_append_path_result, path_result, PathResult);
-
-static const BusProperty bus_path_properties[] = {
-        { "Unit",          bus_path_append_unit,      "s", 0 },
-        { "Paths",         bus_path_append_paths, "a(ss)", 0 },
-        { "MakeDirectory", bus_property_append_bool,  "b", offsetof(Path, make_directory) },
-        { "DirectoryMode", bus_property_append_mode,  "u", offsetof(Path, directory_mode) },
-        { "Result",        bus_path_append_path_result, "s", offsetof(Path, result) },
-        { NULL, }
-};
-
 DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Path *p = PATH(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit", bus_unit_properties, u },
-                { "org.freedesktop.systemd1.Path", bus_path_properties, p },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Path", "Unit",          bus_path_append_unit,     "s",     u                        },
+                { "org.freedesktop.systemd1.Path", "Paths",         bus_path_append_paths,    "a(ss)", u                        },
+                { "org.freedesktop.systemd1.Path", "MakeDirectory", bus_property_append_bool, "b",     &u->path.make_directory  },
+                { "org.freedesktop.systemd1.Path", "DirectoryMode", bus_property_append_mode, "u",     &u->path.directory_mode  },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index 2888400..f825e13 100644 (file)
@@ -30,6 +30,4 @@ DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessa
 
 extern const char bus_path_interface[];
 
-extern const char bus_path_invalidating_properties[];
-
 #endif
index 7809164..3486623 100644 (file)
         "  <property name=\"NotifyAccess\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"RestartUSec\" type=\"t\" access=\"read\"/>\n" \
         "  <property name=\"TimeoutUSec\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"WatchdogUSec\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"WatchdogTimestamp\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"WatchdogTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"StartLimitInterval\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"StartLimitBurst\" type=\"u\" access=\"read\"/>\n" \
-        "  <property name=\"StartLimitAction\" type=\"s\" access=\"read\"/>\n" \
         BUS_EXEC_COMMAND_INTERFACE("ExecStartPre")                      \
         BUS_EXEC_COMMAND_INTERFACE("ExecStart")                         \
         BUS_EXEC_COMMAND_INTERFACE("ExecStartPost")                     \
@@ -65,8 +59,8 @@
         "  <property name=\"BusName\" type=\"s\" access=\"read\"/>\n"   \
         "  <property name=\"StatusText\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"FsckPassNo\" type=\"i\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
-        BUS_SERVICE_SYSV_INTERFACE_FRAGMENT                             \
+        "  <property name=\"Sockets\" type=\"as\" access=\"read\"/>\n" \
+        BUS_SERVICE_SYSV_INTERFACE_FRAGMENT                              \
        " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -93,76 +87,48 @@ const char bus_service_invalidating_properties[] =
         "ExecStop\0"
         "ExecStopPost\0"
         "ExecMain\0"
-        "WatchdogTimestamp\0"
-        "WatchdogTimestampMonotonic\0"
         "MainPID\0"
         "ControlPID\0"
-        "StatusText\0"
-        "Result\0";
+        "StatusText\0";
 
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_service_append_type, service_type, ServiceType);
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_service_append_restart, service_restart, ServiceRestart);
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_service_append_notify_access, notify_access, NotifyAccess);
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_service_append_service_result, service_result, ServiceResult);
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_service_append_start_limit_action, start_limit_action, StartLimitAction);
-
-static const BusProperty bus_exec_main_status_properties[] = {
-        { "ExecMainStartTimestamp",         bus_property_append_usec, "t", offsetof(ExecStatus, start_timestamp.realtime)  },
-        { "ExecMainStartTimestampMonotonic",bus_property_append_usec, "t", offsetof(ExecStatus, start_timestamp.monotonic) },
-        { "ExecMainExitTimestamp",          bus_property_append_usec, "t", offsetof(ExecStatus, start_timestamp.realtime)  },
-        { "ExecMainExitTimestampMonotonic", bus_property_append_usec, "t", offsetof(ExecStatus, start_timestamp.monotonic) },
-        { "ExecMainPID",                    bus_property_append_pid,  "u", offsetof(ExecStatus, pid)                       },
-        { "ExecMainCode",                   bus_property_append_int,  "i", offsetof(ExecStatus, code)                      },
-        { "ExecMainStatus",                 bus_property_append_int,  "i", offsetof(ExecStatus, status)                    },
-        { NULL, }
-};
-
-static const BusProperty bus_service_properties[] = {
-        { "Type",                   bus_service_append_type,          "s", offsetof(Service, type)                         },
-        { "Restart",                bus_service_append_restart,       "s", offsetof(Service, restart)                      },
-        { "PIDFile",                bus_property_append_string,       "s", offsetof(Service, pid_file),               true },
-        { "NotifyAccess",           bus_service_append_notify_access, "s", offsetof(Service, notify_access)                },
-        { "RestartUSec",            bus_property_append_usec,         "t", offsetof(Service, restart_usec)                 },
-        { "TimeoutUSec",            bus_property_append_usec,         "t", offsetof(Service, timeout_usec)                 },
-        { "WatchdogUSec",           bus_property_append_usec,         "t", offsetof(Service, watchdog_usec)                },
-        { "WatchdogTimestamp",      bus_property_append_usec,         "t", offsetof(Service, watchdog_timestamp.realtime)  },
-        { "WatchdogTimestampMonotonic",bus_property_append_usec,      "t", offsetof(Service, watchdog_timestamp.monotonic) },
-        { "StartLimitInterval",     bus_property_append_usec,         "t", offsetof(Service, start_limit.interval)         },
-        { "StartLimitBurst",        bus_property_append_uint32,       "u", offsetof(Service, start_limit.burst)            },
-        { "StartLimitAction",       bus_service_append_start_limit_action,"s", offsetof(Service, start_limit_action)       },
-        BUS_EXEC_COMMAND_PROPERTY("ExecStartPre",  offsetof(Service, exec_command[SERVICE_EXEC_START_PRE]),  true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStart",     offsetof(Service, exec_command[SERVICE_EXEC_START]),      true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStartPost", offsetof(Service, exec_command[SERVICE_EXEC_START_POST]), true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecReload",    offsetof(Service, exec_command[SERVICE_EXEC_RELOAD]),     true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStop",      offsetof(Service, exec_command[SERVICE_EXEC_STOP]),       true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStopPost",  offsetof(Service, exec_command[SERVICE_EXEC_STOP_POST]),  true ),
-        { "PermissionsStartOnly",   bus_property_append_bool,         "b", offsetof(Service, permissions_start_only)       },
-        { "RootDirectoryStartOnly", bus_property_append_bool,         "b", offsetof(Service, root_directory_start_only)    },
-        { "RemainAfterExit",        bus_property_append_bool,         "b", offsetof(Service, remain_after_exit)            },
-        { "GuessMainPID",           bus_property_append_bool,         "b", offsetof(Service, guess_main_pid)               },
-        { "MainPID",                bus_property_append_pid,          "u", offsetof(Service, main_pid)                     },
-        { "ControlPID",             bus_property_append_pid,          "u", offsetof(Service, control_pid)                  },
-        { "BusName",                bus_property_append_string,       "s", offsetof(Service, bus_name),               true },
-        { "StatusText",             bus_property_append_string,       "s", offsetof(Service, status_text),            true },
-#ifdef HAVE_SYSV_COMPAT
-        { "SysVRunLevels",          bus_property_append_string,       "s", offsetof(Service, sysv_runlevels),         true },
-        { "SysVStartPriority",      bus_property_append_int,          "i", offsetof(Service, sysv_start_priority)          },
-        { "SysVPath",               bus_property_append_string,       "s", offsetof(Service, sysv_path),              true },
-#endif
-        { "FsckPassNo",             bus_property_append_int,          "i", offsetof(Service, fsck_passno)                  },
-        { "Result",                 bus_service_append_service_result,"s", offsetof(Service, result)                       },
-        { NULL, }
-};
 
 DBusHandlerResult bus_service_message_handler(Unit *u, DBusConnection *connection, DBusMessage *message) {
-        Service *s = SERVICE(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",    bus_unit_properties,             u },
-                { "org.freedesktop.systemd1.Service", bus_service_properties,          s },
-                { "org.freedesktop.systemd1.Service", bus_exec_context_properties,     &s->exec_context },
-                { "org.freedesktop.systemd1.Service", bus_exec_main_status_properties, &s->main_exec_status },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Service", "Type",                   bus_service_append_type,    "s", &u->service.type                      },
+                { "org.freedesktop.systemd1.Service", "Restart",                bus_service_append_restart, "s", &u->service.restart                   },
+                { "org.freedesktop.systemd1.Service", "PIDFile",                bus_property_append_string, "s", u->service.pid_file                   },
+                { "org.freedesktop.systemd1.Service", "NotifyAccess",           bus_service_append_notify_access, "s", &u->service.notify_access       },
+                { "org.freedesktop.systemd1.Service", "RestartUSec",            bus_property_append_usec,   "t", &u->service.restart_usec              },
+                { "org.freedesktop.systemd1.Service", "TimeoutUSec",            bus_property_append_usec,   "t", &u->service.timeout_usec              },
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Service", u->service.exec_command[SERVICE_EXEC_START_PRE],  "ExecStartPre"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Service", u->service.exec_command[SERVICE_EXEC_START],      "ExecStart"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Service", u->service.exec_command[SERVICE_EXEC_START_POST], "ExecStartPost"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Service", u->service.exec_command[SERVICE_EXEC_RELOAD],     "ExecReload"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Service", u->service.exec_command[SERVICE_EXEC_STOP],       "ExecStop"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Service", u->service.exec_command[SERVICE_EXEC_STOP_POST],  "ExecStopPost"),
+                BUS_EXEC_CONTEXT_PROPERTIES("org.freedesktop.systemd1.Service", u->service.exec_context),
+                { "org.freedesktop.systemd1.Service", "PermissionsStartOnly",   bus_property_append_bool,   "b", &u->service.permissions_start_only    },
+                { "org.freedesktop.systemd1.Service", "RootDirectoryStartOnly", bus_property_append_bool,   "b", &u->service.root_directory_start_only },
+                { "org.freedesktop.systemd1.Service", "RemainAfterExit",        bus_property_append_bool,   "b", &u->service.remain_after_exit         },
+                { "org.freedesktop.systemd1.Service", "GuessMainPID",           bus_property_append_bool,   "b", &u->service.guess_main_pid            },
+               BUS_EXEC_STATUS_PROPERTIES("org.freedesktop.systemd1.Service", u->service.main_exec_status, "ExecMain"),
+                { "org.freedesktop.systemd1.Service", "MainPID",                bus_property_append_pid,    "u", &u->service.main_pid                  },
+                { "org.freedesktop.systemd1.Service", "ControlPID",             bus_property_append_pid,    "u", &u->service.control_pid               },
+                { "org.freedesktop.systemd1.Service", "BusName",                bus_property_append_string, "s", u->service.bus_name                   },
+                { "org.freedesktop.systemd1.Service", "StatusText",             bus_property_append_string, "s", u->service.status_text                },
+                { "org.freedesktop.systemd1.Service", "Sockets",                bus_unit_append_dependencies, "as", u->service.configured_sockets         },
+#ifdef HAVE_SYSV_COMPAT
+                { "org.freedesktop.systemd1.Service", "SysVRunLevels",          bus_property_append_string, "s", u->service.sysv_runlevels             },
+                { "org.freedesktop.systemd1.Service", "SysVStartPriority",      bus_property_append_int,    "i", &u->service.sysv_start_priority       },
+                { "org.freedesktop.systemd1.Service", "SysVPath",               bus_property_append_string, "s", u->service.sysv_path                  },
+#endif
+                { "org.freedesktop.systemd1.Service", "FsckPassNo",             bus_property_append_int,    "i", &u->service.fsck_passno               },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index e69388a..0c2f349 100644 (file)
 
 const char bus_snapshot_interface[] _introspect_("Snapshot") = BUS_SNAPSHOT_INTERFACE;
 
-static const BusProperty bus_snapshot_properties[] = {
-        { "Cleanup", bus_property_append_bool, "b", offsetof(Snapshot, cleanup) },
-        { NULL, }
-};
-
 DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Snapshot *s = SNAPSHOT(u);
+
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Snapshot", "Cleanup", bus_property_append_bool, "b", &u->snapshot.cleanup },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
 
         DBusMessage *reply = NULL;
         DBusError error;
@@ -65,14 +65,8 @@ DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusM
                 if (!(reply = dbus_message_new_method_return(message)))
                         goto oom;
 
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.systemd1.Unit",     bus_unit_properties,     u },
-                        { "org.freedesktop.systemd1.Snapshot", bus_snapshot_properties, s },
-                        { NULL, }
-                };
-                return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(c, reply, NULL))
index 9fef676..2a1a17d 100644 (file)
         "  <property name=\"FreeBind\" type=\"b\" access=\"read\"/>\n"  \
         "  <property name=\"Transparent\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"Broadcast\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"PassCredentials\" type=\"b\" access=\"read\"/>\n" \
         "  <property name=\"Mark\" type=\"i\" access=\"read\"/>\n"      \
         "  <property name=\"MaxConnections\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"NAccepted\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"NConnections\" type=\"u\" access=\"read\"/>\n" \
         "  <property name=\"MessageQueueMaxMessages\" type=\"x\" access=\"read\"/>\n" \
         "  <property name=\"MessageQueueMessageSize\" type=\"x\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"                                               \
 
 #define INTROSPECTION                                                   \
@@ -84,54 +82,45 @@ const char bus_socket_invalidating_properties[] =
         "ExecStopPost\0"
         "ControlPID\0"
         "NAccepted\0"
-        "NConnections\0"
-        "Result\0";
+        "NConnections\0";
 
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_socket_append_bind_ipv6_only, socket_address_bind_ipv6_only, SocketAddressBindIPv6Only);
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_socket_append_socket_result, socket_result, SocketResult);
-
-static const BusProperty bus_socket_properties[] = {
-        { "BindIPv6Only",   bus_socket_append_bind_ipv6_only,  "s", offsetof(Socket, bind_ipv6_only)  },
-        { "Backlog",        bus_property_append_unsigned,      "u", offsetof(Socket, backlog)         },
-        { "TimeoutUSec",    bus_property_append_usec,          "t", offsetof(Socket, timeout_usec)    },
-        BUS_EXEC_COMMAND_PROPERTY("ExecStartPre",  offsetof(Socket, exec_command[SOCKET_EXEC_START_PRE]),  true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStartPost", offsetof(Socket, exec_command[SOCKET_EXEC_START_POST]), true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStopPre",   offsetof(Socket, exec_command[SOCKET_EXEC_STOP_PRE]),   true ),
-        BUS_EXEC_COMMAND_PROPERTY("ExecStopPost",  offsetof(Socket, exec_command[SOCKET_EXEC_STOP_POST]),  true ),
-        { "ControlPID",     bus_property_append_pid,           "u", offsetof(Socket, control_pid)     },
-        { "BindToDevice",   bus_property_append_string,        "s", offsetof(Socket, bind_to_device), true },
-        { "DirectoryMode",  bus_property_append_mode,          "u", offsetof(Socket, directory_mode)  },
-        { "SocketMode",     bus_property_append_mode,          "u", offsetof(Socket, socket_mode)     },
-        { "Accept",         bus_property_append_bool,          "b", offsetof(Socket, accept)          },
-        { "KeepAlive",      bus_property_append_bool,          "b", offsetof(Socket, keep_alive)      },
-        { "Priority",       bus_property_append_int,           "i", offsetof(Socket, priority)        },
-        { "ReceiveBuffer",  bus_property_append_size,          "t", offsetof(Socket, receive_buffer)  },
-        { "SendBuffer",     bus_property_append_size,          "t", offsetof(Socket, send_buffer)     },
-        { "IPTOS",          bus_property_append_int,           "i", offsetof(Socket, ip_tos)          },
-        { "IPTTL",          bus_property_append_int,           "i", offsetof(Socket, ip_ttl)          },
-        { "PipeSize",       bus_property_append_size,          "t", offsetof(Socket, pipe_size)       },
-        { "FreeBind",       bus_property_append_bool,          "b", offsetof(Socket, free_bind)       },
-        { "Transparent",    bus_property_append_bool,          "b", offsetof(Socket, transparent)     },
-        { "Broadcast",      bus_property_append_bool,          "b", offsetof(Socket, broadcast)       },
-        { "PassCredentials",bus_property_append_bool,          "b", offsetof(Socket, pass_cred)       },
-        { "Mark",           bus_property_append_int,           "i", offsetof(Socket, mark)            },
-        { "MaxConnections", bus_property_append_unsigned,      "u", offsetof(Socket, max_connections) },
-        { "NConnections",   bus_property_append_unsigned,      "u", offsetof(Socket, n_connections)   },
-        { "NAccepted",      bus_property_append_unsigned,      "u", offsetof(Socket, n_accepted)      },
-        { "MessageQueueMaxMessages", bus_property_append_long, "x", offsetof(Socket, mq_maxmsg)       },
-        { "MessageQueueMessageSize", bus_property_append_long, "x", offsetof(Socket, mq_msgsize)      },
-        { "Result",         bus_socket_append_socket_result,   "s", offsetof(Socket, result)          },
-        { NULL, }
-};
 
 DBusHandlerResult bus_socket_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Socket *s = SOCKET(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",   bus_unit_properties,         u },
-                { "org.freedesktop.systemd1.Socket", bus_socket_properties,       s },
-                { "org.freedesktop.systemd1.Socket", bus_exec_context_properties, &s->exec_context },
-                { NULL, }
+
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Socket", "BindIPv6Only",   bus_socket_append_bind_ipv6_only, "s", &u->socket.bind_ipv6_only  },
+                { "org.freedesktop.systemd1.Socket", "Backlog",        bus_property_append_unsigned,     "u", &u->socket.backlog         },
+                { "org.freedesktop.systemd1.Socket", "TimeoutUSec",    bus_property_append_usec,         "t", &u->socket.timeout_usec    },
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Socket", u->service.exec_command[SOCKET_EXEC_START_PRE],  "ExecStartPre"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Socket", u->service.exec_command[SOCKET_EXEC_START_POST], "ExecStartPost"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Socket", u->service.exec_command[SOCKET_EXEC_STOP_PRE],   "ExecStopPre"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Socket", u->service.exec_command[SOCKET_EXEC_STOP_POST],  "ExecStopPost"),
+                BUS_EXEC_CONTEXT_PROPERTIES("org.freedesktop.systemd1.Socket", u->socket.exec_context),
+                { "org.freedesktop.systemd1.Socket", "ControlPID",     bus_property_append_pid,          "u", &u->socket.control_pid     },
+                { "org.freedesktop.systemd1.Socket", "BindToDevice",   bus_property_append_string,       "s", u->socket.bind_to_device   },
+                { "org.freedesktop.systemd1.Socket", "DirectoryMode",  bus_property_append_mode,         "u", &u->socket.directory_mode  },
+                { "org.freedesktop.systemd1.Socket", "SocketMode",     bus_property_append_mode,         "u", &u->socket.socket_mode     },
+                { "org.freedesktop.systemd1.Socket", "Accept",         bus_property_append_bool,         "b", &u->socket.accept          },
+                { "org.freedesktop.systemd1.Socket", "KeepAlive",      bus_property_append_bool,         "b", &u->socket.keep_alive      },
+                { "org.freedesktop.systemd1.Socket", "Priority",       bus_property_append_int,          "i", &u->socket.priority        },
+                { "org.freedesktop.systemd1.Socket", "ReceiveBuffer",  bus_property_append_size,         "t", &u->socket.receive_buffer  },
+                { "org.freedesktop.systemd1.Socket", "SendBuffer",     bus_property_append_size,         "t", &u->socket.send_buffer     },
+                { "org.freedesktop.systemd1.Socket", "IPTOS",          bus_property_append_int,          "i", &u->socket.ip_tos          },
+                { "org.freedesktop.systemd1.Socket", "IPTTL",          bus_property_append_int,          "i", &u->socket.ip_ttl          },
+                { "org.freedesktop.systemd1.Socket", "PipeSize",       bus_property_append_size,         "t", &u->socket.pipe_size       },
+                { "org.freedesktop.systemd1.Socket", "FreeBind",       bus_property_append_bool,         "b", &u->socket.free_bind       },
+                { "org.freedesktop.systemd1.Socket", "Transparent",    bus_property_append_bool,         "b", &u->socket.transparent     },
+                { "org.freedesktop.systemd1.Socket", "Broadcast",      bus_property_append_bool,         "b", &u->socket.broadcast       },
+                { "org.freedesktop.systemd1.Socket", "Mark",           bus_property_append_int,          "i", &u->socket.mark            },
+                { "org.freedesktop.systemd1.Socket", "MaxConnections", bus_property_append_unsigned,     "u", &u->socket.max_connections },
+                { "org.freedesktop.systemd1.Socket", "NConnections",   bus_property_append_unsigned,     "u", &u->socket.n_connections   },
+                { "org.freedesktop.systemd1.Socket", "NAccepted",      bus_property_append_unsigned,     "u", &u->socket.n_accepted      },
+                { "org.freedesktop.systemd1.Socket", "MessageQueueMaxMessages", bus_property_append_long,"x", &u->socket.mq_maxmsg       },
+                { "org.freedesktop.systemd1.Socket", "MessageQueueMessageSize", bus_property_append_long,"x", &u->socket.mq_msgsize      },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index 09cd1e8..988ca58 100644 (file)
@@ -36,7 +36,6 @@
         BUS_EXEC_COMMAND_INTERFACE("ExecDeactivate")                    \
         BUS_EXEC_CONTEXT_INTERFACE                                      \
         "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -60,8 +59,7 @@ const char bus_swap_invalidating_properties[] =
         "Priority\0"
         "ExecActivate\0"
         "ExecDeactivate\0"
-        "ControlPID\0"
-        "Result\0";
+        "ControlPID\0";
 
 static int bus_swap_append_priority(DBusMessageIter *i, const char *property, void *data) {
         Swap *s = data;
@@ -86,26 +84,17 @@ static int bus_swap_append_priority(DBusMessageIter *i, const char *property, vo
         return 0;
 }
 
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_swap_append_swap_result, swap_result, SwapResult);
-
-static const BusProperty bus_swap_properties[] = {
-        { "What",       bus_property_append_string, "s", offsetof(Swap, what),  true },
-        { "Priority",   bus_swap_append_priority,   "i", 0 },
-        BUS_EXEC_COMMAND_PROPERTY("ExecActivate",   offsetof(Swap, exec_command[SWAP_EXEC_ACTIVATE]),   false),
-        BUS_EXEC_COMMAND_PROPERTY("ExecDeactivate", offsetof(Swap, exec_command[SWAP_EXEC_DEACTIVATE]), false),
-        { "ControlPID", bus_property_append_pid,    "u", offsetof(Swap, control_pid) },
-        { "Result",     bus_swap_append_swap_result,"s", offsetof(Swap, result)      },
-        { NULL, }
-};
-
 DBusHandlerResult bus_swap_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Swap *s = SWAP(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit", bus_unit_properties,         u },
-                { "org.freedesktop.systemd1.Swap", bus_swap_properties,         s },
-                { "org.freedesktop.systemd1.Swap", bus_exec_context_properties, &s->exec_context },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Swap", "What",       bus_property_append_string, "s", u->swap.what          },
+                { "org.freedesktop.systemd1.Swap", "Priority",   bus_swap_append_priority,   "i", u                     },
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Swap", u->swap.exec_command+SWAP_EXEC_ACTIVATE,   "ExecActivate"),
+                BUS_EXEC_COMMAND_PROPERTY("org.freedesktop.systemd1.Swap", u->swap.exec_command+SWAP_EXEC_DEACTIVATE, "ExecDeactivate"),
+                BUS_EXEC_CONTEXT_PROPERTIES("org.freedesktop.systemd1.Swap", u->swap.exec_context),
+                { "org.freedesktop.systemd1.Swap", "ControlPID", bus_property_append_pid,    "u", &u->swap.control_pid },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index 55cf862..1e00f2d 100644 (file)
 const char bus_target_interface[] _introspect_("Target") = BUS_TARGET_INTERFACE;
 
 DBusHandlerResult bus_target_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit", bus_unit_properties, u },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index b396aed..abcbe6f 100644 (file)
@@ -31,7 +31,6 @@
         "  <property name=\"Unit\" type=\"s\" access=\"read\"/>\n"      \
         "  <property name=\"Timers\" type=\"a(stt)\" access=\"read\"/>\n" \
         "  <property name=\"NextElapseUSec\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"Result\" type=\"s\" access=\"read\"/>\n"    \
         " </interface>\n"
 
 #define INTROSPECTION                                                   \
@@ -52,8 +51,7 @@ const char bus_timer_interface[] _introspect_("Timer") = BUS_TIMER_INTERFACE;
 
 const char bus_timer_invalidating_properties[] =
         "Timers\0"
-        "NextElapseUSec\0"
-        "Result\0";
+        "NextElapseUSec\0";
 
 static int bus_timer_append_timers(DBusMessageIter *i, const char *property, void *data) {
         Timer *p = data;
@@ -103,35 +101,25 @@ static int bus_timer_append_timers(DBusMessageIter *i, const char *property, voi
 
 static int bus_timer_append_unit(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
-        Timer *timer = TIMER(u);
         const char *t;
 
         assert(i);
         assert(property);
         assert(u);
 
-        t = UNIT_DEREF(timer->unit) ? UNIT_DEREF(timer->unit)->id : "";
+        t = u->timer.unit ? u->timer.unit->meta.id : "";
 
         return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM;
 }
 
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_timer_append_timer_result, timer_result, TimerResult);
-
-static const BusProperty bus_timer_properties[] = {
-        { "Unit",           bus_timer_append_unit,        "s", 0 },
-        { "Timers",         bus_timer_append_timers, "a(stt)", 0 },
-        { "NextElapseUSec", bus_property_append_usec,     "t", offsetof(Timer, next_elapse) },
-        { "Result",         bus_timer_append_timer_result,"s", offsetof(Timer, result)      },
-        { NULL, }
-};
-
 DBusHandlerResult bus_timer_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
-        Timer *t = TIMER(u);
-        const BusBoundProperties bps[] = {
-                { "org.freedesktop.systemd1.Unit",  bus_unit_properties,  u },
-                { "org.freedesktop.systemd1.Timer", bus_timer_properties, t },
-                { NULL, }
+        const BusProperty properties[] = {
+                BUS_UNIT_PROPERTIES,
+                { "org.freedesktop.systemd1.Timer", "Unit",           bus_timer_append_unit,      "s",      u                      },
+                { "org.freedesktop.systemd1.Timer", "Timers",         bus_timer_append_timers,    "a(stt)", u                      },
+                { "org.freedesktop.systemd1.Timer", "NextElapseUSec", bus_property_append_usec,   "t",      &u->timer.next_elapse  },
+                { NULL, NULL, NULL, NULL, NULL }
         };
 
-        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+        return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, properties);
 }
index c7532c7..611a120 100644 (file)
@@ -40,7 +40,7 @@ const char bus_unit_interface[] _introspect_("Unit") = BUS_UNIT_INTERFACE;
         "Job\0"                                 \
         "NeedDaemonReload\0"
 
-static int bus_unit_append_names(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_names(DBusMessageIter *i, const char *property, void *data) {
         char *t;
         Iterator j;
         DBusMessageIter sub;
@@ -49,7 +49,7 @@ static int bus_unit_append_names(DBusMessageIter *i, const char *property, void
         if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "s", &sub))
                 return -ENOMEM;
 
-        SET_FOREACH(t, u->names, j)
+        SET_FOREACH(t, u->meta.names, j)
                 if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &t))
                         return -ENOMEM;
 
@@ -59,7 +59,7 @@ static int bus_unit_append_names(DBusMessageIter *i, const char *property, void
         return 0;
 }
 
-static int bus_unit_append_following(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_following(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data, *f;
         const char *d;
 
@@ -68,7 +68,7 @@ static int bus_unit_append_following(DBusMessageIter *i, const char *property, v
         assert(u);
 
         f = unit_following(u);
-        d = f ? f->id : "";
+        d = f ? f->meta.id : "";
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &d))
                 return -ENOMEM;
@@ -76,7 +76,7 @@ static int bus_unit_append_following(DBusMessageIter *i, const char *property, v
         return 0;
 }
 
-static int bus_unit_append_dependencies(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_dependencies(DBusMessageIter *i, const char *property, void *data) {
         Unit *u;
         Iterator j;
         DBusMessageIter sub;
@@ -86,7 +86,7 @@ static int bus_unit_append_dependencies(DBusMessageIter *i, const char *property
                 return -ENOMEM;
 
         SET_FOREACH(u, s, j)
-                if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &u->id))
+                if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &u->meta.id))
                         return -ENOMEM;
 
         if (!dbus_message_iter_close_container(i, &sub))
@@ -95,7 +95,7 @@ static int bus_unit_append_dependencies(DBusMessageIter *i, const char *property
         return 0;
 }
 
-static int bus_unit_append_description(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_description(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         const char *d;
 
@@ -111,9 +111,9 @@ static int bus_unit_append_description(DBusMessageIter *i, const char *property,
         return 0;
 }
 
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_load_state, unit_load_state, UnitLoadState);
+DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_unit_append_load_state, unit_load_state, UnitLoadState);
 
-static int bus_unit_append_active_state(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_active_state(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         const char *state;
 
@@ -129,7 +129,7 @@ static int bus_unit_append_active_state(DBusMessageIter *i, const char *property
         return 0;
 }
 
-static int bus_unit_append_sub_state(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_sub_state(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         const char *state;
 
@@ -145,7 +145,7 @@ static int bus_unit_append_sub_state(DBusMessageIter *i, const char *property, v
         return 0;
 }
 
-static int bus_unit_append_file_state(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_file_state(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         const char *state;
 
@@ -161,7 +161,7 @@ static int bus_unit_append_file_state(DBusMessageIter *i, const char *property,
         return 0;
 }
 
-static int bus_unit_append_can_start(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_can_start(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         dbus_bool_t b;
 
@@ -170,7 +170,7 @@ static int bus_unit_append_can_start(DBusMessageIter *i, const char *property, v
         assert(u);
 
         b = unit_can_start(u) &&
-                !u->refuse_manual_start;
+                !u->meta.refuse_manual_start;
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
                 return -ENOMEM;
@@ -178,7 +178,7 @@ static int bus_unit_append_can_start(DBusMessageIter *i, const char *property, v
         return 0;
 }
 
-static int bus_unit_append_can_stop(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_can_stop(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         dbus_bool_t b;
 
@@ -190,7 +190,7 @@ static int bus_unit_append_can_stop(DBusMessageIter *i, const char *property, vo
          * we can also stop */
 
         b = unit_can_start(u) &&
-                !u->refuse_manual_stop;
+                !u->meta.refuse_manual_stop;
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
                 return -ENOMEM;
@@ -198,7 +198,7 @@ static int bus_unit_append_can_stop(DBusMessageIter *i, const char *property, vo
         return 0;
 }
 
-static int bus_unit_append_can_reload(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_can_reload(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         dbus_bool_t b;
 
@@ -214,7 +214,7 @@ static int bus_unit_append_can_reload(DBusMessageIter *i, const char *property,
         return 0;
 }
 
-static int bus_unit_append_can_isolate(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_can_isolate(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         dbus_bool_t b;
 
@@ -223,7 +223,7 @@ static int bus_unit_append_can_isolate(DBusMessageIter *i, const char *property,
         assert(u);
 
         b = unit_can_isolate(u) &&
-                !u->refuse_manual_start;
+                !u->meta.refuse_manual_start;
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
                 return -ENOMEM;
@@ -231,7 +231,7 @@ static int bus_unit_append_can_isolate(DBusMessageIter *i, const char *property,
         return 0;
 }
 
-static int bus_unit_append_job(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_job(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         DBusMessageIter sub;
         char *p;
@@ -243,12 +243,12 @@ static int bus_unit_append_job(DBusMessageIter *i, const char *property, void *d
         if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub))
                 return -ENOMEM;
 
-        if (u->job) {
+        if (u->meta.job) {
 
-                if (!(p = job_dbus_path(u->job)))
+                if (!(p = job_dbus_path(u->meta.job)))
                         return -ENOMEM;
 
-                if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &u->job->id) ||
+                if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &u->meta.job->id) ||
                     !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) {
                         free(p);
                         return -ENOMEM;
@@ -278,7 +278,7 @@ static int bus_unit_append_job(DBusMessageIter *i, const char *property, void *d
         return 0;
 }
 
-static int bus_unit_append_default_cgroup(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_default_cgroup(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         char *t;
         CGroupBonding *cgb;
@@ -302,7 +302,7 @@ static int bus_unit_append_default_cgroup(DBusMessageIter *i, const char *proper
         return success ? 0 : -ENOMEM;
 }
 
-static int bus_unit_append_cgroups(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_cgroups(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         CGroupBonding *cgb;
         DBusMessageIter sub;
@@ -310,7 +310,7 @@ static int bus_unit_append_cgroups(DBusMessageIter *i, const char *property, voi
         if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "s", &sub))
                 return -ENOMEM;
 
-        LIST_FOREACH(by_unit, cgb, u->cgroup_bondings) {
+        LIST_FOREACH(by_unit, cgb, u->meta.cgroup_bondings) {
                 char *t;
                 bool success;
 
@@ -330,7 +330,7 @@ static int bus_unit_append_cgroups(DBusMessageIter *i, const char *property, voi
         return 0;
 }
 
-static int bus_unit_append_cgroup_attrs(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_cgroup_attrs(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         CGroupAttribute *a;
         DBusMessageIter sub, sub2;
@@ -338,7 +338,7 @@ static int bus_unit_append_cgroup_attrs(DBusMessageIter *i, const char *property
         if (!dbus_message_iter_open_container(i, DBUS_TYPE_ARRAY, "(sss)", &sub))
                 return -ENOMEM;
 
-        LIST_FOREACH(by_unit, a, u->cgroup_attributes) {
+        LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes) {
                 char *v = NULL;
                 bool success;
 
@@ -364,7 +364,7 @@ static int bus_unit_append_cgroup_attrs(DBusMessageIter *i, const char *property
         return 0;
 }
 
-static int bus_unit_append_need_daemon_reload(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_need_daemon_reload(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         dbus_bool_t b;
 
@@ -380,7 +380,7 @@ static int bus_unit_append_need_daemon_reload(DBusMessageIter *i, const char *pr
         return 0;
 }
 
-static int bus_unit_append_load_error(DBusMessageIter *i, const char *property, void *data) {
+int bus_unit_append_load_error(DBusMessageIter *i, const char *property, void *data) {
         Unit *u = data;
         const char *name, *message;
         DBusMessageIter sub;
@@ -389,9 +389,9 @@ static int bus_unit_append_load_error(DBusMessageIter *i, const char *property,
         assert(property);
         assert(u);
 
-        if (u->load_error != 0) {
-                name = bus_errno_to_dbus(u->load_error);
-                message = strempty(strerror(-u->load_error));
+        if (u->meta.load_error != 0) {
+                name = bus_errno_to_dbus(u->meta.load_error);
+                message = strempty(strerror(-u->meta.load_error));
         } else
                 name = message = "";
 
@@ -406,7 +406,7 @@ static int bus_unit_append_load_error(DBusMessageIter *i, const char *property,
 
 static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *connection, DBusMessage *message) {
         DBusMessage *reply = NULL;
-        Manager *m = u->manager;
+        Manager *m = u->meta.manager;
         DBusError error;
         JobType job_type = _JOB_TYPE_INVALID;
         char *path = NULL;
@@ -489,10 +489,10 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *conn
                 Job *j;
                 int r;
 
-                if ((job_type == JOB_START && u->refuse_manual_start) ||
-                    (job_type == JOB_STOP && u->refuse_manual_stop) ||
+                if ((job_type == JOB_START && u->meta.refuse_manual_start) ||
+                    (job_type == JOB_STOP && u->meta.refuse_manual_stop) ||
                     ((job_type == JOB_RESTART || job_type == JOB_TRY_RESTART) &&
-                     (u->refuse_manual_start || u->refuse_manual_stop))) {
+                     (u->meta.refuse_manual_start || u->meta.refuse_manual_stop))) {
                         dbus_set_error(&error, BUS_ERROR_ONLY_BY_DEPENDENCY, "Operation refused, may be requested by dependency only.");
                         return bus_send_error_reply(connection, message, &error, -EPERM);
                 }
@@ -594,7 +594,7 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DB
                         HASHMAP_FOREACH_KEY(u, k, m->units, i) {
                                 char *p;
 
-                                if (k != u->id)
+                                if (k != u->meta.id)
                                         continue;
 
                                 if (!(p = bus_path_escape(k))) {
@@ -673,23 +673,23 @@ void bus_unit_send_change_signal(Unit *u) {
 
         assert(u);
 
-        if (u->in_dbus_queue) {
-                LIST_REMOVE(Unit, dbus_queue, u->manager->dbus_unit_queue, u);
-                u->in_dbus_queue = false;
+        if (u->meta.in_dbus_queue) {
+                LIST_REMOVE(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
+                u->meta.in_dbus_queue = false;
         }
 
-        if (!u->id)
+        if (!u->meta.id)
                 return;
 
-        if (!bus_has_subscriber(u->manager)) {
-                u->sent_dbus_new_signal = true;
+        if (!bus_has_subscriber(u->meta.manager)) {
+                u->meta.sent_dbus_new_signal = true;
                 return;
         }
 
         if (!(p = unit_dbus_path(u)))
                 goto oom;
 
-        if (u->sent_dbus_new_signal) {
+        if (u->meta.sent_dbus_new_signal) {
                 /* Send a properties changed signal. First for the
                  * specific type, then for the generic unit. The
                  * clients may rely on this order to get atomic
@@ -702,7 +702,7 @@ void bus_unit_send_change_signal(Unit *u) {
                                                              UNIT_VTABLE(u)->bus_invalidating_properties)))
                                 goto oom;
 
-                        if (bus_broadcast(u->manager, m) < 0)
+                        if (bus_broadcast(u->meta.manager, m) < 0)
                                 goto oom;
 
                         dbus_message_unref(m);
@@ -718,19 +718,19 @@ void bus_unit_send_change_signal(Unit *u) {
                         goto oom;
 
                 if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &u->id,
+                                              DBUS_TYPE_STRING, &u->meta.id,
                                               DBUS_TYPE_OBJECT_PATH, &p,
                                               DBUS_TYPE_INVALID))
                         goto oom;
         }
 
-        if (bus_broadcast(u->manager, m) < 0)
+        if (bus_broadcast(u->meta.manager, m) < 0)
                 goto oom;
 
         free(p);
         dbus_message_unref(m);
 
-        u->sent_dbus_new_signal = true;
+        u->meta.sent_dbus_new_signal = true;
 
         return;
 
@@ -749,13 +749,13 @@ void bus_unit_send_removed_signal(Unit *u) {
 
         assert(u);
 
-        if (!bus_has_subscriber(u->manager))
+        if (!bus_has_subscriber(u->meta.manager))
                 return;
 
-        if (!u->sent_dbus_new_signal)
+        if (!u->meta.sent_dbus_new_signal)
                 bus_unit_send_change_signal(u);
 
-        if (!u->id)
+        if (!u->meta.id)
                 return;
 
         if (!(p = unit_dbus_path(u)))
@@ -765,12 +765,12 @@ void bus_unit_send_removed_signal(Unit *u) {
                 goto oom;
 
         if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_STRING, &u->id,
+                                      DBUS_TYPE_STRING, &u->meta.id,
                                       DBUS_TYPE_OBJECT_PATH, &p,
                                       DBUS_TYPE_INVALID))
                 goto oom;
 
-        if (bus_broadcast(u->manager, m) < 0)
+        if (bus_broadcast(u->meta.manager, m) < 0)
                 goto oom;
 
         free(p);
@@ -786,65 +786,3 @@ oom:
 
         log_error("Failed to allocate unit remove signal.");
 }
-
-const BusProperty bus_unit_properties[] = {
-        { "Id",                   bus_property_append_string,         "s", offsetof(Unit, id),                                         true },
-        { "Names",                bus_unit_append_names,             "as", 0 },
-        { "Following",            bus_unit_append_following,          "s", 0 },
-        { "Requires",             bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_REQUIRES]),                true },
-        { "RequiresOverridable",  bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_REQUIRES_OVERRIDABLE]),    true },
-        { "Requisite",            bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_REQUISITE]),               true },
-        { "RequisiteOverridable", bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_REQUISITE_OVERRIDABLE]),   true },
-        { "Wants",                bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_WANTS]),                   true },
-        { "BindTo",               bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_BIND_TO]),                 true },
-        { "RequiredBy",           bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_REQUIRED_BY]),             true },
-        { "RequiredByOverridable",bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_REQUIRED_BY_OVERRIDABLE]), true },
-        { "WantedBy",             bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_WANTED_BY]),               true },
-        { "BoundBy",              bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_BOUND_BY]),                true },
-        { "Conflicts",            bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_CONFLICTS]),               true },
-        { "ConflictedBy",         bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_CONFLICTED_BY]),           true },
-        { "Before",               bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_BEFORE]),                  true },
-        { "After",                bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_AFTER]),                   true },
-        { "OnFailure",            bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_ON_FAILURE]),              true },
-        { "Triggers",             bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_TRIGGERS]),                true },
-        { "TriggeredBy",          bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_TRIGGERED_BY]),            true },
-        { "PropagateReloadTo",    bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_PROPAGATE_RELOAD_TO]),     true },
-        { "PropagateReloadFrom",  bus_unit_append_dependencies,      "as", offsetof(Unit, dependencies[UNIT_PROPAGATE_RELOAD_FROM]),   true },
-        { "Description",          bus_unit_append_description,        "s", 0 },
-        { "LoadState",            bus_unit_append_load_state,         "s", offsetof(Unit, load_state)                         },
-        { "ActiveState",          bus_unit_append_active_state,       "s", 0 },
-        { "SubState",             bus_unit_append_sub_state,          "s", 0 },
-        { "FragmentPath",         bus_property_append_string,         "s", offsetof(Unit, fragment_path),                              true },
-        { "UnitFileState",        bus_unit_append_file_state,         "s", 0 },
-        { "InactiveExitTimestamp",bus_property_append_usec,           "t", offsetof(Unit, inactive_exit_timestamp.realtime)   },
-        { "InactiveExitTimestampMonotonic", bus_property_append_usec, "t", offsetof(Unit, inactive_exit_timestamp.monotonic)  },
-        { "ActiveEnterTimestamp", bus_property_append_usec,           "t", offsetof(Unit, active_enter_timestamp.realtime)    },
-        { "ActiveEnterTimestampMonotonic", bus_property_append_usec,  "t", offsetof(Unit, active_enter_timestamp.monotonic)   },
-        { "ActiveExitTimestamp",  bus_property_append_usec,           "t", offsetof(Unit, active_exit_timestamp.realtime)     },
-        { "ActiveExitTimestampMonotonic",  bus_property_append_usec,  "t", offsetof(Unit, active_exit_timestamp.monotonic)    },
-        { "InactiveEnterTimestamp", bus_property_append_usec,         "t", offsetof(Unit, inactive_enter_timestamp.realtime)  },
-        { "InactiveEnterTimestampMonotonic",bus_property_append_usec, "t", offsetof(Unit, inactive_enter_timestamp.monotonic) },
-        { "CanStart",             bus_unit_append_can_start,          "b", 0 },
-        { "CanStop",              bus_unit_append_can_stop,           "b", 0 },
-        { "CanReload",            bus_unit_append_can_reload,         "b", 0 },
-        { "CanIsolate",           bus_unit_append_can_isolate,        "b", 0 },
-        { "Job",                  bus_unit_append_job,             "(uo)", 0 },
-        { "StopWhenUnneeded",     bus_property_append_bool,           "b", offsetof(Unit, stop_when_unneeded)                 },
-        { "RefuseManualStart",    bus_property_append_bool,           "b", offsetof(Unit, refuse_manual_start)                },
-        { "RefuseManualStop",     bus_property_append_bool,           "b", offsetof(Unit, refuse_manual_stop)                 },
-        { "AllowIsolate",         bus_property_append_bool,           "b", offsetof(Unit, allow_isolate)                      },
-        { "DefaultDependencies",  bus_property_append_bool,           "b", offsetof(Unit, default_dependencies)               },
-        { "OnFailureIsolate",     bus_property_append_bool,           "b", offsetof(Unit, on_failure_isolate)                 },
-        { "IgnoreOnIsolate",      bus_property_append_bool,           "b", offsetof(Unit, ignore_on_isolate)                  },
-        { "IgnoreOnSnapshot",     bus_property_append_bool,           "b", offsetof(Unit, ignore_on_snapshot)                 },
-        { "DefaultControlGroup",  bus_unit_append_default_cgroup,     "s", 0 },
-        { "ControlGroup",         bus_unit_append_cgroups,           "as", 0 },
-        { "ControlGroupAttributes", bus_unit_append_cgroup_attrs,"a(sss)", 0 },
-        { "NeedDaemonReload",     bus_unit_append_need_daemon_reload, "b", 0 },
-        { "JobTimeoutUSec",       bus_property_append_usec,           "t", offsetof(Unit, job_timeout)                        },
-        { "ConditionTimestamp",   bus_property_append_usec,           "t", offsetof(Unit, condition_timestamp.realtime)       },
-        { "ConditionTimestampMonotonic", bus_property_append_usec,    "t", offsetof(Unit, condition_timestamp.monotonic)      },
-        { "ConditionResult",      bus_property_append_bool,           "b", offsetof(Unit, condition_result)                   },
-        { "LoadError",            bus_unit_append_load_error,      "(ss)", 0 },
-        { NULL, }
-};
index 4f19a80..9fed6d7 100644 (file)
@@ -25,7 +25,6 @@
 #include <dbus/dbus.h>
 
 #include "manager.h"
-#include "dbus-common.h"
 
 #define BUS_UNIT_INTERFACE \
         " <interface name=\"org.freedesktop.systemd1.Unit\">\n"         \
         "  <property name=\"Before\" type=\"as\" access=\"read\"/>\n"   \
         "  <property name=\"After\" type=\"as\" access=\"read\"/>\n"    \
         "  <property name=\"OnFailure\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"Triggers\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"TriggeredBy\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"PropagateReloadTo\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"PropagateReloadFrom\" type=\"as\" access=\"read\"/>\n" \
         "  <property name=\"Description\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"LoadState\" type=\"s\" access=\"read\"/>\n" \
         "  <property name=\"ActiveState\" type=\"s\" access=\"read\"/>\n" \
         BUS_GENERIC_INTERFACES_LIST             \
         "org.freedesktop.systemd1.Unit\0"
 
-extern const BusProperty bus_unit_properties[];
+#define BUS_UNIT_PROPERTIES \
+        { "org.freedesktop.systemd1.Unit", "Id",                   bus_property_append_string,     "s",    u->meta.id                        }, \
+        { "org.freedesktop.systemd1.Unit", "Names",                bus_unit_append_names,          "as",   u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "Following",            bus_unit_append_following,      "s",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "Requires",             bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_REQUIRES] }, \
+        { "org.freedesktop.systemd1.Unit", "RequiresOverridable",  bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE] }, \
+        { "org.freedesktop.systemd1.Unit", "Requisite",            bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_REQUISITE] }, \
+        { "org.freedesktop.systemd1.Unit", "RequisiteOverridable", bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_REQUISITE_OVERRIDABLE] }, \
+        { "org.freedesktop.systemd1.Unit", "Wants",                bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_WANTS]  }, \
+        { "org.freedesktop.systemd1.Unit", "BindTo",               bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_BIND_TO]  }, \
+        { "org.freedesktop.systemd1.Unit", "RequiredBy",           bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_REQUIRED_BY] }, \
+        { "org.freedesktop.systemd1.Unit", "RequiredByOverridable",bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE] }, \
+        { "org.freedesktop.systemd1.Unit", "WantedBy",             bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_WANTED_BY] }, \
+        { "org.freedesktop.systemd1.Unit", "BoundBy",              bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_BOUND_BY]  }, \
+        { "org.freedesktop.systemd1.Unit", "Conflicts",            bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_CONFLICTS] }, \
+        { "org.freedesktop.systemd1.Unit", "ConflictedBy",         bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_CONFLICTED_BY] }, \
+        { "org.freedesktop.systemd1.Unit", "Before",               bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_BEFORE] }, \
+        { "org.freedesktop.systemd1.Unit", "After",                bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_AFTER]  }, \
+        { "org.freedesktop.systemd1.Unit", "OnFailure",            bus_unit_append_dependencies,   "as",   u->meta.dependencies[UNIT_ON_FAILURE] }, \
+        { "org.freedesktop.systemd1.Unit", "Description",          bus_unit_append_description,    "s",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "LoadState",            bus_unit_append_load_state,     "s",    &u->meta.load_state               }, \
+        { "org.freedesktop.systemd1.Unit", "ActiveState",          bus_unit_append_active_state,   "s",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "SubState",             bus_unit_append_sub_state,      "s",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "FragmentPath",         bus_property_append_string,     "s",    u->meta.fragment_path             }, \
+        { "org.freedesktop.systemd1.Unit", "UnitFileState",        bus_unit_append_file_state,     "s",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "InactiveExitTimestamp",bus_property_append_usec,       "t",    &u->meta.inactive_exit_timestamp.realtime }, \
+        { "org.freedesktop.systemd1.Unit", "InactiveExitTimestampMonotonic",bus_property_append_usec, "t", &u->meta.inactive_exit_timestamp.monotonic }, \
+        { "org.freedesktop.systemd1.Unit", "ActiveEnterTimestamp", bus_property_append_usec,       "t",    &u->meta.active_enter_timestamp.realtime }, \
+        { "org.freedesktop.systemd1.Unit", "ActiveEnterTimestampMonotonic", bus_property_append_usec, "t", &u->meta.active_enter_timestamp.monotonic }, \
+        { "org.freedesktop.systemd1.Unit", "ActiveExitTimestamp",  bus_property_append_usec,       "t",    &u->meta.active_exit_timestamp.realtime }, \
+        { "org.freedesktop.systemd1.Unit", "ActiveExitTimestampMonotonic",  bus_property_append_usec, "t", &u->meta.active_exit_timestamp.monotonic }, \
+        { "org.freedesktop.systemd1.Unit", "InactiveEnterTimestamp",bus_property_append_usec,      "t",    &u->meta.inactive_enter_timestamp.realtime }, \
+        { "org.freedesktop.systemd1.Unit", "InactiveEnterTimestampMonotonic",bus_property_append_usec,"t", &u->meta.inactive_enter_timestamp.monotonic }, \
+        { "org.freedesktop.systemd1.Unit", "CanStart",             bus_unit_append_can_start,      "b",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "CanStop",              bus_unit_append_can_stop,       "b",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "CanReload",            bus_unit_append_can_reload,     "b",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "CanIsolate",           bus_unit_append_can_isolate,    "b",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "Job",                  bus_unit_append_job,            "(uo)", u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "StopWhenUnneeded",     bus_property_append_bool,       "b",    &u->meta.stop_when_unneeded       }, \
+        { "org.freedesktop.systemd1.Unit", "RefuseManualStart",    bus_property_append_bool,       "b",    &u->meta.refuse_manual_start      }, \
+        { "org.freedesktop.systemd1.Unit", "RefuseManualStop",     bus_property_append_bool,       "b",    &u->meta.refuse_manual_stop       }, \
+        { "org.freedesktop.systemd1.Unit", "AllowIsolate",         bus_property_append_bool,       "b",    &u->meta.allow_isolate            }, \
+        { "org.freedesktop.systemd1.Unit", "DefaultDependencies",  bus_property_append_bool,       "b",    &u->meta.default_dependencies     }, \
+        { "org.freedesktop.systemd1.Unit", "OnFailureIsolate",     bus_property_append_bool,       "b",    &u->meta.on_failure_isolate       }, \
+        { "org.freedesktop.systemd1.Unit", "IgnoreOnIsolate",      bus_property_append_bool,       "b",    &u->meta.ignore_on_isolate        }, \
+        { "org.freedesktop.systemd1.Unit", "IgnoreOnSnapshot",     bus_property_append_bool,       "b",    &u->meta.ignore_on_snapshot       }, \
+        { "org.freedesktop.systemd1.Unit", "DefaultControlGroup",  bus_unit_append_default_cgroup, "s",    u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "ControlGroup",         bus_unit_append_cgroups,        "as",   u                                 }, \
+        { "org.freedesktop.systemd1.Unit", "ControlGroupAttributes", bus_unit_append_cgroup_attrs, "a(sss)", u                               }, \
+        { "org.freedesktop.systemd1.Unit", "NeedDaemonReload",     bus_unit_append_need_daemon_reload, "b", u                                }, \
+        { "org.freedesktop.systemd1.Unit", "JobTimeoutUSec",       bus_property_append_usec,       "t",    &u->meta.job_timeout              }, \
+        { "org.freedesktop.systemd1.Unit", "ConditionTimestamp",   bus_property_append_usec,       "t",    &u->meta.condition_timestamp.realtime }, \
+        { "org.freedesktop.systemd1.Unit", "ConditionTimestampMonotonic", bus_property_append_usec,"t",    &u->meta.condition_timestamp.monotonic }, \
+        { "org.freedesktop.systemd1.Unit", "ConditionResult",      bus_property_append_bool,       "b",    &u->meta.condition_result         }, \
+        { "org.freedesktop.systemd1.Unit", "LoadError",            bus_unit_append_load_error,     "(ss)", u                                 }
+
+int bus_unit_append_names(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_following(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_dependencies(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_description(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_load_state(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_active_state(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_sub_state(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_file_state(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_can_start(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_can_stop(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_can_reload(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_can_isolate(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_job(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_default_cgroup(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_cgroups(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_cgroup_attrs(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_need_daemon_reload(DBusMessageIter *i, const char *property, void *data);
+int bus_unit_append_load_error(DBusMessageIter *i, const char *property, void *data);
 
 void bus_unit_send_change_signal(Unit *u);
 void bus_unit_send_removed_signal(Unit *u);
index 8e6e9fd..daa2c84 100644 (file)
 
 #define CONNECTIONS_MAX 52
 
-/* Well-known address (http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-types) */
-#define DBUS_SYSTEM_BUS_DEFAULT_ADDRESS "unix:path=/var/run/dbus/system_bus_socket"
-/* Only used as a fallback */
-#define DBUS_SESSION_BUS_DEFAULT_ADDRESS "autolaunch:"
-
 static const char bus_properties_interface[] = BUS_PROPERTIES_INTERFACE;
 static const char bus_introspectable_interface[] = BUS_INTROSPECTABLE_INTERFACE;
 
@@ -370,7 +365,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus
                         } else {
                                 r = manager_load_unit(m, name, NULL, &error, &u);
 
-                                if (r >= 0 && u->refuse_manual_start)
+                                if (r >= 0 && u->meta.refuse_manual_start)
                                         r = -EPERM;
 
                                 if (r >= 0)
@@ -772,19 +767,37 @@ static void bus_new_connection(
         dbus_connection_ref(new_connection);
 }
 
-static int init_registered_system_bus(Manager *m) {
-        char *id;
+static int bus_init_system(Manager *m) {
+        DBusError error;
+        int r;
+
+        assert(m);
+
+        dbus_error_init(&error);
+
+        if (m->system_bus)
+                return 0;
+
+        if (m->running_as == MANAGER_SYSTEM && m->api_bus)
+                m->system_bus = m->api_bus;
+        else {
+                if (!(m->system_bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error))) {
+                        log_debug("Failed to get system D-Bus connection, retrying later: %s", bus_error_message(&error));
+                        r = 0;
+                        goto fail;
+                }
+
+                if ((r = bus_setup_loop(m, m->system_bus)) < 0)
+                        goto fail;
+        }
 
         if (!dbus_connection_add_filter(m->system_bus, system_bus_message_filter, m, NULL)) {
                 log_error("Not enough memory");
-                return -ENOMEM;
+                r = -ENOMEM;
+                goto fail;
         }
 
         if (m->running_as != MANAGER_SYSTEM) {
-                DBusError error;
-
-                dbus_error_init(&error);
-
                 dbus_bus_add_match(m->system_bus,
                                    "type='signal',"
                                    "interface='org.freedesktop.systemd1.Agent',"
@@ -794,28 +807,59 @@ static int init_registered_system_bus(Manager *m) {
 
                 if (dbus_error_is_set(&error)) {
                         log_error("Failed to register match: %s", bus_error_message(&error));
-                        dbus_error_free(&error);
-                        return -1;
+                        r = -EIO;
+                        goto fail;
                 }
         }
 
-        log_debug("Successfully connected to system D-Bus bus %s as %s",
-                 strnull((id = dbus_connection_get_server_id(m->system_bus))),
-                 strnull(dbus_bus_get_unique_name(m->system_bus)));
-        dbus_free(id);
+        if (m->api_bus != m->system_bus) {
+                char *id;
+                log_debug("Successfully connected to system D-Bus bus %s as %s",
+                         strnull((id = dbus_connection_get_server_id(m->system_bus))),
+                         strnull(dbus_bus_get_unique_name(m->system_bus)));
+                dbus_free(id);
+        }
 
         return 0;
+
+fail:
+        bus_done_system(m);
+        dbus_error_free(&error);
+
+        return r;
 }
 
-static int init_registered_api_bus(Manager *m) {
+static int bus_init_api(Manager *m) {
+        DBusError error;
         int r;
 
+        assert(m);
+
+        dbus_error_init(&error);
+
+        if (m->api_bus)
+                return 0;
+
+        if (m->running_as == MANAGER_SYSTEM && m->system_bus)
+                m->api_bus = m->system_bus;
+        else {
+                if (!(m->api_bus = dbus_bus_get_private(m->running_as == MANAGER_USER ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error))) {
+                        log_debug("Failed to get API D-Bus connection, retrying later: %s", bus_error_message(&error));
+                        r = 0;
+                        goto fail;
+                }
+
+                if ((r = bus_setup_loop(m, m->api_bus)) < 0)
+                        goto fail;
+        }
+
         if (!dbus_connection_register_object_path(m->api_bus, "/org/freedesktop/systemd1", &bus_manager_vtable, m) ||
             !dbus_connection_register_fallback(m->api_bus, "/org/freedesktop/systemd1/unit", &bus_unit_vtable, m) ||
             !dbus_connection_register_fallback(m->api_bus, "/org/freedesktop/systemd1/job", &bus_job_vtable, m) ||
             !dbus_connection_add_filter(m->api_bus, api_bus_message_filter, m, NULL)) {
                 log_error("Not enough memory");
-                return -ENOMEM;
+                r = -ENOMEM;
+                goto fail;
         }
 
         /* Get NameOwnerChange messages */
@@ -825,7 +869,13 @@ static int init_registered_api_bus(Manager *m) {
                            "interface='"DBUS_INTERFACE_DBUS"',"
                            "member='NameOwnerChanged',"
                            "path='"DBUS_PATH_DBUS"'",
-                           NULL);
+                           &error);
+
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to register match: %s", bus_error_message(&error));
+                r = -EIO;
+                goto fail;
+        }
 
         /* Get activation requests */
         dbus_bus_add_match(m->api_bus,
@@ -834,225 +884,33 @@ static int init_registered_api_bus(Manager *m) {
                            "interface='org.freedesktop.systemd1.Activator',"
                            "member='ActivationRequest',"
                            "path='"DBUS_PATH_DBUS"'",
-                           NULL);
+                           &error);
 
-        r = request_name(m);
-        if (r < 0)
-                return r;
+        if (dbus_error_is_set(&error)) {
+                log_error("Failed to register match: %s", bus_error_message(&error));
+                r = -EIO;
+                goto fail;
+        }
 
-        r = query_name_list(m);
-        if (r < 0)
-                return r;
+        if ((r = request_name(m)) < 0)
+                goto fail;
+
+        if ((r = query_name_list(m)) < 0)
+                goto fail;
 
-        if (m->running_as == MANAGER_USER) {
+        if (m->api_bus != m->system_bus) {
                 char *id;
                 log_debug("Successfully connected to API D-Bus bus %s as %s",
                          strnull((id = dbus_connection_get_server_id(m->api_bus))),
                          strnull(dbus_bus_get_unique_name(m->api_bus)));
                 dbus_free(id);
-        } else
-                log_debug("Successfully initialized API on the system bus");
-
-        return 0;
-}
-
-static void bus_register_cb(DBusPendingCall *pending, void *userdata) {
-        Manager *m = userdata;
-        DBusConnection **conn;
-        DBusMessage *reply;
-        DBusError error;
-        const char *name;
-        int r = 0;
-
-        dbus_error_init(&error);
-
-        conn = dbus_pending_call_get_data(pending, m->conn_data_slot);
-        assert(conn == &m->system_bus || conn == &m->api_bus);
-
-        reply = dbus_pending_call_steal_reply(pending);
-
-        switch (dbus_message_get_type(reply)) {
-        case DBUS_MESSAGE_TYPE_ERROR:
-                assert_se(dbus_set_error_from_message(&error, reply));
-                log_warning("Failed to register to bus: %s", bus_error_message(&error));
-                r = -1;
-                break;
-        case DBUS_MESSAGE_TYPE_METHOD_RETURN:
-                if (!dbus_message_get_args(reply, &error,
-                                           DBUS_TYPE_STRING, &name,
-                                           DBUS_TYPE_INVALID)) {
-                        log_error("Failed to parse Hello reply: %s", bus_error_message(&error));
-                        r = -1;
-                        break;
-                }
-
-                log_debug("Received name %s in reply to Hello", name);
-                if (!dbus_bus_set_unique_name(*conn, name)) {
-                        log_error("Failed to set unique name");
-                        r = -1;
-                        break;
-                }
-
-                if (conn == &m->system_bus) {
-                        r = init_registered_system_bus(m);
-                        if (r == 0 && m->running_as == MANAGER_SYSTEM)
-                                r = init_registered_api_bus(m);
-                } else
-                        r = init_registered_api_bus(m);
-
-                break;
-        default:
-                assert_not_reached("Invalid reply message");
-        }
-
-        dbus_message_unref(reply);
-        dbus_error_free(&error);
-
-        if (r < 0) {
-                if (conn == &m->system_bus) {
-                        log_debug("Failed setting up the system bus");
-                        bus_done_system(m);
-                } else {
-                        log_debug("Failed setting up the API bus");
-                        bus_done_api(m);
-                }
-        }
-}
-
-static int manager_bus_async_register(Manager *m, DBusConnection **conn) {
-        DBusMessage *message = NULL;
-        DBusPendingCall *pending = NULL;
-
-        message = dbus_message_new_method_call(DBUS_SERVICE_DBUS,
-                                               DBUS_PATH_DBUS,
-                                               DBUS_INTERFACE_DBUS,
-                                               "Hello");
-        if (!message)
-                goto oom;
-
-        if (!dbus_connection_send_with_reply(*conn, message, &pending, -1))
-                goto oom;
-
-        if (!dbus_pending_call_set_data(pending, m->conn_data_slot, conn, NULL))
-                goto oom;
-
-        if (!dbus_pending_call_set_notify(pending, bus_register_cb, m, NULL))
-                goto oom;
-
-        dbus_message_unref(message);
-        dbus_pending_call_unref(pending);
-
-        return 0;
-oom:
-        if (pending) {
-                dbus_pending_call_cancel(pending);
-                dbus_pending_call_unref(pending);
-        }
-
-        if (message)
-                dbus_message_unref(message);
-
-        return -ENOMEM;
-}
-
-static DBusConnection* manager_bus_connect_private(Manager *m, DBusBusType type) {
-        const char *address;
-        DBusConnection *connection;
-        DBusError error;
-
-        switch (type) {
-        case DBUS_BUS_SYSTEM:
-                address = getenv("DBUS_SYSTEM_BUS_ADDRESS");
-                if (!address || !address[0])
-                        address = DBUS_SYSTEM_BUS_DEFAULT_ADDRESS;
-                break;
-        case DBUS_BUS_SESSION:
-                address = getenv("DBUS_SESSION_BUS_ADDRESS");
-                if (!address || !address[0])
-                        address = DBUS_SESSION_BUS_DEFAULT_ADDRESS;
-                break;
-        default:
-                assert_not_reached("Invalid bus type");
-        }
-
-        dbus_error_init(&error);
-
-        connection = dbus_connection_open_private(address, &error);
-        if (!connection) {
-                log_warning("Failed to open private bus connection: %s", bus_error_message(&error));
-                goto fail;
-        }
-
-        return connection;
-fail:
-        if (connection)
-                dbus_connection_close(connection);
-        dbus_error_free(&error);
-        return NULL;
-}
-
-static int bus_init_system(Manager *m) {
-        int r;
-
-        if (m->system_bus)
-                return 0;
-
-        m->system_bus = manager_bus_connect_private(m, DBUS_BUS_SYSTEM);
-        if (!m->system_bus) {
-                log_debug("Failed to connect to system D-Bus, retrying later");
-                r = 0;
-                goto fail;
         }
 
-        r = bus_setup_loop(m, m->system_bus);
-        if (r < 0)
-                goto fail;
-
-        r = manager_bus_async_register(m, &m->system_bus);
-        if (r < 0)
-                goto fail;
-
         return 0;
-fail:
-        bus_done_system(m);
-
-        return r;
-}
-
-static int bus_init_api(Manager *m) {
-        int r;
-
-        if (m->api_bus)
-                return 0;
-
-        if (m->running_as == MANAGER_SYSTEM) {
-                m->api_bus = m->system_bus;
-                /* In this mode there is no distinct connection to the API bus,
-                 * the API is published on the system bus.
-                 * bus_register_cb() is aware of that and will init the API
-                 * when the system bus gets registered.
-                 * No need to setup anything here. */
-                return 0;
-        }
-
-        m->api_bus = manager_bus_connect_private(m, DBUS_BUS_SESSION);
-        if (!m->api_bus) {
-                log_debug("Failed to connect to API D-Bus, retrying later");
-                r = 0;
-                goto fail;
-        }
-
-        r = bus_setup_loop(m, m->api_bus);
-        if (r < 0)
-                goto fail;
 
-        r = manager_bus_async_register(m, &m->api_bus);
-        if (r < 0)
-                goto fail;
-
-        return 0;
 fail:
         bus_done_api(m);
+        dbus_error_free(&error);
 
         return r;
 }
@@ -1131,20 +989,22 @@ int bus_init(Manager *m, bool try_bus_connect) {
         int r;
 
         if (set_ensure_allocated(&m->bus_connections, trivial_hash_func, trivial_compare_func) < 0 ||
-            set_ensure_allocated(&m->bus_connections_for_dispatch, trivial_hash_func, trivial_compare_func) < 0)
-                goto oom;
+            set_ensure_allocated(&m->bus_connections_for_dispatch, trivial_hash_func, trivial_compare_func) < 0) {
+                log_error("Not enough memory");
+                return -ENOMEM;
+        }
 
         if (m->name_data_slot < 0)
-                if (!dbus_pending_call_allocate_data_slot(&m->name_data_slot))
-                        goto oom;
-
-        if (m->conn_data_slot < 0)
-                if (!dbus_pending_call_allocate_data_slot(&m->conn_data_slot))
-                        goto oom;
+                if (!dbus_pending_call_allocate_data_slot(&m->name_data_slot)) {
+                        log_error("Not enough memory");
+                        return -ENOMEM;
+                }
 
         if (m->subscribed_data_slot < 0)
-                if (!dbus_connection_allocate_data_slot(&m->subscribed_data_slot))
-                        goto oom;
+                if (!dbus_connection_allocate_data_slot(&m->subscribed_data_slot)) {
+                        log_error("Not enough memory");
+                        return -ENOMEM;
+                }
 
         if (try_bus_connect) {
                 if ((r = bus_init_system(m)) < 0 ||
@@ -1156,9 +1016,6 @@ int bus_init(Manager *m, bool try_bus_connect) {
                 return r;
 
         return 0;
-oom:
-        log_error("Not enough memory");
-        return -ENOMEM;
 }
 
 static void shutdown_connection(Manager *m, DBusConnection *c) {
@@ -1196,46 +1053,48 @@ static void shutdown_connection(Manager *m, DBusConnection *c) {
         }
 
         dbus_connection_set_dispatch_status_function(c, NULL, NULL, NULL);
-        /* system manager cannot afford to block on DBus */
-        if (m->running_as != MANAGER_SYSTEM)
-                dbus_connection_flush(c);
+        dbus_connection_flush(c);
         dbus_connection_close(c);
         dbus_connection_unref(c);
 }
 
 static void bus_done_api(Manager *m) {
-        if (!m->api_bus)
-                return;
+        assert(m);
+
+        if (m->api_bus) {
+                if (m->system_bus == m->api_bus)
+                        m->system_bus = NULL;
 
-        if (m->running_as == MANAGER_USER)
                 shutdown_connection(m, m->api_bus);
+                m->api_bus = NULL;
+        }
 
-        m->api_bus = NULL;
 
-        if (m->queued_message) {
-                dbus_message_unref(m->queued_message);
-                m->queued_message = NULL;
-        }
+       if (m->queued_message) {
+               dbus_message_unref(m->queued_message);
+               m->queued_message = NULL;
+       }
 }
 
 static void bus_done_system(Manager *m) {
-        if (!m->system_bus)
-                return;
+        assert(m);
 
-        if (m->running_as == MANAGER_SYSTEM)
+        if (m->system_bus == m->api_bus)
                 bus_done_api(m);
 
-        shutdown_connection(m, m->system_bus);
-        m->system_bus = NULL;
+        if (m->system_bus) {
+                shutdown_connection(m, m->system_bus);
+                m->system_bus = NULL;
+        }
 }
 
 static void bus_done_private(Manager *m) {
-        if (!m->private_bus)
-                return;
 
-        dbus_server_disconnect(m->private_bus);
-        dbus_server_unref(m->private_bus);
-        m->private_bus = NULL;
+        if (m->private_bus) {
+                dbus_server_disconnect(m->private_bus);
+                dbus_server_unref(m->private_bus);
+                m->private_bus = NULL;
+        }
 }
 
 void bus_done(Manager *m) {
@@ -1257,9 +1116,6 @@ void bus_done(Manager *m) {
         if (m->name_data_slot >= 0)
                dbus_pending_call_free_data_slot(&m->name_data_slot);
 
-        if (m->conn_data_slot >= 0)
-               dbus_pending_call_free_data_slot(&m->conn_data_slot);
-
         if (m->subscribed_data_slot >= 0)
                 dbus_connection_free_data_slot(&m->subscribed_data_slot);
 }
index 0575379..bffeca0 100644 (file)
@@ -46,13 +46,13 @@ static void device_unset_sysfs(Device *d) {
 
         /* Remove this unit from the chain of devices which share the
          * same sysfs path. */
-        first = hashmap_get(UNIT(d)->manager->devices_by_sysfs, d->sysfs);
+        first = hashmap_get(d->meta.manager->devices_by_sysfs, d->sysfs);
         LIST_REMOVE(Device, same_sysfs, first, d);
 
         if (first)
-                hashmap_remove_and_replace(UNIT(d)->manager->devices_by_sysfs, d->sysfs, first->sysfs, first);
+                hashmap_remove_and_replace(d->meta.manager->devices_by_sysfs, d->sysfs, first->sysfs, first);
         else
-                hashmap_remove(UNIT(d)->manager->devices_by_sysfs, d->sysfs);
+                hashmap_remove(d->meta.manager->devices_by_sysfs, d->sysfs);
 
         free(d->sysfs);
         d->sysfs = NULL;
@@ -62,17 +62,17 @@ static void device_init(Unit *u) {
         Device *d = DEVICE(u);
 
         assert(d);
-        assert(UNIT(d)->load_state == UNIT_STUB);
+        assert(d->meta.load_state == UNIT_STUB);
 
         /* In contrast to all other unit types we timeout jobs waiting
          * for devices by default. This is because they otherwise wait
          * indefinitely for plugged in devices, something which cannot
          * happen for the other units since their operations time out
          * anyway. */
-        UNIT(d)->job_timeout = DEFAULT_TIMEOUT_USEC;
+        d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
 
-        UNIT(d)->ignore_on_isolate = true;
-        UNIT(d)->ignore_on_snapshot = true;
+        d->meta.ignore_on_isolate = true;
+        d->meta.ignore_on_snapshot = true;
 }
 
 static void device_done(Unit *u) {
@@ -92,7 +92,7 @@ static void device_set_state(Device *d, DeviceState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(d)->id,
+                          d->meta.id,
                           device_state_to_string(old_state),
                           device_state_to_string(state));
 
@@ -198,12 +198,10 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
         if (!u) {
                 delete = true;
 
-                u = unit_new(m, sizeof(Device));
-                if (!u)
+                if (!(u = unit_new(m)))
                         return -ENOMEM;
 
-                r = device_add_escaped_name(u, path);
-                if (r < 0)
+                if ((r = device_add_escaped_name(u, path)) < 0)
                         goto fail;
 
                 unit_add_to_load_queue(u);
@@ -389,16 +387,16 @@ static Unit *device_following(Unit *u) {
 
         assert(d);
 
-        if (startswith(u->id, "sys-"))
+        if (startswith(u->meta.id, "sys-"))
                 return NULL;
 
         /* Make everybody follow the unit that's named after the sysfs path */
         for (other = d->same_sysfs_next; other; other = other->same_sysfs_next)
-                if (startswith(UNIT(other)->id, "sys-"))
+                if (startswith(other->meta.id, "sys-"))
                         return UNIT(other);
 
         for (other = d->same_sysfs_prev; other; other = other->same_sysfs_prev) {
-                if (startswith(UNIT(other)->id, "sys-"))
+                if (startswith(other->meta.id, "sys-"))
                         return UNIT(other);
 
                 first = other;
@@ -585,7 +583,6 @@ DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState);
 
 const UnitVTable device_vtable = {
         .suffix = ".device",
-        .object_size = sizeof(Device),
         .sections =
                 "Unit\0"
                 "Device\0"
index a05c3d3..9a56a52 100644 (file)
@@ -36,7 +36,7 @@ typedef enum DeviceState {
 } DeviceState;
 
 struct Device {
-        Unit meta;
+        Meta meta;
 
         char *sysfs;
 
index dab4856..53e7e77 100644 (file)
@@ -173,23 +173,24 @@ static int open_null_as(int flags, int nfd) {
 
 static int connect_logger_as(const ExecContext *context, ExecOutput output, const char *ident, int nfd) {
         int fd, r;
-        union sockaddr_union sa;
+        union {
+                struct sockaddr sa;
+                struct sockaddr_un un;
+        } sa;
 
         assert(context);
         assert(output < _EXEC_OUTPUT_MAX);
         assert(ident);
         assert(nfd >= 0);
 
-        fd = socket(AF_UNIX, SOCK_STREAM, 0);
-        if (fd < 0)
+        if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
                 return -errno;
 
         zero(sa);
-        sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
+        sa.sa.sa_family = AF_UNIX;
+        strncpy(sa.un.sun_path, STDOUT_SYSLOG_BRIDGE_SOCKET, sizeof(sa.un.sun_path));
 
-        r = connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
-        if (r < 0) {
+        if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + sizeof(STDOUT_SYSLOG_BRIDGE_SOCKET) - 1) < 0) {
                 close_nointr_nofail(fd);
                 return -errno;
         }
@@ -199,19 +200,26 @@ static int connect_logger_as(const ExecContext *context, ExecOutput output, cons
                 return -errno;
         }
 
+        /* We speak a very simple protocol between log server
+         * and client: one line for the log destination (kmsg
+         * or syslog), followed by the priority field,
+         * followed by the process name. Since we replaced
+         * stdin/stderr we simple use stdio to write to
+         * it. Note that we use stderr, to minimize buffer
+         * flushing issues. */
+
         dprintf(fd,
                 "%s\n"
                 "%i\n"
-                "%i\n"
-                "%i\n"
-                "%i\n"
+                "%s\n"
                 "%i\n",
-                context->syslog_identifier ? context->syslog_identifier : ident,
+                output == EXEC_OUTPUT_KMSG ?             "kmsg" :
+                output == EXEC_OUTPUT_KMSG_AND_CONSOLE ? "kmsg+console" :
+                output == EXEC_OUTPUT_SYSLOG ?           "syslog" :
+                                                         "syslog+console",
                 context->syslog_priority,
-                !!context->syslog_level_prefix,
-                output == EXEC_OUTPUT_SYSLOG || output == EXEC_OUTPUT_SYSLOG_AND_CONSOLE,
-                output == EXEC_OUTPUT_KMSG || output == EXEC_OUTPUT_KMSG_AND_CONSOLE,
-                output == EXEC_OUTPUT_SYSLOG_AND_CONSOLE || output == EXEC_OUTPUT_KMSG_AND_CONSOLE || output == EXEC_OUTPUT_JOURNAL_AND_CONSOLE);
+                context->syslog_identifier ? context->syslog_identifier : ident,
+                context->syslog_level_prefix);
 
         if (fd != nfd) {
                 r = dup2(fd, nfd) < 0 ? -errno : nfd;
@@ -351,8 +359,6 @@ static int setup_output(const ExecContext *context, int socket_fd, const char *i
         case EXEC_OUTPUT_SYSLOG_AND_CONSOLE:
         case EXEC_OUTPUT_KMSG:
         case EXEC_OUTPUT_KMSG_AND_CONSOLE:
-        case EXEC_OUTPUT_JOURNAL:
-        case EXEC_OUTPUT_JOURNAL_AND_CONSOLE:
                 return connect_logger_as(context, o, ident, STDOUT_FILENO);
 
         case EXEC_OUTPUT_SOCKET:
@@ -406,8 +412,6 @@ static int setup_error(const ExecContext *context, int socket_fd, const char *id
         case EXEC_OUTPUT_SYSLOG_AND_CONSOLE:
         case EXEC_OUTPUT_KMSG:
         case EXEC_OUTPUT_KMSG_AND_CONSOLE:
-        case EXEC_OUTPUT_JOURNAL:
-        case EXEC_OUTPUT_JOURNAL_AND_CONSOLE:
                 return connect_logger_as(context, e, ident, STDERR_FILENO);
 
         case EXEC_OUTPUT_SOCKET:
@@ -712,7 +716,6 @@ static int setup_pam(
         pam_handle_t *handle = NULL;
         sigset_t ss, old_ss;
         int pam_code = PAM_SUCCESS;
-        int err;
         char **e = NULL;
         bool close_session = false;
         pid_t pam_pid = 0, parent_pid;
@@ -770,8 +773,8 @@ static int setup_pam(
                  * termination */
 
                 /* This string must fit in 10 chars (i.e. the length
-                 * of "/sbin/init"), to look pretty in /bin/ps */
-                rename_process("(sd-pam)");
+                 * of "/sbin/init") */
+                rename_process("sd(PAM)");
 
                 /* Make sure we don't keep open the passed fds in this
                 child. We assume that otherwise only those fds are
@@ -832,11 +835,6 @@ static int setup_pam(
         return 0;
 
 fail:
-        if (pam_code != PAM_SUCCESS)
-                err = -EPERM;  /* PAM errors do not map to errno */
-        else
-                err = -errno;
-
         if (handle) {
                 if (close_session)
                         pam_code = pam_close_session(handle, PAM_DATA_SILENT);
@@ -853,7 +851,7 @@ fail:
                 kill(pam_pid, SIGCONT);
         }
 
-        return err;
+        return EXIT_PAM;
 }
 #endif
 
@@ -897,9 +895,12 @@ static int do_capability_bounding_set_drop(uint64_t drop) {
                 }
         }
 
-        for (i = 0; i <= cap_last_cap(); i++)
+        for (i = 0; i <= MAX(63LU, (unsigned long) CAP_LAST_CAP); i++)
                 if (drop & ((uint64_t) 1ULL << (uint64_t) i)) {
                         if (prctl(PR_CAPBSET_DROP, i) < 0) {
+                                if (errno == EINVAL)
+                                        break;
+
                                 r = -errno;
                                 goto finish;
                         }
@@ -919,37 +920,6 @@ finish:
         return r;
 }
 
-static void rename_process_from_path(const char *path) {
-        char process_name[11];
-        const char *p;
-        size_t l;
-
-        /* This resulting string must fit in 10 chars (i.e. the length
-         * of "/sbin/init") to look pretty in /bin/ps */
-
-        p = file_name_from_path(path);
-        if (isempty(p)) {
-                rename_process("(...)");
-                return;
-        }
-
-        l = strlen(p);
-        if (l > 8) {
-                /* The end of the process name is usually more
-                 * interesting, since the first bit might just be
-                 * "systemd-" */
-                p = p + l - 8;
-                l = 8;
-        }
-
-        process_name[0] = '(';
-        memcpy(process_name+1, p, l);
-        process_name[1+l] = ')';
-        process_name[1+l+1] = 0;
-
-        rename_process(process_name);
-}
-
 int exec_spawn(ExecCommand *command,
                char **argv,
                const ExecContext *context,
@@ -1016,7 +986,7 @@ int exec_spawn(ExecCommand *command,
         }
 
         if (pid == 0) {
-                int i, err;
+                int i;
                 sigset_t ss;
                 const char *username = NULL, *home = NULL;
                 uid_t uid = (uid_t) -1;
@@ -1024,11 +994,13 @@ int exec_spawn(ExecCommand *command,
                 char **our_env = NULL, **pam_env = NULL, **final_env = NULL, **final_argv = NULL;
                 unsigned n_env = 0;
                 int saved_stdout = -1, saved_stdin = -1;
-                bool keep_stdout = false, keep_stdin = false, set_access = false;
+                bool keep_stdout = false, keep_stdin = false;
 
                 /* child */
 
-                rename_process_from_path(command->path);
+                /* This string must fit in 10 chars (i.e. the length
+                 * of "/sbin/init") */
+                rename_process("sd(EXEC)");
 
                 /* We reset exactly these signals, since they are the
                  * only ones we set to SIG_IGN in the main daemon. All
@@ -1038,12 +1010,8 @@ int exec_spawn(ExecCommand *command,
                 default_signals(SIGNALS_CRASH_HANDLER,
                                 SIGNALS_IGNORE, -1);
 
-                if (context->ignore_sigpipe)
-                        ignore_signals(SIGPIPE, -1);
-
-                assert_se(sigemptyset(&ss) == 0);
-                if (sigprocmask(SIG_SETMASK, &ss, NULL) < 0) {
-                        err = -errno;
+                if (sigemptyset(&ss) < 0 ||
+                    sigprocmask(SIG_SETMASK, &ss, NULL) < 0) {
                         r = EXIT_SIGNAL_MASK;
                         goto fail_child;
                 }
@@ -1051,17 +1019,14 @@ int exec_spawn(ExecCommand *command,
                 /* Close sockets very early to make sure we don't
                  * block init reexecution because it cannot bind its
                  * sockets */
-                log_forget_fds();
-                err = close_all_fds(socket_fd >= 0 ? &socket_fd : fds,
-                                           socket_fd >= 0 ? 1 : n_fds);
-                if (err < 0) {
+                if (close_all_fds(socket_fd >= 0 ? &socket_fd : fds,
+                                  socket_fd >= 0 ? 1 : n_fds) < 0) {
                         r = EXIT_FDS;
                         goto fail_child;
                 }
 
                 if (!context->same_pgrp)
                         if (setsid() < 0) {
-                                err = -errno;
                                 r = EXIT_SETSID;
                                 goto fail_child;
                         }
@@ -1069,14 +1034,12 @@ int exec_spawn(ExecCommand *command,
                 if (context->tcpwrap_name) {
                         if (socket_fd >= 0)
                                 if (!socket_tcpwrap(socket_fd, context->tcpwrap_name)) {
-                                        err = -EACCES;
                                         r = EXIT_TCPWRAP;
                                         goto fail_child;
                                 }
 
                         for (i = 0; i < (int) n_fds; i++) {
                                 if (!socket_tcpwrap(fds[i], context->tcpwrap_name)) {
-                                        err = -EACCES;
                                         r = EXIT_TCPWRAP;
                                         goto fail_child;
                                 }
@@ -1092,14 +1055,11 @@ int exec_spawn(ExecCommand *command,
 
                         /* Set up terminal for the question */
                         if ((r = setup_confirm_stdio(context,
-                                                     &saved_stdin, &saved_stdout))) {
-                                err = -errno;
+                                                     &saved_stdin, &saved_stdout)))
                                 goto fail_child;
-                        }
 
                         /* Now ask the question. */
                         if (!(line = exec_command_line(argv))) {
-                                err = -ENOMEM;
                                 r = EXIT_MEMORY;
                                 goto fail_child;
                         }
@@ -1108,21 +1068,18 @@ int exec_spawn(ExecCommand *command,
                         free(line);
 
                         if (r < 0 || response == 'n') {
-                                err = -ECANCELED;
                                 r = EXIT_CONFIRM;
                                 goto fail_child;
                         } else if (response == 's') {
-                                err = r = 0;
+                                r = 0;
                                 goto fail_child;
                         }
 
                         /* Release terminal for the question */
                         if ((r = restore_confirm_stdio(context,
                                                        &saved_stdin, &saved_stdout,
-                                                       &keep_stdin, &keep_stdout))) {
-                                err = -errno;
+                                                       &keep_stdin, &keep_stdout)))
                                 goto fail_child;
-                        }
                 }
 
                 /* If a socket is connected to STDIN/STDOUT/STDERR, we
@@ -1130,35 +1087,28 @@ int exec_spawn(ExecCommand *command,
                 if (socket_fd >= 0)
                         fd_nonblock(socket_fd, false);
 
-                if (!keep_stdin) {
-                        err = setup_input(context, socket_fd, apply_tty_stdin);
-                        if (err < 0) {
+                if (!keep_stdin)
+                        if (setup_input(context, socket_fd, apply_tty_stdin) < 0) {
                                 r = EXIT_STDIN;
                                 goto fail_child;
                         }
-                }
 
-                if (!keep_stdout) {
-                        err = setup_output(context, socket_fd, file_name_from_path(command->path), apply_tty_stdin);
-                        if (err < 0) {
+                if (!keep_stdout)
+                        if (setup_output(context, socket_fd, file_name_from_path(command->path), apply_tty_stdin) < 0) {
                                 r = EXIT_STDOUT;
                                 goto fail_child;
                         }
-                }
 
-                err = setup_error(context, socket_fd, file_name_from_path(command->path), apply_tty_stdin);
-                if (err < 0) {
+                if (setup_error(context, socket_fd, file_name_from_path(command->path), apply_tty_stdin) < 0) {
                         r = EXIT_STDERR;
                         goto fail_child;
                 }
 
-                if (cgroup_bondings) {
-                        err = cgroup_bonding_install_list(cgroup_bondings, 0);
-                        if (err < 0) {
+                if (cgroup_bondings)
+                        if (cgroup_bonding_install_list(cgroup_bondings, 0) < 0) {
                                 r = EXIT_CGROUP;
                                 goto fail_child;
                         }
-                }
 
                 if (context->oom_score_adjust_set) {
                         char t[16];
@@ -1179,7 +1129,6 @@ int exec_spawn(ExecCommand *command,
 
                                 if (write_one_line_file("/proc/self/oom_adj", t) < 0
                                     && errno != EACCES) {
-                                        err = -errno;
                                         r = EXIT_OOM_ADJUST;
                                         goto fail_child;
                                 }
@@ -1188,7 +1137,6 @@ int exec_spawn(ExecCommand *command,
 
                 if (context->nice_set)
                         if (setpriority(PRIO_PROCESS, 0, context->nice) < 0) {
-                                err = -errno;
                                 r = EXIT_NICE;
                                 goto fail_child;
                         }
@@ -1201,7 +1149,6 @@ int exec_spawn(ExecCommand *command,
 
                         if (sched_setscheduler(0, context->cpu_sched_policy |
                                                (context->cpu_sched_reset_on_fork ? SCHED_RESET_ON_FORK : 0), &param) < 0) {
-                                err = -errno;
                                 r = EXIT_SETSCHEDULER;
                                 goto fail_child;
                         }
@@ -1209,79 +1156,57 @@ int exec_spawn(ExecCommand *command,
 
                 if (context->cpuset)
                         if (sched_setaffinity(0, CPU_ALLOC_SIZE(context->cpuset_ncpus), context->cpuset) < 0) {
-                                err = -errno;
                                 r = EXIT_CPUAFFINITY;
                                 goto fail_child;
                         }
 
                 if (context->ioprio_set)
                         if (ioprio_set(IOPRIO_WHO_PROCESS, 0, context->ioprio) < 0) {
-                                err = -errno;
                                 r = EXIT_IOPRIO;
                                 goto fail_child;
                         }
 
                 if (context->timer_slack_nsec_set)
                         if (prctl(PR_SET_TIMERSLACK, context->timer_slack_nsec) < 0) {
-                                err = -errno;
                                 r = EXIT_TIMERSLACK;
                                 goto fail_child;
                         }
 
                 if (context->utmp_id)
-                        utmp_put_init_process(context->utmp_id, getpid(), getsid(0), context->tty_path);
+                        utmp_put_init_process(0, context->utmp_id, getpid(), getsid(0), context->tty_path);
 
                 if (context->user) {
                         username = context->user;
-                        err = get_user_creds(&username, &uid, &gid, &home);
-                        if (err < 0) {
+                        if (get_user_creds(&username, &uid, &gid, &home) < 0) {
                                 r = EXIT_USER;
                                 goto fail_child;
                         }
 
-                        if (is_terminal_input(context->std_input)) {
-                                err = chown_terminal(STDIN_FILENO, uid);
-                                if (err < 0) {
+                        if (is_terminal_input(context->std_input))
+                                if (chown_terminal(STDIN_FILENO, uid) < 0) {
                                         r = EXIT_STDIN;
                                         goto fail_child;
                                 }
-                        }
 
-                        if (cgroup_bondings && context->control_group_modify) {
-                                err = cgroup_bonding_set_group_access_list(cgroup_bondings, 0755, uid, gid);
-                                if (err >= 0)
-                                        err = cgroup_bonding_set_task_access_list(cgroup_bondings, 0644, uid, gid, context->control_group_persistent);
-                                if (err < 0) {
+                        if (cgroup_bondings && context->control_group_modify)
+                                if (cgroup_bonding_set_group_access_list(cgroup_bondings, 0755, uid, gid) < 0 ||
+                                    cgroup_bonding_set_task_access_list(cgroup_bondings, 0644, uid, gid) < 0) {
                                         r = EXIT_CGROUP;
                                         goto fail_child;
                                 }
-
-                                set_access = true;
-                        }
                 }
 
-                if (cgroup_bondings && !set_access && context->control_group_persistent >= 0)  {
-                        err = cgroup_bonding_set_task_access_list(cgroup_bondings, (mode_t) -1, (uid_t) -1, (uid_t) -1, context->control_group_persistent);
-                        if (err < 0) {
-                                r = EXIT_CGROUP;
-                                goto fail_child;
-                        }
-                }
-
-                if (apply_permissions) {
-                        err = enforce_groups(context, username, gid);
-                        if (err < 0) {
+                if (apply_permissions)
+                        if (enforce_groups(context, username, gid) < 0) {
                                 r = EXIT_GROUP;
                                 goto fail_child;
                         }
-                }
 
                 umask(context->umask);
 
 #ifdef HAVE_PAM
                 if (context->pam_name && username) {
-                        err = setup_pam(context->pam_name, username, context->tty_path, &pam_env, fds, n_fds);
-                        if (err < 0) {
+                        if (setup_pam(context->pam_name, username, context->tty_path, &pam_env, fds, n_fds) != 0) {
                                 r = EXIT_PAM;
                                 goto fail_child;
                         }
@@ -1289,7 +1214,6 @@ int exec_spawn(ExecCommand *command,
 #endif
                 if (context->private_network) {
                         if (unshare(CLONE_NEWNET) < 0) {
-                                err = -errno;
                                 r = EXIT_NETWORK;
                                 goto fail_child;
                         }
@@ -1301,28 +1225,23 @@ int exec_spawn(ExecCommand *command,
                     strv_length(context->read_only_dirs) > 0 ||
                     strv_length(context->inaccessible_dirs) > 0 ||
                     context->mount_flags != MS_SHARED ||
-                    context->private_tmp) {
-                        err = setup_namespace(context->read_write_dirs,
-                                              context->read_only_dirs,
-                                              context->inaccessible_dirs,
-                                              context->private_tmp,
-                                              context->mount_flags);
-                        if (err < 0) {
-                                r = EXIT_NAMESPACE;
+                    context->private_tmp)
+                        if ((r = setup_namespace(
+                                             context->read_write_dirs,
+                                             context->read_only_dirs,
+                                             context->inaccessible_dirs,
+                                             context->private_tmp,
+                                             context->mount_flags)) < 0)
                                 goto fail_child;
-                        }
-                }
 
                 if (apply_chroot) {
                         if (context->root_directory)
                                 if (chroot(context->root_directory) < 0) {
-                                        err = -errno;
                                         r = EXIT_CHROOT;
                                         goto fail_child;
                                 }
 
                         if (chdir(context->working_directory ? context->working_directory : "/") < 0) {
-                                err = -errno;
                                 r = EXIT_CHDIR;
                                 goto fail_child;
                         }
@@ -1333,13 +1252,11 @@ int exec_spawn(ExecCommand *command,
                         if (asprintf(&d, "%s/%s",
                                      context->root_directory ? context->root_directory : "",
                                      context->working_directory ? context->working_directory : "") < 0) {
-                                err = -ENOMEM;
                                 r = EXIT_MEMORY;
                                 goto fail_child;
                         }
 
                         if (chdir(d) < 0) {
-                                err = -errno;
                                 free(d);
                                 r = EXIT_CHDIR;
                                 goto fail_child;
@@ -1350,12 +1267,9 @@ int exec_spawn(ExecCommand *command,
 
                 /* We repeat the fd closing here, to make sure that
                  * nothing is leaked from the PAM modules */
-                err = close_all_fds(fds, n_fds);
-                if (err >= 0)
-                        err = shift_fds(fds, n_fds);
-                if (err >= 0)
-                        err = flags_fds(fds, n_fds, context->non_blocking);
-                if (err < 0) {
+                if (close_all_fds(fds, n_fds) < 0 ||
+                    shift_fds(fds, n_fds) < 0 ||
+                    flags_fds(fds, n_fds, context->non_blocking) < 0) {
                         r = EXIT_FDS;
                         goto fail_child;
                 }
@@ -1367,27 +1281,22 @@ int exec_spawn(ExecCommand *command,
                                         continue;
 
                                 if (setrlimit(i, context->rlimit[i]) < 0) {
-                                        err = -errno;
                                         r = EXIT_LIMITS;
                                         goto fail_child;
                                 }
                         }
 
-                        if (context->capability_bounding_set_drop) {
-                                err = do_capability_bounding_set_drop(context->capability_bounding_set_drop);
-                                if (err < 0) {
+                        if (context->capability_bounding_set_drop)
+                                if (do_capability_bounding_set_drop(context->capability_bounding_set_drop) < 0) {
                                         r = EXIT_CAPABILITIES;
                                         goto fail_child;
                                 }
-                        }
 
-                        if (context->user) {
-                                err = enforce_user(context, uid);
-                                if (err < 0) {
+                        if (context->user)
+                                if (enforce_user(context, uid) < 0) {
                                         r = EXIT_USER;
                                         goto fail_child;
                                 }
-                        }
 
                         /* PR_GET_SECUREBITS is not privileged, while
                          * PR_SET_SECUREBITS is. So to suppress
@@ -1395,21 +1304,18 @@ int exec_spawn(ExecCommand *command,
                          * PR_SET_SECUREBITS unless necessary. */
                         if (prctl(PR_GET_SECUREBITS) != context->secure_bits)
                                 if (prctl(PR_SET_SECUREBITS, context->secure_bits) < 0) {
-                                        err = -errno;
                                         r = EXIT_SECUREBITS;
                                         goto fail_child;
                                 }
 
                         if (context->capabilities)
                                 if (cap_set_proc(context->capabilities) < 0) {
-                                        err = -errno;
                                         r = EXIT_CAPABILITIES;
                                         goto fail_child;
                                 }
                 }
 
                 if (!(our_env = new0(char*, 7))) {
-                        err = -ENOMEM;
                         r = EXIT_MEMORY;
                         goto fail_child;
                 }
@@ -1417,14 +1323,12 @@ int exec_spawn(ExecCommand *command,
                 if (n_fds > 0)
                         if (asprintf(our_env + n_env++, "LISTEN_PID=%lu", (unsigned long) getpid()) < 0 ||
                             asprintf(our_env + n_env++, "LISTEN_FDS=%u", n_fds) < 0) {
-                                err = -ENOMEM;
                                 r = EXIT_MEMORY;
                                 goto fail_child;
                         }
 
                 if (home)
                         if (asprintf(our_env + n_env++, "HOME=%s", home) < 0) {
-                                err = -ENOMEM;
                                 r = EXIT_MEMORY;
                                 goto fail_child;
                         }
@@ -1432,7 +1336,6 @@ int exec_spawn(ExecCommand *command,
                 if (username)
                         if (asprintf(our_env + n_env++, "LOGNAME=%s", username) < 0 ||
                             asprintf(our_env + n_env++, "USER=%s", username) < 0) {
-                                err = -ENOMEM;
                                 r = EXIT_MEMORY;
                                 goto fail_child;
                         }
@@ -1441,7 +1344,6 @@ int exec_spawn(ExecCommand *command,
                     context->std_output == EXEC_OUTPUT_TTY ||
                     context->std_error == EXEC_OUTPUT_TTY)
                         if (!(our_env[n_env++] = strdup(default_term_for_tty(tty_path(context))))) {
-                                err = -ENOMEM;
                                 r = EXIT_MEMORY;
                                 goto fail_child;
                         }
@@ -1456,13 +1358,11 @@ int exec_spawn(ExecCommand *command,
                                       files_env,
                                       pam_env,
                                       NULL))) {
-                        err = -ENOMEM;
                         r = EXIT_MEMORY;
                         goto fail_child;
                 }
 
                 if (!(final_argv = replace_env_argv(argv, final_env))) {
-                        err = -ENOMEM;
                         r = EXIT_MEMORY;
                         goto fail_child;
                 }
@@ -1470,17 +1370,9 @@ int exec_spawn(ExecCommand *command,
                 final_env = strv_env_clean(final_env);
 
                 execve(command->path, final_argv, final_env);
-                err = -errno;
                 r = EXIT_EXEC;
 
         fail_child:
-                if (r != 0) {
-                        log_open();
-                        log_warning("Failed at step %s spawning %s: %s",
-                                    exit_status_to_string(r, EXIT_STATUS_SYSTEMD),
-                                    command->path, strerror(-err));
-                }
-
                 strv_free(our_env);
                 strv_free(final_env);
                 strv_free(pam_env);
@@ -1530,8 +1422,6 @@ void exec_context_init(ExecContext *c) {
         c->mount_flags = MS_SHARED;
         c->kill_signal = SIGTERM;
         c->send_sigkill = true;
-        c->control_group_persistent = -1;
-        c->ignore_sigpipe = true;
 }
 
 void exec_context_done(ExecContext *c) {
@@ -1717,7 +1607,6 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                 "%sNonBlocking: %s\n"
                 "%sPrivateTmp: %s\n"
                 "%sControlGroupModify: %s\n"
-                "%sControlGroupPersistent: %s\n"
                 "%sPrivateNetwork: %s\n",
                 prefix, c->umask,
                 prefix, c->working_directory ? c->working_directory : "/",
@@ -1725,7 +1614,6 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                 prefix, yes_no(c->non_blocking),
                 prefix, yes_no(c->private_tmp),
                 prefix, yes_no(c->control_group_modify),
-                prefix, yes_no(c->control_group_persistent),
                 prefix, yes_no(c->private_network));
 
         STRV_FOREACH(e, c->environment)
@@ -1799,10 +1687,10 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                         prefix, yes_no(c->tty_vhangup),
                         prefix, yes_no(c->tty_vt_disallocate));
 
-        if (c->std_output == EXEC_OUTPUT_SYSLOG || c->std_output == EXEC_OUTPUT_KMSG || c->std_output == EXEC_OUTPUT_JOURNAL ||
-            c->std_output == EXEC_OUTPUT_SYSLOG_AND_CONSOLE || c->std_output == EXEC_OUTPUT_KMSG_AND_CONSOLE || c->std_output == EXEC_OUTPUT_JOURNAL_AND_CONSOLE ||
-            c->std_error == EXEC_OUTPUT_SYSLOG || c->std_error == EXEC_OUTPUT_KMSG || c->std_error == EXEC_OUTPUT_JOURNAL ||
-            c->std_error == EXEC_OUTPUT_SYSLOG_AND_CONSOLE || c->std_error == EXEC_OUTPUT_KMSG_AND_CONSOLE || c->std_error == EXEC_OUTPUT_JOURNAL_AND_CONSOLE)
+        if (c->std_output == EXEC_OUTPUT_SYSLOG || c->std_output == EXEC_OUTPUT_KMSG ||
+            c->std_output == EXEC_OUTPUT_SYSLOG_AND_CONSOLE || c->std_output == EXEC_OUTPUT_KMSG_AND_CONSOLE ||
+            c->std_error == EXEC_OUTPUT_SYSLOG || c->std_error == EXEC_OUTPUT_KMSG ||
+            c->std_error == EXEC_OUTPUT_SYSLOG_AND_CONSOLE || c->std_error == EXEC_OUTPUT_KMSG_AND_CONSOLE)
                 fprintf(f,
                         "%sSyslogFacility: %s\n"
                         "%sSyslogLevel: %s\n",
@@ -1832,7 +1720,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                 unsigned long l;
                 fprintf(f, "%sCapabilityBoundingSet:", prefix);
 
-                for (l = 0; l <= cap_last_cap(); l++)
+                for (l = 0; l <= (unsigned long) CAP_LAST_CAP; l++)
                         if (!(c->capability_bounding_set_drop & ((uint64_t) 1ULL << (uint64_t) l))) {
                                 char *t;
 
@@ -1880,12 +1768,10 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
         fprintf(f,
                 "%sKillMode: %s\n"
                 "%sKillSignal: SIG%s\n"
-                "%sSendSIGKILL: %s\n"
-                "%sIgnoreSIGPIPE: %s\n",
+                "%sSendSIGKILL: %s\n",
                 prefix, kill_mode_to_string(c->kill_mode),
                 prefix, signal_to_string(c->kill_signal),
-                prefix, yes_no(c->send_sigkill),
-                prefix, yes_no(c->ignore_sigpipe));
+                prefix, yes_no(c->send_sigkill));
 
         if (c->utmp_id)
                 fprintf(f,
@@ -1904,7 +1790,8 @@ void exec_status_start(ExecStatus *s, pid_t pid) {
 void exec_status_exit(ExecStatus *s, ExecContext *context, pid_t pid, int code, int status) {
         assert(s);
 
-        if (s->pid && s->pid != pid)
+        if ((s->pid && s->pid != pid) ||
+            !s->start_timestamp.realtime <= 0)
                 zero(*s);
 
         s->pid = pid;
@@ -2088,8 +1975,6 @@ static const char* const exec_output_table[_EXEC_OUTPUT_MAX] = {
         [EXEC_OUTPUT_SYSLOG_AND_CONSOLE] = "syslog+console",
         [EXEC_OUTPUT_KMSG] = "kmsg",
         [EXEC_OUTPUT_KMSG_AND_CONSOLE] = "kmsg+console",
-        [EXEC_OUTPUT_JOURNAL] = "journal",
-        [EXEC_OUTPUT_JOURNAL_AND_CONSOLE] = "journal+console",
         [EXEC_OUTPUT_SOCKET] = "socket"
 };
 
index 0d7e7dd..77a2257 100644 (file)
@@ -40,6 +40,8 @@ struct CGroupAttribute;
 #include "list.h"
 #include "util.h"
 
+#define STDOUT_SYSLOG_BRIDGE_SOCKET "/run/systemd/stdout-syslog-bridge"
+
 typedef enum KillMode {
         KILL_CONTROL_GROUP = 0,
         KILL_PROCESS,
@@ -74,8 +76,6 @@ typedef enum ExecOutput {
         EXEC_OUTPUT_SYSLOG_AND_CONSOLE,
         EXEC_OUTPUT_KMSG,
         EXEC_OUTPUT_KMSG_AND_CONSOLE,
-        EXEC_OUTPUT_JOURNAL,
-        EXEC_OUTPUT_JOURNAL_AND_CONSOLE,
         EXEC_OUTPUT_SOCKET,
         _EXEC_OUTPUT_MAX,
         _EXEC_OUTPUT_INVALID = -1
@@ -128,8 +128,6 @@ struct ExecContext {
         bool tty_vhangup;
         bool tty_vt_disallocate;
 
-        bool ignore_sigpipe;
-
         /* Since resolving these names might might involve socket
          * connections and we don't want to deadlock ourselves these
          * names are resolved on execution only and in the child
@@ -165,7 +163,6 @@ struct ExecContext {
         bool private_network;
 
         bool control_group_modify;
-        int control_group_persistent;
 
         /* This is not exposed to the user but available
          * internally. We need it to make sure that whenever we spawn
index ab8907d..8ed1a0e 100644 (file)
@@ -119,9 +119,6 @@ const char* exit_status_to_string(ExitStatus status, ExitStatusLevel level) {
 
                 case EXIT_NETWORK:
                         return "NETWORK";
-
-                case EXIT_NAMESPACE:
-                        return "NAMESPACE";
                 }
         }
 
index 44ef879..3e977b1 100644 (file)
@@ -65,8 +65,7 @@ typedef enum ExitStatus {
         EXIT_STDERR,
         EXIT_TCPWRAP,
         EXIT_PAM,
-        EXIT_NETWORK,
-        EXIT_NAMESPACE
+        EXIT_NETWORK
 
 } ExitStatus;
 
index d3ac83c..c5088ad 100644 (file)
@@ -80,7 +80,7 @@ static void start_target(const char *target, bool isolate) {
 
         if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
 
-                /* Don't print a warning if we aren't called during
+                /* Don't print a waring if we aren't called during
                  * startup */
                 if (!dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB))
                         log_error("Failed to start unit: %s", bus_error_message(&error));
@@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
                         arg_skip = true;
                 else if (startswith(w, "fsck.mode"))
                         log_warning("Invalid fsck.mode= parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)
                 else if (strneq(w, "fastboot", l))
                         arg_skip = true;
                 else if (strneq(w, "forcefsck", l))
diff --git a/src/generate-kbd-model-map b/src/generate-kbd-model-map
new file mode 100755 (executable)
index 0000000..624c517
--- /dev/null
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+
+import sys
+import system_config_keyboard.keyboard_models
+
+def strdash(s):
+        return s.strip() or '-'
+
+def tab_extend(s, n=1):
+        s = strdash(s)
+        k = len(s) // 8
+
+        if k >= n:
+                f = 1
+        else:
+                f = n - k
+
+        return s + '\t'*f
+
+
+models = system_config_keyboard.keyboard_models.KeyboardModels().get_models()
+
+print "# Generated from system-config-keyboard's model list"
+print "# consolelayout\t\txlayout\txmodel\t\txvariant\txoptions"
+
+for key, value in reversed(models.items()):
+        options = "terminate:ctrl_alt_bksp"
+        if value[4]:
+                options += ',' + value[4]
+
+        print ''.join((tab_extend(key, 3), tab_extend(value[1]),
+                       tab_extend(value[2], 2), tab_extend(value[3], 2),
+                       options))
index 1263785..6b5b254 100644 (file)
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
diff --git a/src/gnome-ask-password-agent.c b/src/gnome-ask-password-agent.c
deleted file mode 100644 (file)
index fb49f22..0000000
+++ /dev/null
@@ -1,1509 +0,0 @@
-/* gnome-ask-password-agent.c generated by valac 0.14.0, the Vala compiler
- * generated from gnome-ask-password-agent.vala, do not modify */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <time.h>
-#include <gtk/gtk.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gio/gio.h>
-#include <stdio.h>
-#include <libnotify/notify.h>
-#include <gio/gunixoutputstream.h>
-
-
-#define TYPE_PASSWORD_DIALOG (password_dialog_get_type ())
-#define PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PASSWORD_DIALOG, PasswordDialog))
-#define PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PASSWORD_DIALOG, PasswordDialogClass))
-#define IS_PASSWORD_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PASSWORD_DIALOG))
-#define IS_PASSWORD_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PASSWORD_DIALOG))
-#define PASSWORD_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PASSWORD_DIALOG, PasswordDialogClass))
-
-typedef struct _PasswordDialog PasswordDialog;
-typedef struct _PasswordDialogClass PasswordDialogClass;
-typedef struct _PasswordDialogPrivate PasswordDialogPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define TYPE_MY_STATUS_ICON (my_status_icon_get_type ())
-#define MY_STATUS_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MY_STATUS_ICON, MyStatusIcon))
-#define MY_STATUS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MY_STATUS_ICON, MyStatusIconClass))
-#define IS_MY_STATUS_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MY_STATUS_ICON))
-#define IS_MY_STATUS_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MY_STATUS_ICON))
-#define MY_STATUS_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MY_STATUS_ICON, MyStatusIconClass))
-
-typedef struct _MyStatusIcon MyStatusIcon;
-typedef struct _MyStatusIconClass MyStatusIconClass;
-typedef struct _MyStatusIconPrivate MyStatusIconPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_key_file_free0(var) ((var == NULL) ? NULL : (var = (g_key_file_free (var), NULL)))
-
-struct _PasswordDialog {
-       GtkDialog parent_instance;
-       PasswordDialogPrivate * priv;
-       GtkEntry* entry;
-};
-
-struct _PasswordDialogClass {
-       GtkDialogClass parent_class;
-};
-
-struct _MyStatusIcon {
-       GtkStatusIcon parent_instance;
-       MyStatusIconPrivate * priv;
-};
-
-struct _MyStatusIconClass {
-       GtkStatusIconClass parent_class;
-};
-
-struct _MyStatusIconPrivate {
-       GFile* directory;
-       GFile* current;
-       GFileMonitor* file_monitor;
-       gchar* message;
-       gchar* icon;
-       gchar* socket;
-       PasswordDialog* password_dialog;
-};
-
-
-static gpointer password_dialog_parent_class = NULL;
-static gpointer my_status_icon_parent_class = NULL;
-
-gint clock_gettime (gint id, struct timespec* ts);
-GType password_dialog_get_type (void) G_GNUC_CONST;
-enum  {
-       PASSWORD_DIALOG_DUMMY_PROPERTY
-};
-PasswordDialog* password_dialog_new (const gchar* message, const gchar* icon);
-PasswordDialog* password_dialog_construct (GType object_type, const gchar* message, const gchar* icon);
-void password_dialog_on_entry_activated (PasswordDialog* self);
-static void _password_dialog_on_entry_activated_gtk_entry_activate (GtkEntry* _sender, gpointer self);
-static void password_dialog_finalize (GObject* obj);
-GType my_status_icon_get_type (void) G_GNUC_CONST;
-#define MY_STATUS_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MY_STATUS_ICON, MyStatusIconPrivate))
-enum  {
-       MY_STATUS_ICON_DUMMY_PROPERTY
-};
-MyStatusIcon* my_status_icon_new (GError** error);
-MyStatusIcon* my_status_icon_construct (GType object_type, GError** error);
-static void my_status_icon_file_monitor_changed (MyStatusIcon* self, GFile* file, GFile* other_file, GFileMonitorEvent event_type);
-static void _my_status_icon_file_monitor_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self);
-static void my_status_icon_look_for_password (MyStatusIcon* self, GError** error);
-static void my_status_icon_status_icon_activate (MyStatusIcon* self);
-static void _my_status_icon_status_icon_activate_gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self);
-void show_error (const gchar* e);
-static gboolean my_status_icon_load_password (MyStatusIcon* self, GError** error);
-static void my_status_icon_finalize (GObject* obj);
-gint _vala_main (gchar** args, int args_length1);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-const GOptionEntry entries[1] = {{NULL}};
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-static gpointer _g_object_ref0 (gpointer self) {
-#line 43 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return self ? g_object_ref (self) : NULL;
-#line 129 "gnome-ask-password-agent.c"
-}
-
-
-static void _password_dialog_on_entry_activated_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
-#line 63 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       password_dialog_on_entry_activated (self);
-#line 136 "gnome-ask-password-agent.c"
-}
-
-
-PasswordDialog* password_dialog_construct (GType object_type, const gchar* message, const gchar* icon) {
-       PasswordDialog * self = NULL;
-       const gchar* _tmp0_;
-       GtkWidget* _tmp1_ = NULL;
-       GtkContainer* _tmp2_;
-       GtkContainer* content;
-       GtkHBox* _tmp3_;
-       GtkBox* _tmp4_;
-       GtkBox* hbox;
-       const gchar* _tmp5_;
-       GtkImage* _tmp6_;
-       GtkImage* _tmp7_;
-       GtkImage* image;
-       GtkVBox* _tmp8_;
-       GtkBox* _tmp9_;
-       GtkBox* vbox;
-       const gchar* _tmp10_;
-       GtkLabel* _tmp11_;
-       GtkLabel* _tmp12_;
-       GtkLabel* label;
-       GtkEntry* _tmp13_;
-       GtkEntry* _tmp14_;
-       GtkEntry* _tmp15_;
-       GtkEntry* _tmp16_;
-       GtkEntry* _tmp17_;
-       GtkEntry* _tmp18_;
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_val_if_fail (message != NULL, NULL);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_val_if_fail (icon != NULL, NULL);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self = (PasswordDialog*) g_object_new (object_type, NULL);
-#line 34 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_window_set_title ((GtkWindow*) self, "System Password");
-#line 35 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_dialog_set_has_separator ((GtkDialog*) self, FALSE);
-#line 36 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_container_set_border_width ((GtkContainer*) self, (guint) 8);
-#line 37 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_dialog_set_default_response ((GtkDialog*) self, (gint) GTK_RESPONSE_OK);
-#line 38 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = icon;
-#line 38 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_window_set_icon_name ((GtkWindow*) self, _tmp0_);
-#line 40 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CANCEL, (gint) GTK_RESPONSE_CANCEL);
-#line 41 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_OK, (gint) GTK_RESPONSE_OK);
-#line 43 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp1_ = gtk_dialog_get_content_area ((GtkDialog*) self);
-#line 43 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp2_ = _g_object_ref0 (GTK_CONTAINER (_tmp1_));
-#line 43 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       content = _tmp2_;
-#line 45 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp3_ = (GtkHBox*) gtk_hbox_new (FALSE, 16);
-#line 45 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp4_ = (GtkBox*) g_object_ref_sink (_tmp3_);
-#line 45 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       hbox = _tmp4_;
-#line 46 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_container_set_border_width ((GtkContainer*) hbox, (guint) 8);
-#line 47 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_container_add (content, (GtkWidget*) hbox);
-#line 49 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp5_ = icon;
-#line 49 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp6_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp5_, GTK_ICON_SIZE_DIALOG);
-#line 49 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp7_ = g_object_ref_sink (_tmp6_);
-#line 49 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       image = _tmp7_;
-#line 50 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_box_pack_start (hbox, (GtkWidget*) image, FALSE, FALSE, (guint) 0);
-#line 52 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp8_ = (GtkVBox*) gtk_vbox_new (FALSE, 8);
-#line 52 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp9_ = (GtkBox*) g_object_ref_sink (_tmp8_);
-#line 52 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       vbox = _tmp9_;
-#line 53 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, TRUE, (guint) 0);
-#line 55 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp10_ = message;
-#line 55 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp11_ = (GtkLabel*) gtk_label_new (_tmp10_);
-#line 55 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp12_ = g_object_ref_sink (_tmp11_);
-#line 55 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       label = _tmp12_;
-#line 56 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_box_pack_start (vbox, (GtkWidget*) label, FALSE, FALSE, (guint) 0);
-#line 58 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp13_ = (GtkEntry*) gtk_entry_new ();
-#line 58 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp14_ = g_object_ref_sink (_tmp13_);
-#line 58 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->entry);
-#line 58 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->entry = _tmp14_;
-#line 59 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp15_ = self->entry;
-#line 59 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_entry_set_visibility (_tmp15_, FALSE);
-#line 60 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp16_ = self->entry;
-#line 60 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_entry_set_activates_default (_tmp16_, TRUE);
-#line 61 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp17_ = self->entry;
-#line 61 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_box_pack_start (vbox, (GtkWidget*) _tmp17_, FALSE, FALSE, (guint) 0);
-#line 63 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp18_ = self->entry;
-#line 63 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_signal_connect_object (_tmp18_, "activate", (GCallback) _password_dialog_on_entry_activated_gtk_entry_activate, self, 0);
-#line 65 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_widget_show_all ((GtkWidget*) self);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (label);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (vbox);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (image);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (hbox);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (content);
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return self;
-#line 270 "gnome-ask-password-agent.c"
-}
-
-
-PasswordDialog* password_dialog_new (const gchar* message, const gchar* icon) {
-#line 33 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return password_dialog_construct (TYPE_PASSWORD_DIALOG, message, icon);
-#line 277 "gnome-ask-password-agent.c"
-}
-
-
-void password_dialog_on_entry_activated (PasswordDialog* self) {
-#line 68 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_if_fail (self != NULL);
-#line 69 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_dialog_response ((GtkDialog*) self, (gint) GTK_RESPONSE_OK);
-#line 286 "gnome-ask-password-agent.c"
-}
-
-
-static void password_dialog_class_init (PasswordDialogClass * klass) {
-#line 29 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       password_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 29 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       G_OBJECT_CLASS (klass)->finalize = password_dialog_finalize;
-#line 295 "gnome-ask-password-agent.c"
-}
-
-
-static void password_dialog_instance_init (PasswordDialog * self) {
-}
-
-
-static void password_dialog_finalize (GObject* obj) {
-       PasswordDialog * self;
-#line 29 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self = PASSWORD_DIALOG (obj);
-#line 31 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->entry);
-#line 29 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       G_OBJECT_CLASS (password_dialog_parent_class)->finalize (obj);
-#line 311 "gnome-ask-password-agent.c"
-}
-
-
-GType password_dialog_get_type (void) {
-       static volatile gsize password_dialog_type_id__volatile = 0;
-       if (g_once_init_enter (&password_dialog_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (PasswordDialogClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) password_dialog_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PasswordDialog), 0, (GInstanceInitFunc) password_dialog_instance_init, NULL };
-               GType password_dialog_type_id;
-               password_dialog_type_id = g_type_register_static (GTK_TYPE_DIALOG, "PasswordDialog", &g_define_type_info, 0);
-               g_once_init_leave (&password_dialog_type_id__volatile, password_dialog_type_id);
-       }
-       return password_dialog_type_id__volatile;
-}
-
-
-static void _my_status_icon_file_monitor_changed_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) {
-#line 91 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       my_status_icon_file_monitor_changed (self, file, other_file, event_type);
-#line 330 "gnome-ask-password-agent.c"
-}
-
-
-static void _my_status_icon_status_icon_activate_gtk_status_icon_activate (GtkStatusIcon* _sender, gpointer self) {
-#line 96 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       my_status_icon_status_icon_activate (self);
-#line 337 "gnome-ask-password-agent.c"
-}
-
-
-MyStatusIcon* my_status_icon_construct (GType object_type, GError** error) {
-       MyStatusIcon * self = NULL;
-       GFile* _tmp0_ = NULL;
-       GFile* _tmp1_;
-       GFileMonitor* _tmp2_ = NULL;
-       GFileMonitor* _tmp3_;
-       GFileMonitor* _tmp4_;
-       GError * _inner_error_ = NULL;
-#line 86 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self = (MyStatusIcon*) g_object_new (object_type, "icon-name", "dialog-password", NULL);
-#line 87 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_status_icon_set_title ((GtkStatusIcon*) self, "System Password Request");
-#line 89 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = g_file_new_for_path ("/run/systemd/ask-password/");
-#line 89 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->directory);
-#line 89 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->priv->directory = _tmp0_;
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp1_ = self->priv->directory;
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp2_ = g_file_monitor_directory (_tmp1_, 0, NULL, &_inner_error_);
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp3_ = _tmp2_;
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_propagate_error (error, _inner_error_);
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (self);
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return NULL;
-#line 373 "gnome-ask-password-agent.c"
-       }
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->file_monitor);
-#line 90 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->priv->file_monitor = _tmp3_;
-#line 91 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp4_ = self->priv->file_monitor;
-#line 91 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_signal_connect_object (_tmp4_, "changed", (GCallback) _my_status_icon_file_monitor_changed_g_file_monitor_changed, self, 0);
-#line 93 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->current);
-#line 93 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->priv->current = NULL;
-#line 94 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       my_status_icon_look_for_password (self, &_inner_error_);
-#line 94 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 94 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_propagate_error (error, _inner_error_);
-#line 94 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (self);
-#line 94 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return NULL;
-#line 397 "gnome-ask-password-agent.c"
-       }
-#line 96 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_signal_connect_object ((GtkStatusIcon*) self, "activate", (GCallback) _my_status_icon_status_icon_activate_gtk_status_icon_activate, self, 0);
-#line 85 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return self;
-#line 403 "gnome-ask-password-agent.c"
-}
-
-
-MyStatusIcon* my_status_icon_new (GError** error) {
-#line 85 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return my_status_icon_construct (TYPE_MY_STATUS_ICON, error);
-#line 410 "gnome-ask-password-agent.c"
-}
-
-
-static void my_status_icon_file_monitor_changed (MyStatusIcon* self, GFile* file, GFile* other_file, GFileMonitorEvent event_type) {
-       GFile* _tmp0_;
-       gchar* _tmp1_ = NULL;
-       gchar* _tmp2_;
-       gboolean _tmp3_ = FALSE;
-       gboolean _tmp4_;
-       gboolean _tmp5_ = FALSE;
-       GFileMonitorEvent _tmp6_;
-       gboolean _tmp8_;
-       GError * _inner_error_ = NULL;
-#line 99 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_if_fail (self != NULL);
-#line 99 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_if_fail (file != NULL);
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = file;
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp1_ = g_file_get_basename (_tmp0_);
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp2_ = _tmp1_;
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp3_ = g_str_has_prefix (_tmp2_, "ask.");
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp4_ = !_tmp3_;
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_free0 (_tmp2_);
-#line 101 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp4_) {
-#line 102 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return;
-#line 444 "gnome-ask-password-agent.c"
-       }
-#line 104 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp6_ = event_type;
-#line 104 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp6_ == G_FILE_MONITOR_EVENT_CREATED) {
-#line 104 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp5_ = TRUE;
-#line 452 "gnome-ask-password-agent.c"
-       } else {
-               GFileMonitorEvent _tmp7_;
-#line 105 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp7_ = event_type;
-#line 105 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp5_ = _tmp7_ == G_FILE_MONITOR_EVENT_DELETED;
-#line 459 "gnome-ask-password-agent.c"
-       }
-#line 104 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp8_ = _tmp5_;
-#line 104 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp8_) {
-#line 465 "gnome-ask-password-agent.c"
-               {
-#line 107 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       my_status_icon_look_for_password (self, &_inner_error_);
-#line 107 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (_inner_error_ != NULL) {
-#line 471 "gnome-ask-password-agent.c"
-                               goto __catch0_g_error;
-                       }
-               }
-               goto __finally0;
-               __catch0_g_error:
-               {
-                       GError* e = NULL;
-                       GError* _tmp9_;
-                       const gchar* _tmp10_;
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       e = _inner_error_;
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _inner_error_ = NULL;
-#line 109 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp9_ = e;
-#line 109 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp10_ = _tmp9_->message;
-#line 109 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       show_error (_tmp10_);
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_error_free0 (e);
-#line 493 "gnome-ask-password-agent.c"
-               }
-               __finally0:
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       g_clear_error (&_inner_error_);
-#line 106 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       return;
-#line 504 "gnome-ask-password-agent.c"
-               }
-       }
-}
-
-
-static void my_status_icon_look_for_password (MyStatusIcon* self, GError** error) {
-       GFile* _tmp0_;
-       GFile* _tmp5_;
-       GFile* _tmp21_;
-       GError * _inner_error_ = NULL;
-#line 114 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_if_fail (self != NULL);
-#line 116 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = self->priv->current;
-#line 116 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp0_ != NULL) {
-#line 521 "gnome-ask-password-agent.c"
-               GFile* _tmp1_;
-               gboolean _tmp2_ = FALSE;
-#line 117 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp1_ = self->priv->current;
-#line 117 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 117 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (!_tmp2_) {
-#line 530 "gnome-ask-password-agent.c"
-                       PasswordDialog* _tmp3_;
-#line 118 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_object_unref0 (self->priv->current);
-#line 118 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       self->priv->current = NULL;
-#line 119 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp3_ = self->priv->password_dialog;
-#line 119 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (_tmp3_ != NULL) {
-#line 540 "gnome-ask-password-agent.c"
-                               PasswordDialog* _tmp4_;
-#line 120 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               _tmp4_ = self->priv->password_dialog;
-#line 120 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               gtk_dialog_response ((GtkDialog*) _tmp4_, (gint) GTK_RESPONSE_REJECT);
-#line 546 "gnome-ask-password-agent.c"
-                       }
-               }
-       }
-#line 124 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp5_ = self->priv->current;
-#line 124 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp5_ == NULL) {
-#line 554 "gnome-ask-password-agent.c"
-               GFile* _tmp6_;
-               GFileEnumerator* _tmp7_ = NULL;
-               GFileEnumerator* enumerator;
-               GFileInfo* i = NULL;
-#line 125 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp6_ = self->priv->directory;
-#line 125 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp7_ = g_file_enumerate_children (_tmp6_, "standard::name", G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 125 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               enumerator = _tmp7_;
-#line 125 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 125 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 125 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       return;
-#line 571 "gnome-ask-password-agent.c"
-               }
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               while (TRUE) {
-#line 575 "gnome-ask-password-agent.c"
-                       GFileEnumerator* _tmp8_;
-                       GFileInfo* _tmp9_ = NULL;
-                       GFileInfo* _tmp10_;
-                       GFileInfo* _tmp11_;
-                       GFileInfo* _tmp12_;
-                       const gchar* _tmp13_ = NULL;
-                       gboolean _tmp14_ = FALSE;
-                       GFile* _tmp15_;
-                       GFileInfo* _tmp16_;
-                       const gchar* _tmp17_ = NULL;
-                       GFile* _tmp18_ = NULL;
-                       gboolean _tmp19_ = FALSE;
-                       gboolean _tmp20_;
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp8_ = enumerator;
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp10_ = _tmp9_;
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (_inner_error_ != NULL) {
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               g_propagate_error (error, _inner_error_);
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               _g_object_unref0 (i);
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               _g_object_unref0 (enumerator);
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               return;
-#line 605 "gnome-ask-password-agent.c"
-                       }
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_object_unref0 (i);
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       i = _tmp10_;
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp11_ = i;
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (!(_tmp11_ != NULL)) {
-#line 128 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               break;
-#line 617 "gnome-ask-password-agent.c"
-                       }
-#line 129 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp12_ = i;
-#line 129 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp13_ = g_file_info_get_name (_tmp12_);
-#line 129 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp14_ = g_str_has_prefix (_tmp13_, "ask.");
-#line 129 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (!_tmp14_) {
-#line 130 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               continue;
-#line 629 "gnome-ask-password-agent.c"
-                       }
-#line 132 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp15_ = self->priv->directory;
-#line 132 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp16_ = i;
-#line 132 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp17_ = g_file_info_get_name (_tmp16_);
-#line 132 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp18_ = g_file_get_child (_tmp15_, _tmp17_);
-#line 132 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_object_unref0 (self->priv->current);
-#line 132 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       self->priv->current = _tmp18_;
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp19_ = my_status_icon_load_password (self, &_inner_error_);
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp20_ = _tmp19_;
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (_inner_error_ != NULL) {
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               g_propagate_error (error, _inner_error_);
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               _g_object_unref0 (i);
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               _g_object_unref0 (enumerator);
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               return;
-#line 657 "gnome-ask-password-agent.c"
-                       }
-#line 134 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       if (_tmp20_) {
-#line 135 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                               break;
-#line 663 "gnome-ask-password-agent.c"
-                       }
-#line 137 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_object_unref0 (self->priv->current);
-#line 137 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       self->priv->current = NULL;
-#line 669 "gnome-ask-password-agent.c"
-               }
-#line 124 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (i);
-#line 124 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (enumerator);
-#line 675 "gnome-ask-password-agent.c"
-       }
-#line 141 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp21_ = self->priv->current;
-#line 141 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp21_ == NULL) {
-#line 142 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               gtk_status_icon_set_visible ((GtkStatusIcon*) self, FALSE);
-#line 683 "gnome-ask-password-agent.c"
-       }
-}
-
-
-static gboolean my_status_icon_load_password (MyStatusIcon* self, GError** error) {
-       gboolean result = FALSE;
-       GKeyFile* _tmp0_;
-       GKeyFile* key_file;
-       const gchar* _tmp28_;
-       const gchar* _tmp33_;
-       const gchar* _tmp34_;
-       const gchar* _tmp35_;
-       const gchar* _tmp36_;
-       const gchar* _tmp37_;
-       NotifyNotification* _tmp38_;
-       NotifyNotification* n;
-       NotifyNotification* _tmp39_;
-       NotifyNotification* _tmp40_;
-       GError * _inner_error_ = NULL;
-#line 145 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 147 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = g_key_file_new ();
-#line 147 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       key_file = _tmp0_;
-#line 709 "gnome-ask-password-agent.c"
-       {
-               struct timespec ts = {0};
-               GKeyFile* _tmp1_;
-               GFile* _tmp2_;
-               gchar* _tmp3_ = NULL;
-               gchar* _tmp4_;
-               GKeyFile* _tmp5_;
-               gchar* _tmp6_ = NULL;
-               gchar* not_after_as_string;
-               struct timespec _tmp7_ = {0};
-               struct timespec _tmp8_;
-               time_t _tmp9_;
-               struct timespec _tmp10_;
-               glong _tmp11_;
-               guint64 now;
-               guint64 not_after = 0ULL;
-               const gchar* _tmp12_;
-               gint _tmp13_ = 0;
-               gboolean _tmp14_ = FALSE;
-               guint64 _tmp15_;
-               gboolean _tmp18_;
-               GKeyFile* _tmp19_;
-               gchar* _tmp20_ = NULL;
-               gchar* _tmp21_;
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp1_ = key_file;
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp2_ = self->priv->current;
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp3_ = g_file_get_path (_tmp2_);
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp4_ = _tmp3_;
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_key_file_load_from_file (_tmp1_, _tmp4_, G_KEY_FILE_NONE, &_inner_error_);
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (_tmp4_);
-#line 152 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 748 "gnome-ask-password-agent.c"
-                       goto __catch1_g_error;
-               }
-#line 154 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp5_ = key_file;
-#line 154 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp6_ = g_key_file_get_string (_tmp5_, "Ask", "NotAfter", &_inner_error_);
-#line 154 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               not_after_as_string = _tmp6_;
-#line 154 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 759 "gnome-ask-password-agent.c"
-                       goto __catch1_g_error;
-               }
-#line 156 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               clock_gettime (1, &_tmp7_);
-#line 156 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               ts = _tmp7_;
-#line 157 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp8_ = ts;
-#line 157 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp9_ = _tmp8_.tv_sec;
-#line 157 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp10_ = ts;
-#line 157 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp11_ = _tmp10_.tv_nsec;
-#line 157 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               now = (guint64) ((_tmp9_ * 1000000) + (_tmp11_ / 1000));
-#line 160 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp12_ = not_after_as_string;
-#line 160 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp13_ = sscanf (_tmp12_, "%llu", &not_after);
-#line 160 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_tmp13_ != 1) {
-#line 161 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       result = FALSE;
-#line 161 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_free0 (not_after_as_string);
-#line 161 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_key_file_free0 (key_file);
-#line 161 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       return result;
-#line 790 "gnome-ask-password-agent.c"
-               }
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp15_ = not_after;
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_tmp15_ > ((guint64) 0)) {
-#line 796 "gnome-ask-password-agent.c"
-                       guint64 _tmp16_;
-                       guint64 _tmp17_;
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp16_ = not_after;
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp17_ = now;
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp14_ = _tmp16_ < _tmp17_;
-#line 805 "gnome-ask-password-agent.c"
-               } else {
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp14_ = FALSE;
-#line 809 "gnome-ask-password-agent.c"
-               }
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp18_ = _tmp14_;
-#line 163 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_tmp18_) {
-#line 164 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       result = FALSE;
-#line 164 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_free0 (not_after_as_string);
-#line 164 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_key_file_free0 (key_file);
-#line 164 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       return result;
-#line 823 "gnome-ask-password-agent.c"
-               }
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp19_ = key_file;
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp20_ = g_key_file_get_string (_tmp19_, "Ask", "Socket", &_inner_error_);
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp21_ = _tmp20_;
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_free0 (not_after_as_string);
-#line 835 "gnome-ask-password-agent.c"
-                       goto __catch1_g_error;
-               }
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (self->priv->socket);
-#line 166 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               self->priv->socket = _tmp21_;
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (not_after_as_string);
-#line 844 "gnome-ask-password-agent.c"
-       }
-       goto __finally1;
-       __catch1_g_error:
-       {
-               GError* e = NULL;
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               e = _inner_error_;
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _inner_error_ = NULL;
-#line 168 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               result = FALSE;
-#line 168 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_error_free0 (e);
-#line 168 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_key_file_free0 (key_file);
-#line 168 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return result;
-#line 862 "gnome-ask-password-agent.c"
-       }
-       __finally1:
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_propagate_error (error, _inner_error_);
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_key_file_free0 (key_file);
-#line 149 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return FALSE;
-#line 873 "gnome-ask-password-agent.c"
-       }
-       {
-               GKeyFile* _tmp22_;
-               gchar* _tmp23_ = NULL;
-               gchar* _tmp24_;
-               gchar* _tmp25_;
-               gchar* _tmp26_ = NULL;
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp22_ = key_file;
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp23_ = g_key_file_get_string (_tmp22_, "Ask", "Message", &_inner_error_);
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp24_ = _tmp23_;
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 889 "gnome-ask-password-agent.c"
-                       goto __catch2_g_error;
-               }
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp25_ = _tmp24_;
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp26_ = g_strcompress (_tmp25_);
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (self->priv->message);
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               self->priv->message = _tmp26_;
-#line 172 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (_tmp25_);
-#line 902 "gnome-ask-password-agent.c"
-       }
-       goto __finally2;
-       __catch2_g_error:
-       {
-               GError* e = NULL;
-               gchar* _tmp27_;
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               e = _inner_error_;
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _inner_error_ = NULL;
-#line 174 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp27_ = g_strdup ("Please Enter System Password!");
-#line 174 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (self->priv->message);
-#line 174 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               self->priv->message = _tmp27_;
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_error_free0 (e);
-#line 921 "gnome-ask-password-agent.c"
-       }
-       __finally2:
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_propagate_error (error, _inner_error_);
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_key_file_free0 (key_file);
-#line 171 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return FALSE;
-#line 932 "gnome-ask-password-agent.c"
-       }
-#line 177 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp28_ = self->priv->message;
-#line 177 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_status_icon_set_tooltip_text ((GtkStatusIcon*) self, _tmp28_);
-#line 938 "gnome-ask-password-agent.c"
-       {
-               GKeyFile* _tmp29_;
-               gchar* _tmp30_ = NULL;
-               gchar* _tmp31_;
-#line 180 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp29_ = key_file;
-#line 180 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp30_ = g_key_file_get_string (_tmp29_, "Ask", "Icon", &_inner_error_);
-#line 180 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp31_ = _tmp30_;
-#line 180 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 951 "gnome-ask-password-agent.c"
-                       goto __catch3_g_error;
-               }
-#line 180 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (self->priv->icon);
-#line 180 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               self->priv->icon = _tmp31_;
-#line 958 "gnome-ask-password-agent.c"
-       }
-       goto __finally3;
-       __catch3_g_error:
-       {
-               GError* e = NULL;
-               gchar* _tmp32_;
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               e = _inner_error_;
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _inner_error_ = NULL;
-#line 182 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp32_ = g_strdup ("dialog-password");
-#line 182 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (self->priv->icon);
-#line 182 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               self->priv->icon = _tmp32_;
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_error_free0 (e);
-#line 977 "gnome-ask-password-agent.c"
-       }
-       __finally3:
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_propagate_error (error, _inner_error_);
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_key_file_free0 (key_file);
-#line 179 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return FALSE;
-#line 988 "gnome-ask-password-agent.c"
-       }
-#line 184 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp33_ = self->priv->icon;
-#line 184 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_status_icon_set_from_icon_name ((GtkStatusIcon*) self, _tmp33_);
-#line 186 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_status_icon_set_visible ((GtkStatusIcon*) self, TRUE);
-#line 188 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp34_ = gtk_status_icon_get_title ((GtkStatusIcon*) self);
-#line 188 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp35_ = _tmp34_;
-#line 188 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp36_ = self->priv->message;
-#line 188 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp37_ = self->priv->icon;
-#line 188 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp38_ = notify_notification_new (_tmp35_, _tmp36_, _tmp37_);
-#line 188 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       n = _tmp38_;
-#line 189 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp39_ = n;
-#line 189 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       notify_notification_set_timeout (_tmp39_, 5000);
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp40_ = n;
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       notify_notification_show (_tmp40_, &_inner_error_);
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_propagate_error (error, _inner_error_);
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (n);
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_key_file_free0 (key_file);
-#line 190 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return FALSE;
-#line 1026 "gnome-ask-password-agent.c"
-       }
-#line 192 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       result = TRUE;
-#line 192 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (n);
-#line 192 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_key_file_free0 (key_file);
-#line 192 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return result;
-#line 1036 "gnome-ask-password-agent.c"
-}
-
-
-static guint8* string_get_data (const gchar* self, int* result_length1) {
-       guint8* result;
-       guint8* res;
-       gint res_length1;
-       gint _res_size_;
-       gint _tmp0_;
-       gint _tmp1_;
-       gint _tmp2_;
-       guint8* _tmp3_;
-       gint _tmp3__length1;
-       guint8* _tmp4_;
-       gint _tmp4__length1;
-#line 1404 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 1405 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       res = (guint8*) self;
-#line 1405 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       res_length1 = -1;
-#line 1405 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _res_size_ = res_length1;
-#line 1406 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp0_ = strlen (self);
-#line 1406 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp1_ = _tmp0_;
-#line 1406 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       res_length1 = (gint) _tmp1_;
-#line 1406 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp2_ = res_length1;
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp3_ = res;
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp3__length1 = res_length1;
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp4_ = _tmp3_;
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       _tmp4__length1 = _tmp3__length1;
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       if (result_length1) {
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-               *result_length1 = _tmp4__length1;
-#line 1080 "gnome-ask-password-agent.c"
-       }
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       result = _tmp4_;
-#line 1407 "/usr/share/vala-0.14/vapi/glib-2.0.vapi"
-       return result;
-#line 1086 "gnome-ask-password-agent.c"
-}
-
-
-static void my_status_icon_status_icon_activate (MyStatusIcon* self) {
-       GFile* _tmp0_;
-       PasswordDialog* _tmp1_;
-       const gchar* _tmp3_;
-       const gchar* _tmp4_;
-       PasswordDialog* _tmp5_;
-       PasswordDialog* _tmp6_;
-       PasswordDialog* _tmp7_;
-       gint _tmp8_ = 0;
-       gint _result_;
-       PasswordDialog* _tmp9_;
-       GtkEntry* _tmp10_;
-       const gchar* _tmp11_ = NULL;
-       gchar* _tmp12_;
-       gchar* password;
-       PasswordDialog* _tmp13_;
-       gboolean _tmp14_ = FALSE;
-       gint _tmp15_;
-       gboolean _tmp17_;
-       gint to_process = 0;
-       GError * _inner_error_ = NULL;
-#line 195 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_if_fail (self != NULL);
-#line 197 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = self->priv->current;
-#line 197 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp0_ == NULL) {
-#line 198 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return;
-#line 1119 "gnome-ask-password-agent.c"
-       }
-#line 200 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp1_ = self->priv->password_dialog;
-#line 200 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp1_ != NULL) {
-#line 1125 "gnome-ask-password-agent.c"
-               PasswordDialog* _tmp2_;
-#line 201 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp2_ = self->priv->password_dialog;
-#line 201 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               gtk_window_present ((GtkWindow*) _tmp2_);
-#line 202 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return;
-#line 1133 "gnome-ask-password-agent.c"
-       }
-#line 205 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp3_ = self->priv->message;
-#line 205 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp4_ = self->priv->icon;
-#line 205 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp5_ = password_dialog_new (_tmp3_, _tmp4_);
-#line 205 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp6_ = g_object_ref_sink (_tmp5_);
-#line 205 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->password_dialog);
-#line 205 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->priv->password_dialog = _tmp6_;
-#line 207 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp7_ = self->priv->password_dialog;
-#line 207 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp8_ = gtk_dialog_run ((GtkDialog*) _tmp7_);
-#line 207 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _result_ = _tmp8_;
-#line 208 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp9_ = self->priv->password_dialog;
-#line 208 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp10_ = _tmp9_->entry;
-#line 208 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp11_ = gtk_entry_get_text (_tmp10_);
-#line 208 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp12_ = g_strdup (_tmp11_);
-#line 208 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       password = _tmp12_;
-#line 210 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp13_ = self->priv->password_dialog;
-#line 210 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_object_destroy ((GtkObject*) _tmp13_);
-#line 211 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->password_dialog);
-#line 211 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->priv->password_dialog = NULL;
-#line 213 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp15_ = _result_;
-#line 213 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp15_ == ((gint) GTK_RESPONSE_REJECT)) {
-#line 213 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp14_ = TRUE;
-#line 1177 "gnome-ask-password-agent.c"
-       } else {
-               gint _tmp16_;
-#line 214 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp16_ = _result_;
-#line 214 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp14_ = _tmp16_ == ((gint) GTK_RESPONSE_DELETE_EVENT);
-#line 1184 "gnome-ask-password-agent.c"
-       }
-#line 213 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp17_ = _tmp14_;
-#line 213 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_tmp17_) {
-#line 215 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (password);
-#line 215 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return;
-#line 1194 "gnome-ask-password-agent.c"
-       }
-       {
-               const gchar* _tmp18_ = NULL;
-               gint _tmp19_;
-               gchar* _tmp20_;
-               gchar* _tmp21_;
-               const gchar* _tmp22_;
-               gchar* _tmp23_;
-               const gchar* _tmp24_;
-               gchar* _tmp25_;
-               gchar** _tmp26_ = NULL;
-               gchar** _tmp27_;
-               gint _tmp27__length1;
-               gint _tmp28_ = 0;
-               gint _tmp29_;
-               GUnixOutputStream* _tmp30_;
-               GOutputStream* stream;
-               GOutputStream* _tmp31_;
-               const gchar* _tmp32_;
-               guint8* _tmp33_;
-               gint _tmp33__length1;
-               guint8* _tmp34_;
-               gint _tmp34__length1;
-#line 222 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp19_ = _result_;
-#line 222 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_tmp19_ == ((gint) GTK_RESPONSE_OK)) {
-#line 222 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp18_ = "1";
-#line 1224 "gnome-ask-password-agent.c"
-               } else {
-#line 222 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _tmp18_ = "0";
-#line 1228 "gnome-ask-password-agent.c"
-               }
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp20_ = g_strdup ("/usr/bin/pkexec");
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp21_ = g_strdup ("/lib/systemd/systemd-reply-password");
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp22_ = _tmp18_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp23_ = g_strdup (_tmp22_);
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp24_ = self->priv->socket;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp25_ = g_strdup (_tmp24_);
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp26_ = g_new0 (gchar*, 4 + 1);
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp26_[0] = _tmp20_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp26_[1] = _tmp21_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp26_[2] = _tmp23_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp26_[3] = _tmp25_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp27_ = _tmp26_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp27__length1 = 4;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_spawn_async_with_pipes (NULL, _tmp27_, NULL, 0, NULL, NULL, NULL, &_tmp28_, NULL, NULL, &_inner_error_);
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               to_process = _tmp28_;
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp27_ = (_vala_array_free (_tmp27_, _tmp27__length1, (GDestroyNotify) g_free), NULL);
-#line 220 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 1264 "gnome-ask-password-agent.c"
-                       goto __catch4_g_error;
-               }
-#line 231 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp29_ = to_process;
-#line 231 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp30_ = (GUnixOutputStream*) g_unix_output_stream_new (_tmp29_, TRUE);
-#line 231 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               stream = (GOutputStream*) _tmp30_;
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp31_ = stream;
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp32_ = password;
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp33_ = string_get_data (_tmp32_, &_tmp33__length1);
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp34_ = _tmp33_;
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp34__length1 = _tmp33__length1;
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_output_stream_write (_tmp31_, _tmp34_, (gsize) _tmp34__length1, NULL, &_inner_error_);
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 233 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-                       _g_object_unref0 (stream);
-#line 1289 "gnome-ask-password-agent.c"
-                       goto __catch4_g_error;
-               }
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (stream);
-#line 1294 "gnome-ask-password-agent.c"
-       }
-       goto __finally4;
-       __catch4_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp35_;
-               const gchar* _tmp36_;
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               e = _inner_error_;
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _inner_error_ = NULL;
-#line 238 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp35_ = e;
-#line 238 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp36_ = _tmp35_->message;
-#line 238 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               show_error (_tmp36_);
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_error_free0 (e);
-#line 1314 "gnome-ask-password-agent.c"
-       }
-       __finally4:
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_free0 (password);
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_clear_error (&_inner_error_);
-#line 219 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return;
-#line 1327 "gnome-ask-password-agent.c"
-       }
-#line 195 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_free0 (password);
-#line 1331 "gnome-ask-password-agent.c"
-}
-
-
-static void my_status_icon_class_init (MyStatusIconClass * klass) {
-#line 73 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       my_status_icon_parent_class = g_type_class_peek_parent (klass);
-#line 73 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_type_class_add_private (klass, sizeof (MyStatusIconPrivate));
-#line 73 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       G_OBJECT_CLASS (klass)->finalize = my_status_icon_finalize;
-#line 1342 "gnome-ask-password-agent.c"
-}
-
-
-static void my_status_icon_instance_init (MyStatusIcon * self) {
-#line 73 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self->priv = MY_STATUS_ICON_GET_PRIVATE (self);
-#line 1349 "gnome-ask-password-agent.c"
-}
-
-
-static void my_status_icon_finalize (GObject* obj) {
-       MyStatusIcon * self;
-#line 73 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       self = MY_STATUS_ICON (obj);
-#line 75 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->directory);
-#line 76 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->current);
-#line 77 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->file_monitor);
-#line 79 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_free0 (self->priv->message);
-#line 80 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_free0 (self->priv->icon);
-#line 81 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_free0 (self->priv->socket);
-#line 83 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (self->priv->password_dialog);
-#line 73 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       G_OBJECT_CLASS (my_status_icon_parent_class)->finalize (obj);
-#line 1373 "gnome-ask-password-agent.c"
-}
-
-
-GType my_status_icon_get_type (void) {
-       static volatile gsize my_status_icon_type_id__volatile = 0;
-       if (g_once_init_enter (&my_status_icon_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (MyStatusIconClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) my_status_icon_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MyStatusIcon), 0, (GInstanceInitFunc) my_status_icon_instance_init, NULL };
-               GType my_status_icon_type_id;
-               my_status_icon_type_id = g_type_register_static (GTK_TYPE_STATUS_ICON, "MyStatusIcon", &g_define_type_info, 0);
-               g_once_init_leave (&my_status_icon_type_id__volatile, my_status_icon_type_id);
-       }
-       return my_status_icon_type_id__volatile;
-}
-
-
-void show_error (const gchar* e) {
-       const gchar* _tmp0_;
-       GtkMessageDialog* _tmp1_;
-       GtkMessageDialog* _tmp2_;
-       GtkMessageDialog* m;
-#line 247 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_return_if_fail (e != NULL);
-#line 248 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp0_ = e;
-#line 248 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_);
-#line 248 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _tmp2_ = g_object_ref_sink (_tmp1_);
-#line 248 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       m = _tmp2_;
-#line 249 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_dialog_run ((GtkDialog*) m);
-#line 250 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       gtk_object_destroy ((GtkObject*) m);
-#line 247 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       _g_object_unref0 (m);
-#line 1410 "gnome-ask-password-agent.c"
-}
-
-
-gint _vala_main (gchar** args, int args_length1) {
-       gint result = 0;
-       GError * _inner_error_ = NULL;
-       {
-               MyStatusIcon* _tmp0_;
-               MyStatusIcon* i;
-#line 255 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               gtk_init_with_args (&args_length1, &args, "[OPTION...]", entries, "systemd-ask-password-agent", &_inner_error_);
-#line 255 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 1424 "gnome-ask-password-agent.c"
-                       goto __catch5_g_error;
-               }
-#line 256 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               notify_init ("Password Agent");
-#line 258 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp0_ = my_status_icon_new (&_inner_error_);
-#line 258 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               i = _tmp0_;
-#line 258 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               if (_inner_error_ != NULL) {
-#line 1435 "gnome-ask-password-agent.c"
-                       goto __catch5_g_error;
-               }
-#line 259 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               gtk_main ();
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_object_unref0 (i);
-#line 1442 "gnome-ask-password-agent.c"
-       }
-       goto __finally5;
-       __catch5_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp1_;
-               const gchar* _tmp2_;
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               e = _inner_error_;
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _inner_error_ = NULL;
-#line 262 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp1_ = e;
-#line 262 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _tmp2_ = _tmp1_->message;
-#line 262 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               show_error (_tmp2_);
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               _g_error_free0 (e);
-#line 1462 "gnome-ask-password-agent.c"
-       }
-       __finally5:
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       if (_inner_error_ != NULL) {
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               g_clear_error (&_inner_error_);
-#line 254 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-               return 0;
-#line 1473 "gnome-ask-password-agent.c"
-       }
-#line 265 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       result = 0;
-#line 265 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return result;
-#line 1479 "gnome-ask-password-agent.c"
-}
-
-
-int main (int argc, char ** argv) {
-#line 253 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       g_type_init ();
-#line 253 "/home/lennart/projects/systemd/src/gnome-ask-password-agent.vala"
-       return _vala_main (argv, argc);
-#line 1488 "gnome-ask-password-agent.c"
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-       if ((array != NULL) && (destroy_func != NULL)) {
-               int i;
-               for (i = 0; i < array_length; i = i + 1) {
-                       if (((gpointer*) array)[i] != NULL) {
-                               destroy_func (((gpointer*) array)[i]);
-                       }
-               }
-       }
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-       _vala_array_destroy (array, array_length, destroy_func);
-       g_free (array);
-}
-
-
-
index e23aedb..c31c07e 100644 (file)
@@ -37,8 +37,13 @@ public class PasswordDialog : Dialog {
                 set_default_response(ResponseType.OK);
                 set_icon_name(icon);
 
+#if LIBNOTIFY07
                 add_button(Stock.CANCEL, ResponseType.CANCEL);
                 add_button(Stock.OK, ResponseType.OK);
+#else
+                add_button(STOCK_CANCEL, ResponseType.CANCEL);
+                add_button(STOCK_OK, ResponseType.OK);
+#endif
 
                 Container content = (Container) get_content_area();
 
@@ -185,7 +190,12 @@ public class MyStatusIcon : StatusIcon {
 
                 set_visible(true);
 
+#if LIBNOTIFY07
                 Notification n = new Notification(title, message, icon);
+#else
+                Notification n = new Notification(title, message, icon, null);
+                n.attach_to_status_icon(this);
+#endif
                 n.set_timeout(5000);
                 n.show();
 
index 7ef8097..95ea45d 100644 (file)
@@ -558,17 +558,6 @@ void* hashmap_first(Hashmap *h) {
         return h->iterate_list_head->value;
 }
 
-void* hashmap_first_key(Hashmap *h) {
-
-        if (!h)
-                return NULL;
-
-        if (!h->iterate_list_head)
-                return NULL;
-
-        return (void*) h->iterate_list_head->key;
-}
-
 void* hashmap_last(Hashmap *h) {
 
         if (!h)
index ab4363a..16ffbd3 100644 (file)
@@ -74,7 +74,6 @@ void hashmap_clear(Hashmap *h);
 void *hashmap_steal_first(Hashmap *h);
 void *hashmap_steal_first_key(Hashmap *h);
 void* hashmap_first(Hashmap *h);
-void* hashmap_first_key(Hashmap *h);
 void* hashmap_last(Hashmap *h);
 
 char **hashmap_get_strv(Hashmap *h);
index 2c2f10c..7216b75 100644 (file)
@@ -30,7 +30,7 @@
 #include "util.h"
 #include "log.h"
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
 #define FILENAME "/etc/sysconfig/network"
 #elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
 #define FILENAME "/etc/HOSTNAME"
@@ -64,7 +64,7 @@ static int read_and_strip_hostname(const char *path, char **hn) {
 
 static int read_distro_hostname(char **hn) {
 
-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO)
         int r;
         FILE *f;
 
similarity index 95%
rename from src/hostname/hostnamed.c
rename to src/hostnamed.c
index ad72440..f3b2c94 100644 (file)
@@ -280,24 +280,18 @@ static int bus_hostname_append_icon_name(DBusMessageIter *i, const char *propert
         return bus_property_append_string(i, property, (void*) name);
 }
 
-static const BusProperty bus_hostname_properties[] = {
-        { "Hostname",       bus_property_append_string,    "s", sizeof(data[0])*PROP_HOSTNAME,        true },
-        { "StaticHostname", bus_property_append_string,    "s", sizeof(data[0])*PROP_STATIC_HOSTNAME, true },
-        { "PrettyHostname", bus_property_append_string,    "s", sizeof(data[0])*PROP_PRETTY_HOSTNAME, true },
-        { "IconName",       bus_hostname_append_icon_name, "s", sizeof(data[0])*PROP_ICON_NAME,       true },
-        { NULL, }
-};
-
-static const BusBoundProperties bps[] = {
-        { "org.freedesktop.hostname1", bus_hostname_properties, data },
-        { NULL, }
-};
-
 static DBusHandlerResult hostname_message_handler(
                 DBusConnection *connection,
                 DBusMessage *message,
                 void *userdata) {
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.hostname1", "Hostname",       bus_property_append_string,    "s", data[PROP_HOSTNAME]},
+                { "org.freedesktop.hostname1", "StaticHostname", bus_property_append_string,    "s", data[PROP_STATIC_HOSTNAME]},
+                { "org.freedesktop.hostname1", "PrettyHostname", bus_property_append_string,    "s", data[PROP_PRETTY_HOSTNAME]},
+                { "org.freedesktop.hostname1", "IconName",       bus_hostname_append_icon_name, "s", data[PROP_ICON_NAME]},
+                { NULL, NULL, NULL, NULL, NULL }
+        };
 
         DBusMessage *reply = NULL, *changed = NULL;
         DBusError error;
@@ -332,7 +326,7 @@ static DBusHandlerResult hostname_message_handler(
                 if (!streq_ptr(name, data[PROP_HOSTNAME])) {
                         char *h;
 
-                        r = verify_polkit(connection, message, "org.freedesktop.hostname1.set-hostname", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.hostname1.set-hostname", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
@@ -376,7 +370,7 @@ static DBusHandlerResult hostname_message_handler(
 
                 if (!streq_ptr(name, data[PROP_STATIC_HOSTNAME])) {
 
-                        r = verify_polkit(connection, message, "org.freedesktop.hostname1.set-static-hostname", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.hostname1.set-static-hostname", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
@@ -441,7 +435,7 @@ static DBusHandlerResult hostname_message_handler(
 
                         r = verify_polkit(connection, message, k == PROP_PRETTY_HOSTNAME ?
                                           "org.freedesktop.hostname1.set-static-hostname" :
-                                          "org.freedesktop.hostname1.set-machine-info", interactive, NULL, &error);
+                                          "org.freedesktop.hostname1.set-machine-info", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
@@ -476,7 +470,7 @@ static DBusHandlerResult hostname_message_handler(
                 }
 
         } else
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (!(reply = dbus_message_new_method_return(message)))
                 goto oom;
index 53d03a9..eaa717a 100644 (file)
 #include <ctype.h>
 
 #include <dbus/dbus.h>
-#include <systemd/sd-daemon.h>
 
 #include "util.h"
 #include "log.h"
 #include "list.h"
 #include "initreq.h"
 #include "special.h"
+#include "sd-daemon.h"
 #include "dbus-common.h"
 #include "def.h"
 
@@ -56,8 +56,6 @@ typedef struct Server {
         unsigned n_fifos;
 
         DBusConnection *bus;
-
-        bool quit;
 } Server;
 
 struct Fifo {
@@ -176,13 +174,6 @@ static void request_process(Server *s, const struct init_request *req) {
                         case 'U':
                                 if (kill(1, SIGTERM) < 0)
                                         log_error("kill() failed: %m");
-
-                                /* The bus connection will be
-                                 * terminated if PID 1 is reexecuted,
-                                 * hence let's just exit here, and
-                                 * rely on that we'll be restarted on
-                                 * the next request */
-                                s->quit = true;
                                 break;
 
                         case 'q':
@@ -388,7 +379,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
@@ -413,7 +404,7 @@ int main(int argc, char *argv[]) {
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
-        while (!server.quit) {
+        for (;;) {
                 struct epoll_event event;
                 int k;
 
index 174d79b..cfbd50e 100644 (file)
@@ -72,8 +72,9 @@ static int get_config_path(UnitFileScope scope, bool runtime, const char *root_d
         case UNIT_FILE_SYSTEM:
 
                 if (root_dir && runtime)
-                        asprintf(&p, "%s/run/systemd/system", root_dir);
-                else if (runtime)
+                        return -EINVAL;
+
+                if (runtime)
                         p = strdup("/run/systemd/system");
                 else if (root_dir)
                         asprintf(&p, "%s/%s", root_dir, SYSTEM_CONFIG_UNIT_PATH);
@@ -1571,10 +1572,10 @@ UnitFileState unit_file_get_state(
                 }
 
                 if (lstat(path, &st) < 0) {
-                        r = -errno;
                         if (errno == ENOENT)
                                 continue;
 
+                        r = -errno;
                         goto finish;
                 }
 
index e57286f..5c0913b 100644 (file)
--- a/src/job.c
+++ b/src/job.c
@@ -62,8 +62,8 @@ void job_free(Job *j) {
         if (j->installed) {
                 bus_job_send_removed_signal(j);
 
-                if (j->unit->job == j) {
-                        j->unit->job = NULL;
+                if (j->unit->meta.job == j) {
+                        j->unit->meta.job = NULL;
                         unit_add_to_gc_queue(j->unit);
                 }
 
@@ -147,7 +147,7 @@ void job_dump(Job *j, FILE*f, const char *prefix) {
                 "%s\tState: %s\n"
                 "%s\tForced: %s\n",
                 prefix, j->id,
-                prefix, j->unit->id, job_type_to_string(j->type),
+                prefix, j->unit->meta.id, job_type_to_string(j->type),
                 prefix, job_state_to_string(j->state),
                 prefix, yes_no(j->override));
 }
@@ -326,19 +326,19 @@ bool job_is_runnable(Job *j) {
                  * dependencies, regardless whether they are
                  * starting or stopping something. */
 
-                SET_FOREACH(other, j->unit->dependencies[UNIT_AFTER], i)
-                        if (other->job)
+                SET_FOREACH(other, j->unit->meta.dependencies[UNIT_AFTER], i)
+                        if (other->meta.job)
                                 return false;
         }
 
         /* Also, if something else is being stopped and we should
          * change state after it, then lets wait. */
 
-        SET_FOREACH(other, j->unit->dependencies[UNIT_BEFORE], i)
-                if (other->job &&
-                    (other->job->type == JOB_STOP ||
-                     other->job->type == JOB_RESTART ||
-                     other->job->type == JOB_TRY_RESTART))
+        SET_FOREACH(other, j->unit->meta.dependencies[UNIT_BEFORE], i)
+                if (other->meta.job &&
+                    (other->meta.job->type == JOB_STOP ||
+                     other->meta.job->type == JOB_RESTART ||
+                     other->meta.job->type == JOB_TRY_RESTART))
                         return false;
 
         /* This means that for a service a and a service b where b
@@ -484,20 +484,19 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {
                 switch (result) {
 
                 case JOB_DONE:
-                        unit_status_printf(u, ANSI_HIGHLIGHT_GREEN_ON "  OK  " ANSI_HIGHLIGHT_OFF, "Started %s", unit_description(u));
+                        unit_status_printf(u, "Started %s.\n", unit_description(u));
                         break;
 
                 case JOB_FAILED:
-                        unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON "FAILED" ANSI_HIGHLIGHT_OFF, "Failed to start %s", unit_description(u));
-                        unit_status_printf(u, NULL, "See 'systemctl status %s' for details.", u->id);
+                        unit_status_printf(u, "Starting %s " ANSI_HIGHLIGHT_ON "failed" ANSI_HIGHLIGHT_OFF ", see 'systemctl status %s' for details.\n", unit_description(u), u->meta.id);
                         break;
 
                 case JOB_DEPENDENCY:
-                        unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON " ABORT" ANSI_HIGHLIGHT_OFF, "Dependency failed. Aborted start of %s", unit_description(u));
+                        unit_status_printf(u, "Starting %s " ANSI_HIGHLIGHT_ON "aborted" ANSI_HIGHLIGHT_OFF " because a dependency failed.\n", unit_description(u));
                         break;
 
                 case JOB_TIMEOUT:
-                        unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON " TIME " ANSI_HIGHLIGHT_OFF, "Timed out starting %s", unit_description(u));
+                        unit_status_printf(u, "Starting %s " ANSI_HIGHLIGHT_ON "timed out" ANSI_HIGHLIGHT_OFF ".\n", unit_description(u), u->meta.id);
                         break;
 
                 default:
@@ -509,12 +508,12 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {
                 switch (result) {
 
                 case JOB_TIMEOUT:
-                        unit_status_printf(u, ANSI_HIGHLIGHT_RED_ON " TIME " ANSI_HIGHLIGHT_OFF, "Timed out stopping %s", unit_description(u));
+                        unit_status_printf(u, "Stopping %s " ANSI_HIGHLIGHT_ON "timed out" ANSI_HIGHLIGHT_OFF ".\n", unit_description(u), u->meta.id);
                         break;
 
                 case JOB_DONE:
                 case JOB_FAILED:
-                        unit_status_printf(u, ANSI_HIGHLIGHT_GREEN_ON "  OK  " ANSI_HIGHLIGHT_OFF, "Stopped %s", unit_description(u));
+                        unit_status_printf(u, "Stopped %s.\n", unit_description(u));
                         break;
 
                 default:
@@ -528,7 +527,6 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
         Unit *other;
         JobType t;
         Iterator i;
-        bool recursed = false;
 
         assert(j);
         assert(j->installed);
@@ -539,8 +537,8 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
         if (result == JOB_DONE && (j->type == JOB_RESTART || j->type == JOB_TRY_RESTART)) {
 
                 log_debug("Converting job %s/%s -> %s/%s",
-                          j->unit->id, job_type_to_string(j->type),
-                          j->unit->id, job_type_to_string(JOB_START));
+                          j->unit->meta.id, job_type_to_string(j->type),
+                          j->unit->meta.id, job_type_to_string(JOB_START));
 
                 j->state = JOB_WAITING;
                 j->type = JOB_START;
@@ -553,7 +551,7 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
 
         j->result = result;
 
-        log_debug("Job %s/%s finished, result=%s", j->unit->id, job_type_to_string(j->type), job_result_to_string(result));
+        log_debug("Job %s/%s finished, result=%s", j->unit->meta.id, job_type_to_string(j->type), job_result_to_string(result));
 
         if (result == JOB_FAILED)
                 j->manager->n_failed_jobs ++;
@@ -571,44 +569,36 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
                     t == JOB_VERIFY_ACTIVE ||
                     t == JOB_RELOAD_OR_START) {
 
-                        SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY], i)
-                                if (other->job &&
-                                    (other->job->type == JOB_START ||
-                                     other->job->type == JOB_VERIFY_ACTIVE ||
-                                     other->job->type == JOB_RELOAD_OR_START)) {
-                                        job_finish_and_invalidate(other->job, JOB_DEPENDENCY);
-                                        recursed = true;
-                                }
-
-                        SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i)
-                                if (other->job &&
-                                    (other->job->type == JOB_START ||
-                                     other->job->type == JOB_VERIFY_ACTIVE ||
-                                     other->job->type == JOB_RELOAD_OR_START)) {
-                                        job_finish_and_invalidate(other->job, JOB_DEPENDENCY);
-                                        recursed = true;
-                                }
-
-                        SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
-                                if (other->job &&
-                                    !other->job->override &&
-                                    (other->job->type == JOB_START ||
-                                     other->job->type == JOB_VERIFY_ACTIVE ||
-                                     other->job->type == JOB_RELOAD_OR_START)) {
-                                        job_finish_and_invalidate(other->job, JOB_DEPENDENCY);
-                                        recursed = true;
-                                }
+                        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
+                                if (other->meta.job &&
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
+                                        job_finish_and_invalidate(other->meta.job, JOB_DEPENDENCY);
+
+                        SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
+                                if (other->meta.job &&
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
+                                        job_finish_and_invalidate(other->meta.job, JOB_DEPENDENCY);
+
+                        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
+                                if (other->meta.job &&
+                                    !other->meta.job->override &&
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
+                                        job_finish_and_invalidate(other->meta.job, JOB_DEPENDENCY);
 
                 } else if (t == JOB_STOP) {
 
-                        SET_FOREACH(other, u->dependencies[UNIT_CONFLICTED_BY], i)
-                                if (other->job &&
-                                    (other->job->type == JOB_START ||
-                                     other->job->type == JOB_VERIFY_ACTIVE ||
-                                     other->job->type == JOB_RELOAD_OR_START)) {
-                                        job_finish_and_invalidate(other->job, JOB_DEPENDENCY);
-                                        recursed = true;
-                                }
+                        SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTED_BY], i)
+                                if (other->meta.job &&
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
+                                        job_finish_and_invalidate(other->meta.job, JOB_DEPENDENCY);
                 }
         }
 
@@ -618,7 +608,7 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
          * unit itself. */
         if (result == JOB_TIMEOUT || result == JOB_DEPENDENCY) {
                 log_notice("Job %s/%s failed with result '%s'.",
-                           u->id,
+                           u->meta.id,
                            job_type_to_string(t),
                            job_result_to_string(result));
 
@@ -627,16 +617,16 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
 
 finish:
         /* Try to start the next jobs that can be started */
-        SET_FOREACH(other, u->dependencies[UNIT_AFTER], i)
-                if (other->job)
-                        job_add_to_run_queue(other->job);
-        SET_FOREACH(other, u->dependencies[UNIT_BEFORE], i)
-                if (other->job)
-                        job_add_to_run_queue(other->job);
+        SET_FOREACH(other, u->meta.dependencies[UNIT_AFTER], i)
+                if (other->meta.job)
+                        job_add_to_run_queue(other->meta.job);
+        SET_FOREACH(other, u->meta.dependencies[UNIT_BEFORE], i)
+                if (other->meta.job)
+                        job_add_to_run_queue(other->meta.job);
 
-        manager_check_finished(u->manager);
+        manager_check_finished(u->meta.manager);
 
-        return recursed;
+        return 0;
 }
 
 int job_start_timer(Job *j) {
@@ -645,7 +635,7 @@ int job_start_timer(Job *j) {
         int fd, r;
         assert(j);
 
-        if (j->unit->job_timeout <= 0 ||
+        if (j->unit->meta.job_timeout <= 0 ||
             j->timer_watch.type == WATCH_JOB_TIMER)
                 return 0;
 
@@ -657,7 +647,7 @@ int job_start_timer(Job *j) {
         }
 
         zero(its);
-        timespec_store(&its.it_value, j->unit->job_timeout);
+        timespec_store(&its.it_value, j->unit->meta.job_timeout);
 
         if (timerfd_settime(fd, 0, &its, NULL) < 0) {
                 r = -errno;
@@ -727,7 +717,7 @@ void job_timer_event(Job *j, uint64_t n_elapsed, Watch *w) {
         assert(j);
         assert(w == &j->timer_watch);
 
-        log_warning("Job %s/%s timed out.", j->unit->id, job_type_to_string(j->type));
+        log_warning("Job %s/%s timed out.", j->unit->meta.id, job_type_to_string(j->type));
         job_finish_and_invalidate(j, JOB_TIMEOUT);
 }
 
diff --git a/src/journal/cat.c b/src/journal/cat.c
deleted file mode 100644 (file)
index 6745f1c..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdio.h>
-#include <getopt.h>
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/fcntl.h>
-
-#include <systemd/sd-journal.h>
-
-#include "util.h"
-#include "build.h"
-
-static char *arg_identifier = NULL;
-static char arg_priority = LOG_INFO;
-static bool arg_level_prefix = true;
-
-static int help(void) {
-
-        printf("%s [OPTIONS...] {COMMAND} ...\n\n"
-               "Execute process with stdout/stderr connected to the journal.\n\n"
-               "  -h --help               Show this help\n"
-               "     --version            Show package version\n"
-               "  -t --identifier=STRING  Set syslog identifier\n"
-               "  -p --priority=PRIORITY  Set priority value (0..7)\n"
-               "     --level-prefix=BOOL  Control whether level prefix shall be parsed\n",
-               program_invocation_short_name);
-
-        return 0;
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_VERSION = 0x100,
-                ARG_LEVEL_PREFIX
-        };
-
-        static const struct option options[] = {
-                { "help",         no_argument,       NULL, 'h'              },
-                { "version" ,     no_argument,       NULL, ARG_VERSION      },
-                { "identifier",   required_argument, NULL, 't'              },
-                { "priority",     required_argument, NULL, 'p'              },
-                { "level-prefix", required_argument, NULL, ARG_LEVEL_PREFIX },
-                { NULL,           0,                 NULL, 0                }
-        };
-
-        int c;
-
-        assert(argc >= 0);
-        assert(argv);
-
-        while ((c = getopt_long(argc, argv, "+ht:p:", options, NULL)) >= 0) {
-
-                switch (c) {
-
-                case 'h':
-                        help();
-                        return 0;
-
-                case ARG_VERSION:
-                        puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
-                        puts(SYSTEMD_FEATURES);
-                        return 0;
-
-                case 't':
-                        free(arg_identifier);
-                        if (isempty(optarg))
-                                arg_identifier = NULL;
-                        else {
-                                arg_identifier = strdup(optarg);
-                                if (!arg_identifier) {
-                                        log_error("Out of memory.");
-                                        return -ENOMEM;
-                                }
-                        }
-                        break;
-
-                case 'p':
-                        arg_priority = log_level_from_string(optarg);
-                        if (arg_priority < 0) {
-                                log_error("Failed to parse priority value.");
-                                return arg_priority;
-                        }
-                        break;
-
-                case ARG_LEVEL_PREFIX: {
-                        int k;
-
-                        k = parse_boolean(optarg);
-                        if (k < 0) {
-                                log_error("Failed to parse level prefix value.");
-                                return k;
-                        }
-                        arg_level_prefix = k;
-                        break;
-                }
-
-                default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
-                }
-        }
-
-        return 1;
-}
-
-int main(int argc, char *argv[]) {
-        int r, fd = -1, saved_stderr = -1;
-
-        log_parse_environment();
-        log_open();
-
-        r = parse_argv(argc, argv);
-        if (r <= 0)
-                goto finish;
-
-        fd = sd_journal_stream_fd(arg_identifier, arg_priority, arg_level_prefix);
-        if (fd < 0) {
-                log_error("Failed to create stream fd: %s", strerror(fd));
-                r = fd;
-                goto finish;
-        }
-
-        saved_stderr = fcntl(STDERR_FILENO, F_DUPFD_CLOEXEC, 3);
-
-        if (dup3(fd, STDOUT_FILENO, 0) < 0 ||
-            dup3(fd, STDERR_FILENO, 0) < 0) {
-                log_error("Failed to duplicate fd: %s", strerror(fd));
-                r = -errno;
-                goto finish;
-        }
-
-        if (fd >= 3)
-                close_nointr_nofail(fd);
-
-        fd = -1;
-
-        if (argc <= optind)
-                execl("/bin/cat", "/bin/cat", NULL);
-        else
-                execvp(argv[optind], argv + optind);
-
-        /* Let's try to restore a working stderr, so we can print the error message */
-        if (saved_stderr >= 0)
-                dup3(saved_stderr, STDERR_FILENO, 0);
-
-        log_error("Failed to execute process: %m");
-        r = -errno;
-
-finish:
-        if (fd >= 0)
-                close_nointr_nofail(fd);
-
-        if (saved_stderr >= 0)
-                close_nointr_nofail(saved_stderr);
-
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
diff --git a/src/journal/compress.c b/src/journal/compress.c
deleted file mode 100644 (file)
index ff90658..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <lzma.h>
-
-#include "compress.h"
-
-bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_size) {
-        lzma_stream s = LZMA_STREAM_INIT;
-        lzma_ret ret;
-        bool b = false;
-
-        assert(src);
-        assert(src_size > 0);
-        assert(dst);
-        assert(dst_size);
-
-        /* Returns false if we couldn't compress the data or the
-         * compressed result is longer than the original */
-
-        ret = lzma_easy_encoder(&s, LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE);
-        if (ret != LZMA_OK)
-                return false;
-
-        s.next_in = src;
-        s.avail_in = src_size;
-        s.next_out = dst;
-        s.avail_out = src_size;
-
-        /* Does it fit? */
-        if (lzma_code(&s, LZMA_FINISH) != LZMA_STREAM_END)
-                goto fail;
-
-        /* Is it actually shorter? */
-        if (s.avail_out == 0)
-                goto fail;
-
-        *dst_size = src_size - s.avail_out;
-        b = true;
-
-fail:
-        lzma_end(&s);
-
-        return b;
-}
-
-bool uncompress_blob(const void *src, uint64_t src_size,
-                     void **dst, uint64_t *dst_alloc_size, uint64_t* dst_size) {
-
-        lzma_stream s = LZMA_STREAM_INIT;
-        lzma_ret ret;
-        bool b = false;
-
-        assert(src);
-        assert(src_size > 0);
-        assert(dst);
-        assert(dst_alloc_size);
-        assert(dst_size);
-        assert(*dst_alloc_size == 0 || *dst);
-
-        ret = lzma_stream_decoder(&s, UINT64_MAX, 0);
-        if (ret != LZMA_OK)
-                return false;
-
-        if (*dst_alloc_size <= src_size) {
-                void *p;
-
-                p = realloc(*dst, src_size*2);
-                if (!p)
-                        return false;
-
-                *dst = p;
-                *dst_alloc_size = src_size*2;
-        }
-
-        s.next_in = src;
-        s.avail_in = src_size;
-
-        s.next_out = *dst;
-        s.avail_out = *dst_alloc_size;
-
-        for (;;) {
-                void *p;
-
-                ret = lzma_code(&s, LZMA_FINISH);
-
-                if (ret == LZMA_STREAM_END)
-                        break;
-
-                if (ret != LZMA_OK)
-                        goto fail;
-
-                p = realloc(*dst, *dst_alloc_size*2);
-                if (!p)
-                        goto fail;
-
-                s.next_out = (uint8_t*) p + ((uint8_t*) s.next_out - (uint8_t*) *dst);
-                s.avail_out += *dst_alloc_size;
-
-                *dst = p;
-                *dst_alloc_size *= 2;
-        }
-
-        *dst_size = *dst_alloc_size - s.avail_out;
-        b = true;
-
-fail:
-        lzma_end(&s);
-
-        return b;
-}
-
-bool uncompress_startswith(const void *src, uint64_t src_size,
-                           void **buffer, uint64_t *buffer_size,
-                           const void *prefix, uint64_t prefix_len,
-                           uint8_t extra) {
-
-        lzma_stream s = LZMA_STREAM_INIT;
-        lzma_ret ret;
-        bool b = false;
-
-        /* Checks whether the uncompressed blob starts with the
-         * mentioned prefix. The byte extra needs to follow the
-         * prefix */
-
-        assert(src);
-        assert(src_size > 0);
-        assert(buffer);
-        assert(buffer_size);
-        assert(prefix);
-        assert(*buffer_size == 0 || *buffer);
-
-        ret = lzma_stream_decoder(&s, UINT64_MAX, 0);
-        if (ret != LZMA_OK)
-                return false;
-
-        if (*buffer_size <= prefix_len) {
-                void *p;
-
-                p = realloc(*buffer, prefix_len*2);
-                if (!p)
-                        return false;
-
-                *buffer = p;
-                *buffer_size = prefix_len*2;
-        }
-
-        s.next_in = src;
-        s.avail_in = src_size;
-
-        s.next_out = *buffer;
-        s.avail_out = *buffer_size;
-
-        for (;;) {
-                void *p;
-
-                ret = lzma_code(&s, LZMA_FINISH);
-
-                if (ret != LZMA_STREAM_END && ret != LZMA_OK)
-                        goto fail;
-
-                if ((*buffer_size - s.avail_out > prefix_len) &&
-                    memcmp(*buffer, prefix, prefix_len) == 0 &&
-                    ((const uint8_t*) *buffer)[prefix_len] == extra)
-                        break;
-
-                if (ret == LZMA_STREAM_END)
-                        goto fail;
-
-                p = realloc(*buffer, *buffer_size*2);
-                if (!p)
-                        goto fail;
-
-                s.next_out = (uint8_t*) p + ((uint8_t*) s.next_out - (uint8_t*) *buffer);
-                s.avail_out += *buffer_size;
-
-                *buffer = p;
-                *buffer_size *= 2;
-        }
-
-        b = true;
-
-fail:
-        lzma_end(&s);
-
-        return b;
-}
diff --git a/src/journal/compress.h b/src/journal/compress.h
deleted file mode 100644 (file)
index f187a6e..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foocompresshfoo
-#define foocompresshfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <stdbool.h>
-
-bool compress_blob(const void *src, uint64_t src_size, void *dst, uint64_t *dst_size);
-
-bool uncompress_blob(const void *src, uint64_t src_size,
-                     void **dst, uint64_t *dst_alloc_size, uint64_t* dst_size);
-
-bool uncompress_startswith(const void *src, uint64_t src_size,
-                           void **buffer, uint64_t *buffer_size,
-                           const void *prefix, uint64_t prefix_len,
-                           uint8_t extra);
-
-#endif
diff --git a/src/journal/coredump.c b/src/journal/coredump.c
deleted file mode 100644 (file)
index 7dea66e..0000000
+++ /dev/null
@@ -1,271 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/prctl.h>
-
-#include <systemd/sd-journal.h>
-#include <systemd/sd-login.h>
-
-#include "log.h"
-#include "util.h"
-#include "special.h"
-
-#define COREDUMP_MAX (24*1024*1024)
-
-enum {
-        ARG_PID = 1,
-        ARG_UID,
-        ARG_GID,
-        ARG_SIGNAL,
-        ARG_TIMESTAMP,
-        ARG_COMM,
-        _ARG_MAX
-};
-
-static int divert_coredump(void) {
-        FILE *f;
-        int r;
-
-        log_info("Detected coredump of the journal daemon itself, diverting coredump to /var/lib/systemd/coredump/.");
-
-        mkdir_p("/var/lib/systemd/coredump", 0755);
-
-        f = fopen("/var/lib/systemd/coredump/core.systemd-journald", "we");
-        if (!f) {
-                log_error("Failed to create coredump file: %m");
-                return -errno;
-        }
-
-        for (;;) {
-                uint8_t buffer[4096];
-                size_t l, q;
-
-                l = fread(buffer, 1, sizeof(buffer), stdin);
-                if (l <= 0) {
-                        if (ferror(f)) {
-                                log_error("Failed to read coredump: %m");
-                                r = -errno;
-                                goto finish;
-                        }
-
-                        r = 0;
-                        break;
-                }
-
-                q = fwrite(buffer, 1, l, f);
-                if (q != l) {
-                        log_error("Failed to write coredump: %m");
-                        r = -errno;
-                        goto finish;
-                }
-        }
-
-        fflush(f);
-
-        if (ferror(f)) {
-                log_error("Failed to write coredump: %m");
-                r = -errno;
-        }
-
-finish:
-        fclose(f);
-        return r;
-}
-
-int main(int argc, char* argv[]) {
-        int r, j = 0;
-        char *p = NULL;
-        ssize_t n;
-        pid_t pid;
-        uid_t uid;
-        gid_t gid;
-        struct iovec iovec[14];
-        char *core_pid = NULL, *core_uid = NULL, *core_gid = NULL, *core_signal = NULL,
-                *core_timestamp = NULL, *core_comm = NULL, *core_exe = NULL, *core_unit = NULL,
-                *core_session = NULL, *core_message = NULL, *core_cmdline = NULL, *t;
-
-        prctl(PR_SET_DUMPABLE, 0);
-
-        if (argc != _ARG_MAX) {
-                log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
-                log_open();
-
-                log_error("Invalid number of arguments passed from kernel.");
-                r = -EINVAL;
-                goto finish;
-        }
-
-        r = parse_pid(argv[ARG_PID], &pid);
-        if (r < 0) {
-                log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
-                log_open();
-
-                log_error("Failed to parse PID.");
-                goto finish;
-        }
-
-        if (sd_pid_get_unit(pid, &t) >= 0) {
-
-                if (streq(t, SPECIAL_JOURNALD_SERVICE)) {
-                        /* Make sure we don't make use of the journal,
-                         * if it's the journal which is crashing */
-                        log_set_target(LOG_TARGET_KMSG);
-                        log_open();
-
-                        r = divert_coredump();
-                        goto finish;
-                }
-
-                core_unit = strappend("COREDUMP_UNIT=", t);
-                free(t);
-
-                if (core_unit)
-                        IOVEC_SET_STRING(iovec[j++], core_unit);
-        }
-
-        /* OK, now we know it's not the journal, hence make use of
-         * it */
-        log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
-        log_open();
-
-        r = parse_uid(argv[ARG_UID], &uid);
-        if (r < 0) {
-                log_error("Failed to parse UID.");
-                goto finish;
-        }
-
-        r = parse_gid(argv[ARG_GID], &gid);
-        if (r < 0) {
-                log_error("Failed to parse GID.");
-                goto finish;
-        }
-
-        core_pid = strappend("COREDUMP_PID=", argv[ARG_PID]);
-        if (core_pid)
-                IOVEC_SET_STRING(iovec[j++], core_pid);
-
-        core_uid = strappend("COREDUMP_UID=", argv[ARG_UID]);
-        if (core_uid)
-                IOVEC_SET_STRING(iovec[j++], core_uid);
-
-        core_gid = strappend("COREDUMP_GID=", argv[ARG_GID]);
-        if (core_gid)
-                IOVEC_SET_STRING(iovec[j++], core_gid);
-
-        core_signal = strappend("COREDUMP_SIGNAL=", argv[ARG_SIGNAL]);
-        if (core_signal)
-                IOVEC_SET_STRING(iovec[j++], core_signal);
-
-        core_comm = strappend("COREDUMP_COMM=", argv[ARG_COMM]);
-        if (core_comm)
-                IOVEC_SET_STRING(iovec[j++], core_comm);
-
-        if (sd_pid_get_session(pid, &t) >= 0) {
-                core_session = strappend("COREDUMP_SESSION=", t);
-                free(t);
-
-                if (core_session)
-                        IOVEC_SET_STRING(iovec[j++], core_session);
-        }
-
-        if (get_process_exe(pid, &t) >= 0) {
-                core_exe = strappend("COREDUMP_EXE=", t);
-                free(t);
-
-                if (core_exe)
-                        IOVEC_SET_STRING(iovec[j++], core_exe);
-        }
-
-        if (get_process_cmdline(pid, LINE_MAX, false, &t) >= 0) {
-                core_cmdline = strappend("COREDUMP_CMDLINE=", t);
-                free(t);
-
-                if (core_cmdline)
-                        IOVEC_SET_STRING(iovec[j++], core_cmdline);
-        }
-
-        core_timestamp = join("COREDUMP_TIMESTAMP=", argv[ARG_TIMESTAMP], "000000", NULL);
-        if (core_timestamp)
-                IOVEC_SET_STRING(iovec[j++], core_timestamp);
-
-        IOVEC_SET_STRING(iovec[j++], "MESSAGE_ID=fc2e22bc6ee647b6b90729ab34a250b1");
-        IOVEC_SET_STRING(iovec[j++], "PRIORITY=2");
-
-        core_message = join("MESSAGE=Process ", argv[ARG_PID], " (", argv[ARG_COMM], ") dumped core.", NULL);
-        if (core_message)
-                IOVEC_SET_STRING(iovec[j++], core_message);
-
-        /* Now, let's drop privileges to become the user who owns the
-         * segfaulted process and allocate the coredump memory under
-         * his uid. This also ensures that the credentials journald
-         * will see are the ones of the coredumping user, thus making
-         * sure the user himself gets access to the core dump. */
-
-        if (setresgid(gid, gid, gid) < 0 ||
-            setresuid(uid, uid, uid) < 0) {
-                log_error("Failed to drop privileges: %m");
-                r = -errno;
-                goto finish;
-        }
-
-        p = malloc(9 + COREDUMP_MAX);
-        if (!p) {
-                log_error("Out of memory");
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        memcpy(p, "COREDUMP=", 9);
-
-        n = loop_read(STDIN_FILENO, p + 9, COREDUMP_MAX, false);
-        if (n < 0) {
-                log_error("Failed to read core dump data: %s", strerror(-n));
-                r = (int) n;
-                goto finish;
-        }
-
-        iovec[j].iov_base = p;
-        iovec[j].iov_len = 9 + n;
-        j++;
-
-        r = sd_journal_sendv(iovec, j);
-        if (r < 0)
-                log_error("Failed to send coredump: %s", strerror(-r));
-
-finish:
-        free(p);
-        free(core_pid);
-        free(core_uid);
-        free(core_gid);
-        free(core_signal);
-        free(core_timestamp);
-        free(core_comm);
-        free(core_exe);
-        free(core_cmdline);
-        free(core_unit);
-        free(core_session);
-        free(core_message);
-
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
deleted file mode 100644 (file)
index 964e0c2..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foojournaldefhfoo
-#define foojournaldefhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-
-#include <systemd/sd-id128.h>
-
-#include "macro.h"
-
-typedef struct Header Header;
-typedef struct ObjectHeader ObjectHeader;
-typedef union Object Object;
-typedef struct DataObject DataObject;
-typedef struct FieldObject FieldObject;
-typedef struct EntryObject EntryObject;
-typedef struct HashTableObject HashTableObject;
-typedef struct EntryArrayObject EntryArrayObject;
-typedef struct EntryItem EntryItem;
-typedef struct HashItem HashItem;
-
-/* Object types */
-enum {
-        OBJECT_UNUSED,
-        OBJECT_DATA,
-        OBJECT_FIELD,
-        OBJECT_ENTRY,
-        OBJECT_DATA_HASH_TABLE,
-        OBJECT_FIELD_HASH_TABLE,
-        OBJECT_ENTRY_ARRAY,
-        _OBJECT_TYPE_MAX
-};
-
-/* Object flags */
-enum {
-        OBJECT_COMPRESSED = 1
-};
-
-_packed_ struct ObjectHeader {
-        uint8_t type;
-        uint8_t flags;
-        uint8_t reserved[6];
-        uint64_t size;
-        uint8_t payload[];
-};
-
-_packed_ struct DataObject {
-        ObjectHeader object;
-        uint64_t hash;
-        uint64_t next_hash_offset;
-        uint64_t next_field_offset;
-        uint64_t entry_offset; /* the first array entry we store inline */
-        uint64_t entry_array_offset;
-        uint64_t n_entries;
-        uint8_t payload[];
-};
-
-_packed_ struct FieldObject {
-        ObjectHeader object;
-        uint64_t hash;
-        uint64_t next_hash_offset;
-        uint64_t head_data_offset;
-        uint64_t tail_data_offset;
-        uint8_t payload[];
-};
-
-_packed_ struct EntryItem {
-        uint64_t object_offset;
-        uint64_t hash;
-};
-
-_packed_ struct EntryObject {
-        ObjectHeader object;
-        uint64_t seqnum;
-        uint64_t realtime;
-        uint64_t monotonic;
-        sd_id128_t boot_id;
-        uint64_t xor_hash;
-        EntryItem items[];
-};
-
-_packed_ struct HashItem {
-        uint64_t head_hash_offset;
-        uint64_t tail_hash_offset;
-};
-
-_packed_ struct HashTableObject {
-        ObjectHeader object;
-        HashItem items[];
-};
-
-_packed_ struct EntryArrayObject {
-        ObjectHeader object;
-        uint64_t next_entry_array_offset;
-        uint64_t items[];
-};
-
-union Object {
-        ObjectHeader object;
-        DataObject data;
-        FieldObject field;
-        EntryObject entry;
-        HashTableObject hash_table;
-        EntryArrayObject entry_array;
-};
-
-enum {
-        STATE_OFFLINE,
-        STATE_ONLINE,
-        STATE_ARCHIVED
-};
-
-/* Header flags */
-enum {
-        HEADER_INCOMPATIBLE_COMPRESSED = 1
-};
-
-_packed_ struct Header {
-        uint8_t signature[8]; /* "LPKSHHRH" */
-        uint32_t compatible_flags;
-        uint32_t incompatible_flags;
-        uint8_t state;
-        uint8_t reserved[7];
-        sd_id128_t file_id;
-        sd_id128_t machine_id;
-        sd_id128_t boot_id;
-        sd_id128_t seqnum_id;
-        uint64_t arena_offset;
-        uint64_t arena_size;
-        uint64_t data_hash_table_offset;     /* for looking up data objects */
-        uint64_t data_hash_table_size;
-        uint64_t field_hash_table_offset;     /* for looking up field objects */
-        uint64_t field_hash_table_size;
-        uint64_t tail_object_offset;
-        uint64_t n_objects;
-        uint64_t n_entries;
-        uint64_t seqnum;
-        uint64_t first_seqnum;
-        uint64_t entry_array_offset;
-        uint64_t head_entry_realtime;
-        uint64_t tail_entry_realtime;
-        uint64_t tail_entry_monotonic;
-};
-
-#endif
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
deleted file mode 100644 (file)
index 20ca3f6..0000000
+++ /dev/null
@@ -1,2176 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <sys/mman.h>
-#include <errno.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <sys/statvfs.h>
-#include <fcntl.h>
-#include <stddef.h>
-
-#include "journal-def.h"
-#include "journal-file.h"
-#include "lookup3.h"
-#include "compress.h"
-
-#define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*16ULL)
-#define DEFAULT_FIELD_HASH_TABLE_SIZE (2047ULL*16ULL)
-
-#define DEFAULT_WINDOW_SIZE (128ULL*1024ULL*1024ULL)
-
-#define COMPRESSION_SIZE_THRESHOLD (512ULL)
-
-/* This is the minimum journal file size */
-#define JOURNAL_FILE_SIZE_MIN (64ULL*1024ULL)
-
-/* These are the lower and upper bounds if we deduce the max_use value
- * from the file system size */
-#define DEFAULT_MAX_USE_LOWER (1ULL*1024ULL*1024ULL)           /* 1 MiB */
-#define DEFAULT_MAX_USE_UPPER (4ULL*1024ULL*1024ULL*1024ULL)   /* 4 GiB */
-
-/* This is the upper bound if we deduce max_size from max_use */
-#define DEFAULT_MAX_SIZE_UPPER (16ULL*1024ULL*1024ULL)         /* 16 MiB */
-
-/* This is the upper bound if we deduce the keep_free value from the
- * file system size */
-#define DEFAULT_KEEP_FREE_UPPER (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */
-
-/* This is the keep_free value when we can't determine the system
- * size */
-#define DEFAULT_KEEP_FREE (1024ULL*1024ULL)                    /* 1 MB */
-
-static const char signature[] = { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' };
-
-#define ALIGN64(x) (((x) + 7ULL) & ~7ULL)
-
-void journal_file_close(JournalFile *f) {
-        int t;
-
-        assert(f);
-
-        if (f->header && f->writable)
-                f->header->state = STATE_OFFLINE;
-
-
-        for (t = 0; t < _WINDOW_MAX; t++)
-                if (f->windows[t].ptr)
-                        munmap(f->windows[t].ptr, f->windows[t].size);
-
-        if (f->fd >= 0)
-                close_nointr_nofail(f->fd);
-
-        free(f->path);
-
-#ifdef HAVE_XZ
-        free(f->compress_buffer);
-#endif
-
-        free(f);
-}
-
-static int journal_file_init_header(JournalFile *f, JournalFile *template) {
-        Header h;
-        ssize_t k;
-        int r;
-
-        assert(f);
-
-        zero(h);
-        memcpy(h.signature, signature, 8);
-        h.arena_offset = htole64(ALIGN64(sizeof(h)));
-
-        r = sd_id128_randomize(&h.file_id);
-        if (r < 0)
-                return r;
-
-        if (template) {
-                h.seqnum_id = template->header->seqnum_id;
-                h.seqnum = template->header->seqnum;
-        } else
-                h.seqnum_id = h.file_id;
-
-        k = pwrite(f->fd, &h, sizeof(h), 0);
-        if (k < 0)
-                return -errno;
-
-        if (k != sizeof(h))
-                return -EIO;
-
-        return 0;
-}
-
-static int journal_file_refresh_header(JournalFile *f) {
-        int r;
-        sd_id128_t boot_id;
-
-        assert(f);
-
-        r = sd_id128_get_machine(&f->header->machine_id);
-        if (r < 0)
-                return r;
-
-        r = sd_id128_get_boot(&boot_id);
-        if (r < 0)
-                return r;
-
-        if (sd_id128_equal(boot_id, f->header->boot_id))
-                f->tail_entry_monotonic_valid = true;
-
-        f->header->boot_id = boot_id;
-
-        f->header->state = STATE_ONLINE;
-
-        __sync_synchronize();
-
-        return 0;
-}
-
-static int journal_file_verify_header(JournalFile *f) {
-        assert(f);
-
-        if (memcmp(f->header, signature, 8))
-                return -EBADMSG;
-
-#ifdef HAVE_XZ
-        if ((le64toh(f->header->incompatible_flags) & ~HEADER_INCOMPATIBLE_COMPRESSED) != 0)
-                return -EPROTONOSUPPORT;
-#else
-        if (f->header->incompatible_flags != 0)
-                return -EPROTONOSUPPORT;
-#endif
-
-        if ((uint64_t) f->last_stat.st_size < (le64toh(f->header->arena_offset) + le64toh(f->header->arena_size)))
-                return -ENODATA;
-
-        if (f->writable) {
-                uint32_t state;
-                sd_id128_t machine_id;
-                int r;
-
-                r = sd_id128_get_machine(&machine_id);
-                if (r < 0)
-                        return r;
-
-                if (!sd_id128_equal(machine_id, f->header->machine_id))
-                        return -EHOSTDOWN;
-
-                state = f->header->state;
-
-                if (state == STATE_ONLINE)
-                        log_debug("Journal file %s is already online. Assuming unclean closing. Ignoring.", f->path);
-                else if (state == STATE_ARCHIVED)
-                        return -ESHUTDOWN;
-                else if (state != STATE_OFFLINE)
-                        log_debug("Journal file %s has unknown state %u. Ignoring.", f->path, state);
-        }
-
-        return 0;
-}
-
-static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
-        uint64_t old_size, new_size;
-
-        assert(f);
-
-        /* We assume that this file is not sparse, and we know that
-         * for sure, since we always call posix_fallocate()
-         * ourselves */
-
-        old_size =
-                le64toh(f->header->arena_offset) +
-                le64toh(f->header->arena_size);
-
-        new_size = PAGE_ALIGN(offset + size);
-        if (new_size < le64toh(f->header->arena_offset))
-                new_size = le64toh(f->header->arena_offset);
-
-        if (new_size <= old_size)
-                return 0;
-
-        if (f->metrics.max_size > 0 &&
-            new_size > f->metrics.max_size)
-                return -E2BIG;
-
-        if (new_size > f->metrics.min_size &&
-            f->metrics.keep_free > 0) {
-                struct statvfs svfs;
-
-                if (fstatvfs(f->fd, &svfs) >= 0) {
-                        uint64_t available;
-
-                        available = svfs.f_bfree * svfs.f_bsize;
-
-                        if (available >= f->metrics.keep_free)
-                                available -= f->metrics.keep_free;
-                        else
-                                available = 0;
-
-                        if (new_size - old_size > available)
-                                return -E2BIG;
-                }
-        }
-
-        /* Note that the glibc fallocate() fallback is very
-           inefficient, hence we try to minimize the allocation area
-           as we can. */
-        if (posix_fallocate(f->fd, old_size, new_size - old_size) < 0)
-                return -errno;
-
-        if (fstat(f->fd, &f->last_stat) < 0)
-                return -errno;
-
-        f->header->arena_size = new_size - htole64(f->header->arena_offset);
-
-        return 0;
-}
-
-static int journal_file_map(
-                JournalFile *f,
-                uint64_t offset,
-                uint64_t size,
-                void **_window,
-                uint64_t *_woffset,
-                uint64_t *_wsize,
-                void **ret) {
-
-        uint64_t woffset, wsize;
-        void *window;
-
-        assert(f);
-        assert(size > 0);
-        assert(ret);
-
-        woffset = offset & ~((uint64_t) page_size() - 1ULL);
-        wsize = size + (offset - woffset);
-        wsize = PAGE_ALIGN(wsize);
-
-        /* Avoid SIGBUS on invalid accesses */
-        if (woffset + wsize > (uint64_t) PAGE_ALIGN(f->last_stat.st_size))
-                return -EADDRNOTAVAIL;
-
-        window = mmap(NULL, wsize, f->prot, MAP_SHARED, f->fd, woffset);
-        if (window == MAP_FAILED)
-                return -errno;
-
-        if (_window)
-                *_window = window;
-
-        if (_woffset)
-                *_woffset = woffset;
-
-        if (_wsize)
-                *_wsize = wsize;
-
-        *ret = (uint8_t*) window + (offset - woffset);
-
-        return 0;
-}
-
-static int journal_file_move_to(JournalFile *f, int wt, uint64_t offset, uint64_t size, void **ret) {
-        void *p = NULL;
-        uint64_t delta;
-        int r;
-        Window *w;
-
-        assert(f);
-        assert(ret);
-        assert(wt >= 0);
-        assert(wt < _WINDOW_MAX);
-
-        if (offset + size > (uint64_t) f->last_stat.st_size) {
-                /* Hmm, out of range? Let's refresh the fstat() data
-                 * first, before we trust that check. */
-
-                if (fstat(f->fd, &f->last_stat) < 0 ||
-                    offset + size > (uint64_t) f->last_stat.st_size)
-                        return -EADDRNOTAVAIL;
-        }
-
-        w = f->windows + wt;
-
-        if (_likely_(w->ptr &&
-                     w->offset <= offset &&
-                     w->offset + w->size >= offset + size)) {
-
-                *ret = (uint8_t*) w->ptr + (offset - w->offset);
-                return 0;
-        }
-
-        if (w->ptr) {
-                if (munmap(w->ptr, w->size) < 0)
-                        return -errno;
-
-                w->ptr = NULL;
-                w->size = w->offset = 0;
-        }
-
-        if (size < DEFAULT_WINDOW_SIZE) {
-                /* If the default window size is larger then what was
-                 * asked for extend the mapping a bit in the hope to
-                 * minimize needed remappings later on. We add half
-                 * the window space before and half behind the
-                 * requested mapping */
-
-                delta = (DEFAULT_WINDOW_SIZE - size) / 2;
-
-                if (delta > offset)
-                        delta = offset;
-
-                offset -= delta;
-                size = DEFAULT_WINDOW_SIZE;
-        } else
-                delta = 0;
-
-        if (offset + size > (uint64_t) f->last_stat.st_size)
-                size = (uint64_t) f->last_stat.st_size - offset;
-
-        if (size <= 0)
-                return -EADDRNOTAVAIL;
-
-        r = journal_file_map(f,
-                             offset, size,
-                             &w->ptr, &w->offset, &w->size,
-                             &p);
-
-        if (r < 0)
-                return r;
-
-        *ret = (uint8_t*) p + delta;
-        return 0;
-}
-
-static bool verify_hash(Object *o) {
-        uint64_t h1, h2;
-
-        assert(o);
-
-        if (o->object.type == OBJECT_DATA && !(o->object.flags & OBJECT_COMPRESSED)) {
-                h1 = le64toh(o->data.hash);
-                h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload));
-        } else if (o->object.type == OBJECT_FIELD) {
-                h1 = le64toh(o->field.hash);
-                h2 = hash64(o->field.payload, le64toh(o->object.size) - offsetof(Object, field.payload));
-        } else
-                return true;
-
-        return h1 == h2;
-}
-
-int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret) {
-        int r;
-        void *t;
-        Object *o;
-        uint64_t s;
-
-        assert(f);
-        assert(ret);
-        assert(type < _OBJECT_TYPE_MAX);
-
-        r = journal_file_move_to(f, type >= 0 ? type : WINDOW_UNKNOWN, offset, sizeof(ObjectHeader), &t);
-        if (r < 0)
-                return r;
-
-        o = (Object*) t;
-        s = le64toh(o->object.size);
-
-        if (s < sizeof(ObjectHeader))
-                return -EBADMSG;
-
-        if (type >= 0 && o->object.type != type)
-                return -EBADMSG;
-
-        if (s > sizeof(ObjectHeader)) {
-                r = journal_file_move_to(f, o->object.type, offset, s, &t);
-                if (r < 0)
-                        return r;
-
-                o = (Object*) t;
-        }
-
-        if (!verify_hash(o))
-                return -EBADMSG;
-
-        *ret = o;
-        return 0;
-}
-
-static uint64_t journal_file_seqnum(JournalFile *f, uint64_t *seqnum) {
-        uint64_t r;
-
-        assert(f);
-
-        r = le64toh(f->header->seqnum) + 1;
-
-        if (seqnum) {
-                /* If an external seqnum counter was passed, we update
-                 * both the local and the external one, and set it to
-                 * the maximum of both */
-
-                if (*seqnum + 1 > r)
-                        r = *seqnum + 1;
-
-                *seqnum = r;
-        }
-
-        f->header->seqnum = htole64(r);
-
-        if (f->header->first_seqnum == 0)
-                f->header->first_seqnum = htole64(r);
-
-        return r;
-}
-
-static int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset) {
-        int r;
-        uint64_t p;
-        Object *tail, *o;
-        void *t;
-
-        assert(f);
-        assert(size >= sizeof(ObjectHeader));
-        assert(offset);
-        assert(ret);
-
-        p = le64toh(f->header->tail_object_offset);
-        if (p == 0)
-                p = le64toh(f->header->arena_offset);
-        else {
-                r = journal_file_move_to_object(f, -1, p, &tail);
-                if (r < 0)
-                        return r;
-
-                p += ALIGN64(le64toh(tail->object.size));
-        }
-
-        r = journal_file_allocate(f, p, size);
-        if (r < 0)
-                return r;
-
-        r = journal_file_move_to(f, type, p, size, &t);
-        if (r < 0)
-                return r;
-
-        o = (Object*) t;
-
-        zero(o->object);
-        o->object.type = type;
-        o->object.size = htole64(size);
-
-        f->header->tail_object_offset = htole64(p);
-        f->header->n_objects = htole64(le64toh(f->header->n_objects) + 1);
-
-        *ret = o;
-        *offset = p;
-
-        return 0;
-}
-
-static int journal_file_setup_data_hash_table(JournalFile *f) {
-        uint64_t s, p;
-        Object *o;
-        int r;
-
-        assert(f);
-
-        s = DEFAULT_DATA_HASH_TABLE_SIZE;
-        r = journal_file_append_object(f,
-                                       OBJECT_DATA_HASH_TABLE,
-                                       offsetof(Object, hash_table.items) + s,
-                                       &o, &p);
-        if (r < 0)
-                return r;
-
-        memset(o->hash_table.items, 0, s);
-
-        f->header->data_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
-        f->header->data_hash_table_size = htole64(s);
-
-        return 0;
-}
-
-static int journal_file_setup_field_hash_table(JournalFile *f) {
-        uint64_t s, p;
-        Object *o;
-        int r;
-
-        assert(f);
-
-        s = DEFAULT_FIELD_HASH_TABLE_SIZE;
-        r = journal_file_append_object(f,
-                                       OBJECT_FIELD_HASH_TABLE,
-                                       offsetof(Object, hash_table.items) + s,
-                                       &o, &p);
-        if (r < 0)
-                return r;
-
-        memset(o->hash_table.items, 0, s);
-
-        f->header->field_hash_table_offset = htole64(p + offsetof(Object, hash_table.items));
-        f->header->field_hash_table_size = htole64(s);
-
-        return 0;
-}
-
-static int journal_file_map_data_hash_table(JournalFile *f) {
-        uint64_t s, p;
-        void *t;
-        int r;
-
-        assert(f);
-
-        p = le64toh(f->header->data_hash_table_offset);
-        s = le64toh(f->header->data_hash_table_size);
-
-        r = journal_file_move_to(f,
-                                 WINDOW_DATA_HASH_TABLE,
-                                 p, s,
-                                 &t);
-        if (r < 0)
-                return r;
-
-        f->data_hash_table = t;
-        return 0;
-}
-
-static int journal_file_map_field_hash_table(JournalFile *f) {
-        uint64_t s, p;
-        void *t;
-        int r;
-
-        assert(f);
-
-        p = le64toh(f->header->field_hash_table_offset);
-        s = le64toh(f->header->field_hash_table_size);
-
-        r = journal_file_move_to(f,
-                                 WINDOW_FIELD_HASH_TABLE,
-                                 p, s,
-                                 &t);
-        if (r < 0)
-                return r;
-
-        f->field_hash_table = t;
-        return 0;
-}
-
-static int journal_file_link_data(JournalFile *f, Object *o, uint64_t offset, uint64_t hash) {
-        uint64_t p, h;
-        int r;
-
-        assert(f);
-        assert(o);
-        assert(offset > 0);
-        assert(o->object.type == OBJECT_DATA);
-
-        o->data.next_hash_offset = o->data.next_field_offset = 0;
-        o->data.entry_offset = o->data.entry_array_offset = 0;
-        o->data.n_entries = 0;
-
-        h = hash % (le64toh(f->header->data_hash_table_size) / sizeof(HashItem));
-        p = le64toh(f->data_hash_table[h].head_hash_offset);
-        if (p == 0) {
-                /* Only entry in the hash table is easy */
-                f->data_hash_table[h].head_hash_offset = htole64(offset);
-        } else {
-                /* Temporarily move back to the previous data object,
-                 * to patch in pointer */
-
-                r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
-                if (r < 0)
-                        return r;
-
-                o->data.next_hash_offset = htole64(offset);
-
-                r = journal_file_move_to_object(f, OBJECT_DATA, offset, &o);
-                if (r < 0)
-                        return r;
-        }
-
-        f->data_hash_table[h].tail_hash_offset = htole64(offset);
-
-        return 0;
-}
-
-int journal_file_find_data_object_with_hash(
-                JournalFile *f,
-                const void *data, uint64_t size, uint64_t hash,
-                Object **ret, uint64_t *offset) {
-        uint64_t p, osize, h;
-        int r;
-
-        assert(f);
-        assert(data || size == 0);
-
-        osize = offsetof(Object, data.payload) + size;
-
-        if (f->header->data_hash_table_size == 0)
-                return -EBADMSG;
-
-        h = hash % (le64toh(f->header->data_hash_table_size) / sizeof(HashItem));
-        p = le64toh(f->data_hash_table[h].head_hash_offset);
-
-        while (p > 0) {
-                Object *o;
-
-                r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
-                if (r < 0)
-                        return r;
-
-                if (le64toh(o->data.hash) != hash)
-                        goto next;
-
-                if (o->object.flags & OBJECT_COMPRESSED) {
-#ifdef HAVE_XZ
-                        uint64_t l, rsize;
-
-                        l = le64toh(o->object.size);
-                        if (l <= offsetof(Object, data.payload))
-                                return -EBADMSG;
-
-                        l -= offsetof(Object, data.payload);
-
-                        if (!uncompress_blob(o->data.payload, l, &f->compress_buffer, &f->compress_buffer_size, &rsize))
-                                return -EBADMSG;
-
-                        if (rsize == size &&
-                            memcmp(f->compress_buffer, data, size) == 0) {
-
-                                if (ret)
-                                        *ret = o;
-
-                                if (offset)
-                                        *offset = p;
-
-                                return 1;
-                        }
-#else
-                        return -EPROTONOSUPPORT;
-#endif
-
-                } else if (le64toh(o->object.size) == osize &&
-                           memcmp(o->data.payload, data, size) == 0) {
-
-                        if (ret)
-                                *ret = o;
-
-                        if (offset)
-                                *offset = p;
-
-                        return 1;
-                }
-
-        next:
-                p = le64toh(o->data.next_hash_offset);
-        }
-
-        return 0;
-}
-
-int journal_file_find_data_object(
-                JournalFile *f,
-                const void *data, uint64_t size,
-                Object **ret, uint64_t *offset) {
-
-        uint64_t hash;
-
-        assert(f);
-        assert(data || size == 0);
-
-        hash = hash64(data, size);
-
-        return journal_file_find_data_object_with_hash(f,
-                                                       data, size, hash,
-                                                       ret, offset);
-}
-
-static int journal_file_append_data(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset) {
-        uint64_t hash, p;
-        uint64_t osize;
-        Object *o;
-        int r;
-        bool compressed = false;
-
-        assert(f);
-        assert(data || size == 0);
-
-        hash = hash64(data, size);
-
-        r = journal_file_find_data_object_with_hash(f, data, size, hash, &o, &p);
-        if (r < 0)
-                return r;
-        else if (r > 0) {
-
-                if (ret)
-                        *ret = o;
-
-                if (offset)
-                        *offset = p;
-
-                return 0;
-        }
-
-        osize = offsetof(Object, data.payload) + size;
-        r = journal_file_append_object(f, OBJECT_DATA, osize, &o, &p);
-        if (r < 0)
-                return r;
-
-        o->data.hash = htole64(hash);
-
-#ifdef HAVE_XZ
-        if (f->compress &&
-            size >= COMPRESSION_SIZE_THRESHOLD) {
-                uint64_t rsize;
-
-                compressed = compress_blob(data, size, o->data.payload, &rsize);
-
-                if (compressed) {
-                        o->object.size = htole64(offsetof(Object, data.payload) + rsize);
-                        o->object.flags |= OBJECT_COMPRESSED;
-
-                        f->header->incompatible_flags = htole32(le32toh(f->header->incompatible_flags) | HEADER_INCOMPATIBLE_COMPRESSED);
-
-                        log_debug("Compressed data object %lu -> %lu", (unsigned long) size, (unsigned long) rsize);
-                }
-        }
-#endif
-
-        if (!compressed)
-                memcpy(o->data.payload, data, size);
-
-        r = journal_file_link_data(f, o, p, hash);
-        if (r < 0)
-                return r;
-
-        if (ret)
-                *ret = o;
-
-        if (offset)
-                *offset = p;
-
-        return 0;
-}
-
-uint64_t journal_file_entry_n_items(Object *o) {
-        assert(o);
-        assert(o->object.type == htole64(OBJECT_ENTRY));
-
-        return (le64toh(o->object.size) - offsetof(Object, entry.items)) / sizeof(EntryItem);
-}
-
-static uint64_t journal_file_entry_array_n_items(Object *o) {
-        assert(o);
-        assert(o->object.type == htole64(OBJECT_ENTRY_ARRAY));
-
-        return (le64toh(o->object.size) - offsetof(Object, entry_array.items)) / sizeof(uint64_t);
-}
-
-static int link_entry_into_array(JournalFile *f,
-                                 uint64_t *first,
-                                 uint64_t *idx,
-                                 uint64_t p) {
-        int r;
-        uint64_t n = 0, ap = 0, q, i, a, hidx;
-        Object *o;
-
-        assert(f);
-        assert(first);
-        assert(idx);
-        assert(p > 0);
-
-        a = le64toh(*first);
-        i = hidx = le64toh(*idx);
-        while (a > 0) {
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY_ARRAY, a, &o);
-                if (r < 0)
-                        return r;
-
-                n = journal_file_entry_array_n_items(o);
-                if (i < n) {
-                        o->entry_array.items[i] = htole64(p);
-                        *idx = htole64(hidx + 1);
-                        return 0;
-                }
-
-                i -= n;
-                ap = a;
-                a = le64toh(o->entry_array.next_entry_array_offset);
-        }
-
-        if (hidx > n)
-                n = (hidx+1) * 2;
-        else
-                n = n * 2;
-
-        if (n < 4)
-                n = 4;
-
-        r = journal_file_append_object(f, OBJECT_ENTRY_ARRAY,
-                                       offsetof(Object, entry_array.items) + n * sizeof(uint64_t),
-                                       &o, &q);
-        if (r < 0)
-                return r;
-
-        o->entry_array.items[i] = htole64(p);
-
-        if (ap == 0)
-                *first = q;
-        else {
-                r = journal_file_move_to_object(f, OBJECT_ENTRY_ARRAY, ap, &o);
-                if (r < 0)
-                        return r;
-
-                o->entry_array.next_entry_array_offset = htole64(q);
-        }
-
-        *idx = htole64(hidx + 1);
-
-        return 0;
-}
-
-static int link_entry_into_array_plus_one(JournalFile *f,
-                                          uint64_t *extra,
-                                          uint64_t *first,
-                                          uint64_t *idx,
-                                          uint64_t p) {
-
-        int r;
-
-        assert(f);
-        assert(extra);
-        assert(first);
-        assert(idx);
-        assert(p > 0);
-
-        if (*idx == 0)
-                *extra = htole64(p);
-        else {
-                uint64_t i;
-
-                i = le64toh(*idx) - 1;
-                r = link_entry_into_array(f, first, &i, p);
-                if (r < 0)
-                        return r;
-        }
-
-        *idx = htole64(le64toh(*idx) + 1);
-        return 0;
-}
-
-static int journal_file_link_entry_item(JournalFile *f, Object *o, uint64_t offset, uint64_t i) {
-        uint64_t p;
-        int r;
-        assert(f);
-        assert(o);
-        assert(offset > 0);
-
-        p = le64toh(o->entry.items[i].object_offset);
-        if (p == 0)
-                return -EINVAL;
-
-        r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
-        if (r < 0)
-                return r;
-
-        return link_entry_into_array_plus_one(f,
-                                              &o->data.entry_offset,
-                                              &o->data.entry_array_offset,
-                                              &o->data.n_entries,
-                                              offset);
-}
-
-static int journal_file_link_entry(JournalFile *f, Object *o, uint64_t offset) {
-        uint64_t n, i;
-        int r;
-
-        assert(f);
-        assert(o);
-        assert(offset > 0);
-        assert(o->object.type == OBJECT_ENTRY);
-
-        __sync_synchronize();
-
-        /* Link up the entry itself */
-        r = link_entry_into_array(f,
-                                  &f->header->entry_array_offset,
-                                  &f->header->n_entries,
-                                  offset);
-        if (r < 0)
-                return r;
-
-        /* log_debug("=> %s seqnr=%lu n_entries=%lu", f->path, (unsigned long) o->entry.seqnum, (unsigned long) f->header->n_entries); */
-
-        if (f->header->head_entry_realtime == 0)
-                f->header->head_entry_realtime = o->entry.realtime;
-
-        f->header->tail_entry_realtime = o->entry.realtime;
-        f->header->tail_entry_monotonic = o->entry.monotonic;
-
-        f->tail_entry_monotonic_valid = true;
-
-        /* Link up the items */
-        n = journal_file_entry_n_items(o);
-        for (i = 0; i < n; i++) {
-                r = journal_file_link_entry_item(f, o, offset, i);
-                if (r < 0)
-                        return r;
-        }
-
-        return 0;
-}
-
-static int journal_file_append_entry_internal(
-                JournalFile *f,
-                const dual_timestamp *ts,
-                uint64_t xor_hash,
-                const EntryItem items[], unsigned n_items,
-                uint64_t *seqnum,
-                Object **ret, uint64_t *offset) {
-        uint64_t np;
-        uint64_t osize;
-        Object *o;
-        int r;
-
-        assert(f);
-        assert(items || n_items == 0);
-        assert(ts);
-
-        osize = offsetof(Object, entry.items) + (n_items * sizeof(EntryItem));
-
-        r = journal_file_append_object(f, OBJECT_ENTRY, osize, &o, &np);
-        if (r < 0)
-                return r;
-
-        o->entry.seqnum = htole64(journal_file_seqnum(f, seqnum));
-        memcpy(o->entry.items, items, n_items * sizeof(EntryItem));
-        o->entry.realtime = htole64(ts->realtime);
-        o->entry.monotonic = htole64(ts->monotonic);
-        o->entry.xor_hash = htole64(xor_hash);
-        o->entry.boot_id = f->header->boot_id;
-
-        r = journal_file_link_entry(f, o, np);
-        if (r < 0)
-                return r;
-
-        if (ret)
-                *ret = o;
-
-        if (offset)
-                *offset = np;
-
-        return 0;
-}
-
-void journal_file_post_change(JournalFile *f) {
-        assert(f);
-
-        /* inotify() does not receive IN_MODIFY events from file
-         * accesses done via mmap(). After each access we hence
-         * trigger IN_MODIFY by truncating the journal file to its
-         * current size which triggers IN_MODIFY. */
-
-        __sync_synchronize();
-
-        if (ftruncate(f->fd, f->last_stat.st_size) < 0)
-                log_error("Failed to to truncate file to its own size: %m");
-}
-
-int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqnum, Object **ret, uint64_t *offset) {
-        unsigned i;
-        EntryItem *items;
-        int r;
-        uint64_t xor_hash = 0;
-        struct dual_timestamp _ts;
-
-        assert(f);
-        assert(iovec || n_iovec == 0);
-
-        if (!f->writable)
-                return -EPERM;
-
-        if (!ts) {
-                dual_timestamp_get(&_ts);
-                ts = &_ts;
-        }
-
-        if (f->tail_entry_monotonic_valid &&
-            ts->monotonic < le64toh(f->header->tail_entry_monotonic))
-                return -EINVAL;
-
-        items = alloca(sizeof(EntryItem) * n_iovec);
-
-        for (i = 0; i < n_iovec; i++) {
-                uint64_t p;
-                Object *o;
-
-                r = journal_file_append_data(f, iovec[i].iov_base, iovec[i].iov_len, &o, &p);
-                if (r < 0)
-                        return r;
-
-                xor_hash ^= le64toh(o->data.hash);
-                items[i].object_offset = htole64(p);
-                items[i].hash = o->data.hash;
-        }
-
-        r = journal_file_append_entry_internal(f, ts, xor_hash, items, n_iovec, seqnum, ret, offset);
-
-        journal_file_post_change(f);
-
-        return r;
-}
-
-static int generic_array_get(JournalFile *f,
-                             uint64_t first,
-                             uint64_t i,
-                             Object **ret, uint64_t *offset) {
-
-        Object *o;
-        uint64_t p = 0, a;
-        int r;
-
-        assert(f);
-
-        a = first;
-        while (a > 0) {
-                uint64_t n;
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY_ARRAY, a, &o);
-                if (r < 0)
-                        return r;
-
-                n = journal_file_entry_array_n_items(o);
-                if (i < n) {
-                        p = le64toh(o->entry_array.items[i]);
-                        break;
-                }
-
-                i -= n;
-                a = le64toh(o->entry_array.next_entry_array_offset);
-        }
-
-        if (a <= 0 || p <= 0)
-                return 0;
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
-        if (r < 0)
-                return r;
-
-        if (ret)
-                *ret = o;
-
-        if (offset)
-                *offset = p;
-
-        return 1;
-}
-
-static int generic_array_get_plus_one(JournalFile *f,
-                                      uint64_t extra,
-                                      uint64_t first,
-                                      uint64_t i,
-                                      Object **ret, uint64_t *offset) {
-
-        Object *o;
-
-        assert(f);
-
-        if (i == 0) {
-                int r;
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY, extra, &o);
-                if (r < 0)
-                        return r;
-
-                if (ret)
-                        *ret = o;
-
-                if (offset)
-                        *offset = extra;
-
-                return 1;
-        }
-
-        return generic_array_get(f, first, i-1, ret, offset);
-}
-
-enum {
-        TEST_FOUND,
-        TEST_LEFT,
-        TEST_RIGHT
-};
-
-static int generic_array_bisect(JournalFile *f,
-                                uint64_t first,
-                                uint64_t n,
-                                uint64_t needle,
-                                int (*test_object)(JournalFile *f, uint64_t p, uint64_t needle),
-                                direction_t direction,
-                                Object **ret,
-                                uint64_t *offset,
-                                uint64_t *idx) {
-
-        uint64_t a, p, t = 0, i = 0, last_p = 0;
-        bool subtract_one = false;
-        Object *o, *array = NULL;
-        int r;
-
-        assert(f);
-        assert(test_object);
-
-        a = first;
-        while (a > 0) {
-                uint64_t left, right, k, lp;
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY_ARRAY, a, &array);
-                if (r < 0)
-                        return r;
-
-                k = journal_file_entry_array_n_items(array);
-                right = MIN(k, n);
-                if (right <= 0)
-                        return 0;
-
-                i = right - 1;
-                lp = p = le64toh(array->entry_array.items[i]);
-                if (p <= 0)
-                        return -EBADMSG;
-
-                r = test_object(f, p, needle);
-                if (r < 0)
-                        return r;
-
-                if (r == TEST_FOUND)
-                        r = direction == DIRECTION_DOWN ? TEST_RIGHT : TEST_LEFT;
-
-                if (r == TEST_RIGHT) {
-                        left = 0;
-                        right -= 1;
-                        for (;;) {
-                                if (left == right) {
-                                        if (direction == DIRECTION_UP)
-                                                subtract_one = true;
-
-                                        i = left;
-                                        goto found;
-                                }
-
-                                assert(left < right);
-
-                                i = (left + right) / 2;
-                                p = le64toh(array->entry_array.items[i]);
-                                if (p <= 0)
-                                        return -EBADMSG;
-
-                                r = test_object(f, p, needle);
-                                if (r < 0)
-                                        return r;
-
-                                if (r == TEST_FOUND)
-                                        r = direction == DIRECTION_DOWN ? TEST_RIGHT : TEST_LEFT;
-
-                                if (r == TEST_RIGHT)
-                                        right = i;
-                                else
-                                        left = i + 1;
-                        }
-                }
-
-                if (k > n)
-                        return 0;
-
-                last_p = lp;
-
-                n -= k;
-                t += k;
-                a = le64toh(array->entry_array.next_entry_array_offset);
-        }
-
-        return 0;
-
-found:
-        if (subtract_one && t == 0 && i == 0)
-                return 0;
-
-        if (subtract_one && i == 0)
-                p = last_p;
-        else if (subtract_one)
-                p = le64toh(array->entry_array.items[i-1]);
-        else
-                p = le64toh(array->entry_array.items[i]);
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
-        if (r < 0)
-                return r;
-
-        if (ret)
-                *ret = o;
-
-        if (offset)
-                *offset = p;
-
-        if (idx)
-                *idx = t + i - (subtract_one ? 1 : 0);
-
-        return 1;
-}
-
-static int generic_array_bisect_plus_one(JournalFile *f,
-                                         uint64_t extra,
-                                         uint64_t first,
-                                         uint64_t n,
-                                         uint64_t needle,
-                                         int (*test_object)(JournalFile *f, uint64_t p, uint64_t needle),
-                                         direction_t direction,
-                                         Object **ret,
-                                         uint64_t *offset,
-                                         uint64_t *idx) {
-
-        int r;
-
-        assert(f);
-        assert(test_object);
-
-        if (n <= 0)
-                return 0;
-
-        /* This bisects the array in object 'first', but first checks
-         * an extra  */
-        r = test_object(f, extra, needle);
-        if (r < 0)
-                return r;
-        else if (r == TEST_FOUND) {
-                Object *o;
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY, extra, &o);
-                if (r < 0)
-                        return r;
-
-                if (ret)
-                        *ret = o;
-
-                if (offset)
-                        *offset = extra;
-
-                if (idx)
-                        *idx = 0;
-
-                return 1;
-        } else if (r == TEST_RIGHT)
-                return 0;
-
-        r = generic_array_bisect(f, first, n-1, needle, test_object, direction, ret, offset, idx);
-
-        if (r > 0)
-                (*idx) ++;
-
-        return r;
-}
-
-static int test_object_seqnum(JournalFile *f, uint64_t p, uint64_t needle) {
-        Object *o;
-        int r;
-
-        assert(f);
-        assert(p > 0);
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
-        if (r < 0)
-                return r;
-
-        if (le64toh(o->entry.seqnum) == needle)
-                return TEST_FOUND;
-        else if (le64toh(o->entry.seqnum) < needle)
-                return TEST_LEFT;
-        else
-                return TEST_RIGHT;
-}
-
-int journal_file_move_to_entry_by_seqnum(
-                JournalFile *f,
-                uint64_t seqnum,
-                direction_t direction,
-                Object **ret,
-                uint64_t *offset) {
-
-        return generic_array_bisect(f,
-                                    le64toh(f->header->entry_array_offset),
-                                    le64toh(f->header->n_entries),
-                                    seqnum,
-                                    test_object_seqnum,
-                                    direction,
-                                    ret, offset, NULL);
-}
-
-static int test_object_realtime(JournalFile *f, uint64_t p, uint64_t needle) {
-        Object *o;
-        int r;
-
-        assert(f);
-        assert(p > 0);
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
-        if (r < 0)
-                return r;
-
-        if (le64toh(o->entry.realtime) == needle)
-                return TEST_FOUND;
-        else if (le64toh(o->entry.realtime) < needle)
-                return TEST_LEFT;
-        else
-                return TEST_RIGHT;
-}
-
-int journal_file_move_to_entry_by_realtime(
-                JournalFile *f,
-                uint64_t realtime,
-                direction_t direction,
-                Object **ret,
-                uint64_t *offset) {
-
-        return generic_array_bisect(f,
-                                    le64toh(f->header->entry_array_offset),
-                                    le64toh(f->header->n_entries),
-                                    realtime,
-                                    test_object_realtime,
-                                    direction,
-                                    ret, offset, NULL);
-}
-
-static int test_object_monotonic(JournalFile *f, uint64_t p, uint64_t needle) {
-        Object *o;
-        int r;
-
-        assert(f);
-        assert(p > 0);
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);
-        if (r < 0)
-                return r;
-
-        if (le64toh(o->entry.monotonic) == needle)
-                return TEST_FOUND;
-        else if (le64toh(o->entry.monotonic) < needle)
-                return TEST_LEFT;
-        else
-                return TEST_RIGHT;
-}
-
-int journal_file_move_to_entry_by_monotonic(
-                JournalFile *f,
-                sd_id128_t boot_id,
-                uint64_t monotonic,
-                direction_t direction,
-                Object **ret,
-                uint64_t *offset) {
-
-        char t[8+32+1] = "_BOOT_ID=";
-        Object *o;
-        int r;
-
-        sd_id128_to_string(boot_id, t + 8);
-
-        r = journal_file_find_data_object(f, t, strlen(t), &o, NULL);
-        if (r < 0)
-                return r;
-        else if (r == 0)
-                return -ENOENT;
-
-        return generic_array_bisect_plus_one(f,
-                                             le64toh(o->data.entry_offset),
-                                             le64toh(o->data.entry_array_offset),
-                                             le64toh(o->data.n_entries),
-                                             monotonic,
-                                             test_object_monotonic,
-                                             direction,
-                                             ret, offset, NULL);
-}
-
-static int test_object_offset(JournalFile *f, uint64_t p, uint64_t needle) {
-        assert(f);
-        assert(p > 0);
-
-        if (p == needle)
-                return TEST_FOUND;
-        else if (p < needle)
-                return TEST_LEFT;
-        else
-                return TEST_RIGHT;
-}
-
-int journal_file_next_entry(
-                JournalFile *f,
-                Object *o, uint64_t p,
-                direction_t direction,
-                Object **ret, uint64_t *offset) {
-
-        uint64_t i, n;
-        int r;
-
-        assert(f);
-        assert(p > 0 || !o);
-
-        n = le64toh(f->header->n_entries);
-        if (n <= 0)
-                return 0;
-
-        if (!o)
-                i = direction == DIRECTION_DOWN ? 0 : n - 1;
-        else {
-                if (o->object.type != OBJECT_ENTRY)
-                        return -EINVAL;
-
-                r = generic_array_bisect(f,
-                                         le64toh(f->header->entry_array_offset),
-                                         le64toh(f->header->n_entries),
-                                         p,
-                                         test_object_offset,
-                                         DIRECTION_DOWN,
-                                         NULL, NULL,
-                                         &i);
-                if (r <= 0)
-                        return r;
-
-                if (direction == DIRECTION_DOWN) {
-                        if (i >= n - 1)
-                                return 0;
-
-                        i++;
-                } else {
-                        if (i <= 0)
-                                return 0;
-
-                        i--;
-                }
-        }
-
-        /* And jump to it */
-        return generic_array_get(f,
-                                 le64toh(f->header->entry_array_offset),
-                                 i,
-                                 ret, offset);
-}
-
-int journal_file_skip_entry(
-                JournalFile *f,
-                Object *o, uint64_t p,
-                int64_t skip,
-                Object **ret, uint64_t *offset) {
-
-        uint64_t i, n;
-        int r;
-
-        assert(f);
-        assert(o);
-        assert(p > 0);
-
-        if (o->object.type != OBJECT_ENTRY)
-                return -EINVAL;
-
-        r = generic_array_bisect(f,
-                                 le64toh(f->header->entry_array_offset),
-                                 le64toh(f->header->n_entries),
-                                 p,
-                                 test_object_offset,
-                                 DIRECTION_DOWN,
-                                 NULL, NULL,
-                                 &i);
-        if (r <= 0)
-                return r;
-
-        /* Calculate new index */
-        if (skip < 0) {
-                if ((uint64_t) -skip >= i)
-                        i = 0;
-                else
-                        i = i - (uint64_t) -skip;
-        } else
-                i  += (uint64_t) skip;
-
-        n = le64toh(f->header->n_entries);
-        if (n <= 0)
-                return -EBADMSG;
-
-        if (i >= n)
-                i = n-1;
-
-        return generic_array_get(f,
-                                 le64toh(f->header->entry_array_offset),
-                                 i,
-                                 ret, offset);
-}
-
-int journal_file_next_entry_for_data(
-                JournalFile *f,
-                Object *o, uint64_t p,
-                uint64_t data_offset,
-                direction_t direction,
-                Object **ret, uint64_t *offset) {
-
-        uint64_t n, i;
-        int r;
-        Object *d;
-
-        assert(f);
-        assert(p > 0 || !o);
-
-        r = journal_file_move_to_object(f, OBJECT_DATA, data_offset, &d);
-        if (r < 0)
-                return r;
-
-        n = le64toh(d->data.n_entries);
-        if (n <= 0)
-                return n;
-
-        if (!o)
-                i = direction == DIRECTION_DOWN ? 0 : n - 1;
-        else {
-                if (o->object.type != OBJECT_ENTRY)
-                        return -EINVAL;
-
-                r = generic_array_bisect_plus_one(f,
-                                                  le64toh(d->data.entry_offset),
-                                                  le64toh(d->data.entry_array_offset),
-                                                  le64toh(d->data.n_entries),
-                                                  p,
-                                                  test_object_offset,
-                                                  DIRECTION_DOWN,
-                                                  NULL, NULL,
-                                                  &i);
-
-                if (r <= 0)
-                        return r;
-
-                if (direction == DIRECTION_DOWN) {
-                        if (i >= n - 1)
-                                return 0;
-
-                        i++;
-                } else {
-                        if (i <= 0)
-                                return 0;
-
-                        i--;
-                }
-
-        }
-
-        return generic_array_get_plus_one(f,
-                                          le64toh(d->data.entry_offset),
-                                          le64toh(d->data.entry_array_offset),
-                                          i,
-                                          ret, offset);
-}
-
-int journal_file_move_to_entry_by_seqnum_for_data(
-                JournalFile *f,
-                uint64_t data_offset,
-                uint64_t seqnum,
-                direction_t direction,
-                Object **ret, uint64_t *offset) {
-
-        Object *d;
-        int r;
-
-        r = journal_file_move_to_object(f, OBJECT_DATA, data_offset, &d);
-        if (r <= 0)
-                return r;
-
-        return generic_array_bisect_plus_one(f,
-                                             le64toh(d->data.entry_offset),
-                                             le64toh(d->data.entry_array_offset),
-                                             le64toh(d->data.n_entries),
-                                             seqnum,
-                                             test_object_seqnum,
-                                             direction,
-                                             ret, offset, NULL);
-}
-
-int journal_file_move_to_entry_by_realtime_for_data(
-                JournalFile *f,
-                uint64_t data_offset,
-                uint64_t realtime,
-                direction_t direction,
-                Object **ret, uint64_t *offset) {
-
-        Object *d;
-        int r;
-
-        r = journal_file_move_to_object(f, OBJECT_DATA, data_offset, &d);
-        if (r <= 0)
-                return r;
-
-        return generic_array_bisect_plus_one(f,
-                                             le64toh(d->data.entry_offset),
-                                             le64toh(d->data.entry_array_offset),
-                                             le64toh(d->data.n_entries),
-                                             realtime,
-                                             test_object_realtime,
-                                             direction,
-                                             ret, offset, NULL);
-}
-
-void journal_file_dump(JournalFile *f) {
-        char a[33], b[33], c[33];
-        Object *o;
-        int r;
-        uint64_t p;
-
-        assert(f);
-
-        printf("File Path: %s\n"
-               "File ID: %s\n"
-               "Machine ID: %s\n"
-               "Boot ID: %s\n"
-               "Arena size: %llu\n"
-               "Objects: %lu\n"
-               "Entries: %lu\n",
-               f->path,
-               sd_id128_to_string(f->header->file_id, a),
-               sd_id128_to_string(f->header->machine_id, b),
-               sd_id128_to_string(f->header->boot_id, c),
-               (unsigned long long) le64toh(f->header->arena_size),
-               (unsigned long) le64toh(f->header->n_objects),
-               (unsigned long) le64toh(f->header->n_entries));
-
-        p = le64toh(f->header->arena_offset);
-        while (p != 0) {
-                r = journal_file_move_to_object(f, -1, p, &o);
-                if (r < 0)
-                        goto fail;
-
-                switch (o->object.type) {
-
-                case OBJECT_UNUSED:
-                        printf("Type: OBJECT_UNUSED\n");
-                        break;
-
-                case OBJECT_DATA:
-                        printf("Type: OBJECT_DATA\n");
-                        break;
-
-                case OBJECT_ENTRY:
-                        printf("Type: OBJECT_ENTRY %llu %llu %llu\n",
-                               (unsigned long long) le64toh(o->entry.seqnum),
-                               (unsigned long long) le64toh(o->entry.monotonic),
-                               (unsigned long long) le64toh(o->entry.realtime));
-                        break;
-
-                case OBJECT_FIELD_HASH_TABLE:
-                        printf("Type: OBJECT_FIELD_HASH_TABLE\n");
-                        break;
-
-                case OBJECT_DATA_HASH_TABLE:
-                        printf("Type: OBJECT_DATA_HASH_TABLE\n");
-                        break;
-
-                case OBJECT_ENTRY_ARRAY:
-                        printf("Type: OBJECT_ENTRY_ARRAY\n");
-                        break;
-                }
-
-                if (o->object.flags & OBJECT_COMPRESSED)
-                        printf("Flags: COMPRESSED\n");
-
-                if (p == le64toh(f->header->tail_object_offset))
-                        p = 0;
-                else
-                        p = p + ALIGN64(le64toh(o->object.size));
-        }
-
-        return;
-fail:
-        log_error("File corrupt");
-}
-
-int journal_file_open(
-                const char *fname,
-                int flags,
-                mode_t mode,
-                JournalFile *template,
-                JournalFile **ret) {
-
-        JournalFile *f;
-        int r;
-        bool newly_created = false;
-
-        assert(fname);
-
-        if ((flags & O_ACCMODE) != O_RDONLY &&
-            (flags & O_ACCMODE) != O_RDWR)
-                return -EINVAL;
-
-        f = new0(JournalFile, 1);
-        if (!f)
-                return -ENOMEM;
-
-        f->fd = -1;
-        f->flags = flags;
-        f->mode = mode;
-        f->writable = (flags & O_ACCMODE) != O_RDONLY;
-        f->prot = prot_from_flags(flags);
-
-        f->path = strdup(fname);
-        if (!f->path) {
-                r = -ENOMEM;
-                goto fail;
-        }
-
-        f->fd = open(f->path, f->flags|O_CLOEXEC, f->mode);
-        if (f->fd < 0) {
-                r = -errno;
-                goto fail;
-        }
-
-        if (fstat(f->fd, &f->last_stat) < 0) {
-                r = -errno;
-                goto fail;
-        }
-
-        if (f->last_stat.st_size == 0 && f->writable) {
-                newly_created = true;
-
-                r = journal_file_init_header(f, template);
-                if (r < 0)
-                        goto fail;
-
-                if (fstat(f->fd, &f->last_stat) < 0) {
-                        r = -errno;
-                        goto fail;
-                }
-        }
-
-        if (f->last_stat.st_size < (off_t) sizeof(Header)) {
-                r = -EIO;
-                goto fail;
-        }
-
-        f->header = mmap(NULL, PAGE_ALIGN(sizeof(Header)), prot_from_flags(flags), MAP_SHARED, f->fd, 0);
-        if (f->header == MAP_FAILED) {
-                f->header = NULL;
-                r = -errno;
-                goto fail;
-        }
-
-        if (!newly_created) {
-                r = journal_file_verify_header(f);
-                if (r < 0)
-                        goto fail;
-        }
-
-        if (f->writable) {
-                r = journal_file_refresh_header(f);
-                if (r < 0)
-                        goto fail;
-        }
-
-        if (newly_created) {
-
-                r = journal_file_setup_field_hash_table(f);
-                if (r < 0)
-                        goto fail;
-
-                r = journal_file_setup_data_hash_table(f);
-                if (r < 0)
-                        goto fail;
-        }
-
-        r = journal_file_map_field_hash_table(f);
-        if (r < 0)
-                goto fail;
-
-        r = journal_file_map_data_hash_table(f);
-        if (r < 0)
-                goto fail;
-
-        if (ret)
-                *ret = f;
-
-        return 0;
-
-fail:
-        journal_file_close(f);
-
-        return r;
-}
-
-int journal_file_rotate(JournalFile **f) {
-        char *p;
-        size_t l;
-        JournalFile *old_file, *new_file = NULL;
-        int r;
-
-        assert(f);
-        assert(*f);
-
-        old_file = *f;
-
-        if (!old_file->writable)
-                return -EINVAL;
-
-        if (!endswith(old_file->path, ".journal"))
-                return -EINVAL;
-
-        l = strlen(old_file->path);
-
-        p = new(char, l + 1 + 16 + 1 + 32 + 1 + 16 + 1);
-        if (!p)
-                return -ENOMEM;
-
-        memcpy(p, old_file->path, l - 8);
-        p[l-8] = '@';
-        sd_id128_to_string(old_file->header->seqnum_id, p + l - 8 + 1);
-        snprintf(p + l - 8 + 1 + 32, 1 + 16 + 1 + 16 + 8 + 1,
-                 "-%016llx-%016llx.journal",
-                 (unsigned long long) le64toh((*f)->header->seqnum),
-                 (unsigned long long) le64toh((*f)->header->tail_entry_realtime));
-
-        r = rename(old_file->path, p);
-        free(p);
-
-        if (r < 0)
-                return -errno;
-
-        old_file->header->state = le32toh(STATE_ARCHIVED);
-
-        r = journal_file_open(old_file->path, old_file->flags, old_file->mode, old_file, &new_file);
-        journal_file_close(old_file);
-
-        *f = new_file;
-        return r;
-}
-
-struct vacuum_info {
-        off_t usage;
-        char *filename;
-
-        uint64_t realtime;
-        sd_id128_t seqnum_id;
-        uint64_t seqnum;
-};
-
-static int vacuum_compare(const void *_a, const void *_b) {
-        const struct vacuum_info *a, *b;
-
-        a = _a;
-        b = _b;
-
-        if (sd_id128_equal(a->seqnum_id, b->seqnum_id)) {
-                if (a->seqnum < b->seqnum)
-                        return -1;
-                else if (a->seqnum > b->seqnum)
-                        return 1;
-                else
-                        return 0;
-        }
-
-        if (a->realtime < b->realtime)
-                return -1;
-        else if (a->realtime > b->realtime)
-                return 1;
-        else
-                return memcmp(&a->seqnum_id, &b->seqnum_id, 16);
-}
-
-int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t min_free) {
-        DIR *d;
-        int r = 0;
-        struct vacuum_info *list = NULL;
-        unsigned n_list = 0, n_allocated = 0, i;
-        uint64_t sum = 0;
-
-        assert(directory);
-
-        if (max_use <= 0)
-                return 0;
-
-        d = opendir(directory);
-        if (!d)
-                return -errno;
-
-        for (;;) {
-                int k;
-                struct dirent buf, *de;
-                size_t q;
-                struct stat st;
-                char *p;
-                unsigned long long seqnum, realtime;
-                sd_id128_t seqnum_id;
-
-                k = readdir_r(d, &buf, &de);
-                if (k != 0) {
-                        r = -k;
-                        goto finish;
-                }
-
-                if (!de)
-                        break;
-
-                if (!dirent_is_file_with_suffix(de, ".journal"))
-                        continue;
-
-                q = strlen(de->d_name);
-
-                if (q < 1 + 32 + 1 + 16 + 1 + 16 + 8)
-                        continue;
-
-                if (de->d_name[q-8-16-1] != '-' ||
-                    de->d_name[q-8-16-1-16-1] != '-' ||
-                    de->d_name[q-8-16-1-16-1-32-1] != '@')
-                        continue;
-
-                if (fstatat(dirfd(d), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0)
-                        continue;
-
-                if (!S_ISREG(st.st_mode))
-                        continue;
-
-                p = strdup(de->d_name);
-                if (!p) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                de->d_name[q-8-16-1-16-1] = 0;
-                if (sd_id128_from_string(de->d_name + q-8-16-1-16-1-32, &seqnum_id) < 0) {
-                        free(p);
-                        continue;
-                }
-
-                if (sscanf(de->d_name + q-8-16-1-16, "%16llx-%16llx.journal", &seqnum, &realtime) != 2) {
-                        free(p);
-                        continue;
-                }
-
-                if (n_list >= n_allocated) {
-                        struct vacuum_info *j;
-
-                        n_allocated = MAX(n_allocated * 2U, 8U);
-                        j = realloc(list, n_allocated * sizeof(struct vacuum_info));
-                        if (!j) {
-                                free(p);
-                                r = -ENOMEM;
-                                goto finish;
-                        }
-
-                        list = j;
-                }
-
-                list[n_list].filename = p;
-                list[n_list].usage = (uint64_t) st.st_blksize * (uint64_t) st.st_blocks;
-                list[n_list].seqnum = seqnum;
-                list[n_list].realtime = realtime;
-                list[n_list].seqnum_id = seqnum_id;
-
-                sum += list[n_list].usage;
-
-                n_list ++;
-        }
-
-        qsort(list, n_list, sizeof(struct vacuum_info), vacuum_compare);
-
-        for(i = 0; i < n_list; i++) {
-                struct statvfs ss;
-
-                if (fstatvfs(dirfd(d), &ss) < 0) {
-                        r = -errno;
-                        goto finish;
-                }
-
-                if (sum <= max_use &&
-                    (uint64_t) ss.f_bavail * (uint64_t) ss.f_bsize >= min_free)
-                        break;
-
-                if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
-                        log_debug("Deleted archived journal %s/%s.", directory, list[i].filename);
-                        sum -= list[i].usage;
-                } else if (errno != ENOENT)
-                        log_warning("Failed to delete %s/%s: %m", directory, list[i].filename);
-        }
-
-finish:
-        for (i = 0; i < n_list; i++)
-                free(list[i].filename);
-
-        free(list);
-
-        if (d)
-                closedir(d);
-
-        return r;
-}
-
-int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p, uint64_t *seqnum, Object **ret, uint64_t *offset) {
-        uint64_t i, n;
-        uint64_t q, xor_hash = 0;
-        int r;
-        EntryItem *items;
-        dual_timestamp ts;
-
-        assert(from);
-        assert(to);
-        assert(o);
-        assert(p);
-
-        if (!to->writable)
-                return -EPERM;
-
-        ts.monotonic = le64toh(o->entry.monotonic);
-        ts.realtime = le64toh(o->entry.realtime);
-
-        if (to->tail_entry_monotonic_valid &&
-            ts.monotonic < le64toh(to->header->tail_entry_monotonic))
-                return -EINVAL;
-
-        if (ts.realtime < le64toh(to->header->tail_entry_realtime))
-                return -EINVAL;
-
-        n = journal_file_entry_n_items(o);
-        items = alloca(sizeof(EntryItem) * n);
-
-        for (i = 0; i < n; i++) {
-                uint64_t le_hash, l, h;
-                size_t t;
-                void *data;
-                Object *u;
-
-                q = le64toh(o->entry.items[i].object_offset);
-                le_hash = o->entry.items[i].hash;
-
-                r = journal_file_move_to_object(from, OBJECT_DATA, q, &o);
-                if (r < 0)
-                        return r;
-
-                if (le_hash != o->data.hash)
-                        return -EBADMSG;
-
-                l = le64toh(o->object.size) - offsetof(Object, data.payload);
-                t = (size_t) l;
-
-                /* We hit the limit on 32bit machines */
-                if ((uint64_t) t != l)
-                        return -E2BIG;
-
-                if (o->object.flags & OBJECT_COMPRESSED) {
-#ifdef HAVE_XZ
-                        uint64_t rsize;
-
-                        if (!uncompress_blob(o->data.payload, l, &from->compress_buffer, &from->compress_buffer_size, &rsize))
-                                return -EBADMSG;
-
-                        data = from->compress_buffer;
-                        l = rsize;
-#else
-                        return -EPROTONOSUPPORT;
-#endif
-                } else
-                        data = o->data.payload;
-
-                r = journal_file_append_data(to, data, l, &u, &h);
-                if (r < 0)
-                        return r;
-
-                xor_hash ^= le64toh(u->data.hash);
-                items[i].object_offset = htole64(h);
-                items[i].hash = u->data.hash;
-
-                r = journal_file_move_to_object(from, OBJECT_ENTRY, p, &o);
-                if (r < 0)
-                        return r;
-        }
-
-        return journal_file_append_entry_internal(to, &ts, xor_hash, items, n, seqnum, ret, offset);
-}
-
-void journal_default_metrics(JournalMetrics *m, int fd) {
-        uint64_t fs_size = 0;
-        struct statvfs ss;
-        char a[FORMAT_BYTES_MAX], b[FORMAT_BYTES_MAX], c[FORMAT_BYTES_MAX], d[FORMAT_BYTES_MAX];
-
-        assert(m);
-        assert(fd >= 0);
-
-        if (fstatvfs(fd, &ss) >= 0)
-                fs_size = ss.f_frsize * ss.f_blocks;
-
-        if (m->max_use == (uint64_t) -1) {
-
-                if (fs_size > 0) {
-                        m->max_use = PAGE_ALIGN(fs_size / 10); /* 10% of file system size */
-
-                        if (m->max_use > DEFAULT_MAX_USE_UPPER)
-                                m->max_use = DEFAULT_MAX_USE_UPPER;
-
-                        if (m->max_use < DEFAULT_MAX_USE_LOWER)
-                                m->max_use = DEFAULT_MAX_USE_LOWER;
-                } else
-                        m->max_use = DEFAULT_MAX_USE_LOWER;
-        } else {
-                m->max_use = PAGE_ALIGN(m->max_use);
-
-                if (m->max_use < JOURNAL_FILE_SIZE_MIN*2)
-                        m->max_use = JOURNAL_FILE_SIZE_MIN*2;
-        }
-
-        if (m->max_size == (uint64_t) -1) {
-                m->max_size = PAGE_ALIGN(m->max_use / 8); /* 8 chunks */
-
-                if (m->max_size > DEFAULT_MAX_SIZE_UPPER)
-                        m->max_size = DEFAULT_MAX_SIZE_UPPER;
-        } else
-                m->max_size = PAGE_ALIGN(m->max_size);
-
-        if (m->max_size < JOURNAL_FILE_SIZE_MIN)
-                m->max_size = JOURNAL_FILE_SIZE_MIN;
-
-        if (m->max_size*2 > m->max_use)
-                m->max_use = m->max_size*2;
-
-        if (m->min_size == (uint64_t) -1)
-                m->min_size = JOURNAL_FILE_SIZE_MIN;
-        else {
-                m->min_size = PAGE_ALIGN(m->min_size);
-
-                if (m->min_size < JOURNAL_FILE_SIZE_MIN)
-                        m->min_size = JOURNAL_FILE_SIZE_MIN;
-
-                if (m->min_size > m->max_size)
-                        m->max_size = m->min_size;
-        }
-
-        if (m->keep_free == (uint64_t) -1) {
-
-                if (fs_size > 0) {
-                        m->keep_free = PAGE_ALIGN(fs_size / 20); /* 5% of file system size */
-
-                        if (m->keep_free > DEFAULT_KEEP_FREE_UPPER)
-                                m->keep_free = DEFAULT_KEEP_FREE_UPPER;
-
-                } else
-                        m->keep_free = DEFAULT_KEEP_FREE;
-        }
-
-        log_debug("Fixed max_use=%s max_size=%s min_size=%s keep_free=%s",
-                  format_bytes(a, sizeof(a), m->max_use),
-                  format_bytes(b, sizeof(b), m->max_size),
-                  format_bytes(c, sizeof(c), m->min_size),
-                  format_bytes(d, sizeof(d), m->keep_free));
-}
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
deleted file mode 100644 (file)
index 4ef4a14..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foojournalfilehfoo
-#define foojournalfilehfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-
-#include <systemd/sd-id128.h>
-
-#include "journal-def.h"
-#include "util.h"
-
-typedef struct Window {
-        void *ptr;
-        uint64_t offset;
-        uint64_t size;
-} Window;
-
-enum {
-        WINDOW_UNKNOWN = OBJECT_UNUSED,
-        WINDOW_DATA = OBJECT_DATA,
-        WINDOW_ENTRY = OBJECT_ENTRY,
-        WINDOW_DATA_HASH_TABLE = OBJECT_DATA_HASH_TABLE,
-        WINDOW_FIELD_HASH_TABLE = OBJECT_FIELD_HASH_TABLE,
-        WINDOW_ENTRY_ARRAY = OBJECT_ENTRY_ARRAY,
-        WINDOW_HEADER,
-        _WINDOW_MAX
-};
-
-typedef struct JournalMetrics {
-        uint64_t max_use;
-        uint64_t max_size;
-        uint64_t min_size;
-        uint64_t keep_free;
-} JournalMetrics;
-
-typedef struct JournalFile {
-        int fd;
-        char *path;
-        struct stat last_stat;
-        mode_t mode;
-        int flags;
-        int prot;
-        bool writable;
-        bool tail_entry_monotonic_valid;
-
-        Header *header;
-        HashItem *data_hash_table;
-        HashItem *field_hash_table;
-
-        Window windows[_WINDOW_MAX];
-
-        uint64_t current_offset;
-
-        JournalMetrics metrics;
-
-        bool compress;
-
-#ifdef HAVE_XZ
-        void *compress_buffer;
-        uint64_t compress_buffer_size;
-#endif
-} JournalFile;
-
-typedef enum direction {
-        DIRECTION_UP,
-        DIRECTION_DOWN
-} direction_t;
-
-int journal_file_open(const char *fname, int flags, mode_t mode, JournalFile *template, JournalFile **ret);
-void journal_file_close(JournalFile *j);
-
-int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret);
-
-uint64_t journal_file_entry_n_items(Object *o);
-
-int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, uint64_t *offset);
-
-int journal_file_find_data_object(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset);
-int journal_file_find_data_object_with_hash(JournalFile *f, const void *data, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset);
-
-int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, direction_t direction, Object **ret, uint64_t *offset);
-int journal_file_skip_entry(JournalFile *f, Object *o, uint64_t p, int64_t skip, Object **ret, uint64_t *offset);
-
-int journal_file_next_entry_for_data(JournalFile *f, Object *o, uint64_t p, uint64_t data_offset, direction_t direction, Object **ret, uint64_t *offset);
-
-int journal_file_move_to_entry_by_seqnum(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset);
-int journal_file_move_to_entry_by_realtime(JournalFile *f, uint64_t realtime, direction_t direction, Object **ret, uint64_t *offset);
-int journal_file_move_to_entry_by_monotonic(JournalFile *f, sd_id128_t boot_id, uint64_t monotonic, direction_t direction, Object **ret, uint64_t *offset);
-
-int journal_file_move_to_entry_by_seqnum_for_data(JournalFile *f, uint64_t data_offset, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset);
-int journal_file_move_to_entry_by_realtime_for_data(JournalFile *f, uint64_t data_offset, uint64_t realtime, direction_t direction, Object **ret, uint64_t *offset);
-
-int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p, uint64_t *seqnum, Object **ret, uint64_t *offset);
-
-void journal_file_dump(JournalFile *f);
-
-int journal_file_rotate(JournalFile **f);
-
-int journal_directory_vacuum(const char *directory, uint64_t max_use, uint64_t min_free);
-
-void journal_file_post_change(JournalFile *f);
-
-void journal_default_metrics(JournalMetrics *m, int fd);
-
-#endif
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
deleted file mode 100644 (file)
index e5914bf..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foojournalinternalhfoo
-#define foojournalinternalhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <sys/types.h>
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include <systemd/sd-id128.h>
-
-#include "list.h"
-
-typedef struct Match Match;
-
-struct Match {
-        char *data;
-        size_t size;
-        uint64_t le_hash;
-
-        LIST_FIELDS(Match, matches);
-};
-
-typedef enum location_type {
-        LOCATION_HEAD,
-        LOCATION_TAIL,
-        LOCATION_DISCRETE
-} location_type_t;
-
-typedef struct Location {
-        location_type_t type;
-
-        uint64_t seqnum;
-        sd_id128_t seqnum_id;
-        bool seqnum_set;
-
-        uint64_t realtime;
-        bool realtime_set;
-
-        uint64_t monotonic;
-        sd_id128_t boot_id;
-        bool monotonic_set;
-
-        uint64_t xor_hash;
-        bool xor_hash_set;
-} Location;
-
-struct sd_journal {
-        int flags;
-
-        Hashmap *files;
-
-        Location current_location;
-        JournalFile *current_file;
-        uint64_t current_field;
-
-        int inotify_fd;
-        Hashmap *inotify_wd_dirs;
-        Hashmap *inotify_wd_roots;
-
-        LIST_HEAD(Match, matches);
-        unsigned n_matches;
-};
-
-#endif
diff --git a/src/journal/journal-rate-limit.c b/src/journal/journal-rate-limit.c
deleted file mode 100644 (file)
index 243ff2a..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <string.h>
-#include <errno.h>
-
-#include "journal-rate-limit.h"
-#include "list.h"
-#include "util.h"
-#include "hashmap.h"
-
-#define POOLS_MAX 5
-#define BUCKETS_MAX 127
-#define GROUPS_MAX 2047
-
-static const int priority_map[] = {
-        [LOG_EMERG]   = 0,
-        [LOG_ALERT]   = 0,
-        [LOG_CRIT]    = 0,
-        [LOG_ERR]     = 1,
-        [LOG_WARNING] = 2,
-        [LOG_NOTICE]  = 3,
-        [LOG_INFO]    = 3,
-        [LOG_DEBUG]   = 4
-};
-
-typedef struct JournalRateLimitPool JournalRateLimitPool;
-typedef struct JournalRateLimitGroup JournalRateLimitGroup;
-
-struct JournalRateLimitPool {
-        usec_t begin;
-        unsigned num;
-        unsigned suppressed;
-};
-
-struct JournalRateLimitGroup {
-        JournalRateLimit *parent;
-
-        char *id;
-        JournalRateLimitPool pools[POOLS_MAX];
-        unsigned hash;
-
-        LIST_FIELDS(JournalRateLimitGroup, bucket);
-        LIST_FIELDS(JournalRateLimitGroup, lru);
-};
-
-struct JournalRateLimit {
-        usec_t interval;
-        unsigned burst;
-
-        JournalRateLimitGroup* buckets[BUCKETS_MAX];
-        JournalRateLimitGroup *lru, *lru_tail;
-
-        unsigned n_groups;
-};
-
-JournalRateLimit *journal_rate_limit_new(usec_t interval, unsigned burst) {
-        JournalRateLimit *r;
-
-        assert(interval > 0 || burst == 0);
-
-        r = new0(JournalRateLimit, 1);
-        if (!r)
-                return NULL;
-
-        r->interval = interval;
-        r->burst = burst;
-
-        return r;
-}
-
-static void journal_rate_limit_group_free(JournalRateLimitGroup *g) {
-        assert(g);
-
-        if (g->parent) {
-                assert(g->parent->n_groups > 0);
-
-                if (g->parent->lru_tail == g)
-                        g->parent->lru_tail = g->lru_prev;
-
-                LIST_REMOVE(JournalRateLimitGroup, lru, g->parent->lru, g);
-                LIST_REMOVE(JournalRateLimitGroup, bucket, g->parent->buckets[g->hash % BUCKETS_MAX], g);
-
-                g->parent->n_groups --;
-        }
-
-        free(g->id);
-        free(g);
-}
-
-void journal_rate_limit_free(JournalRateLimit *r) {
-        assert(r);
-
-        while (r->lru)
-                journal_rate_limit_group_free(r->lru);
-
-        free(r);
-}
-
-static bool journal_rate_limit_group_expired(JournalRateLimitGroup *g, usec_t ts) {
-        unsigned i;
-
-        assert(g);
-
-        for (i = 0; i < POOLS_MAX; i++)
-                if (g->pools[i].begin + g->parent->interval >= ts)
-                        return false;
-
-        return true;
-}
-
-static void journal_rate_limit_vacuum(JournalRateLimit *r, usec_t ts) {
-        assert(r);
-
-        /* Makes room for at least one new item, but drop all
-         * expored items too. */
-
-        while (r->n_groups >= GROUPS_MAX ||
-               (r->lru_tail && journal_rate_limit_group_expired(r->lru_tail, ts)))
-                journal_rate_limit_group_free(r->lru_tail);
-}
-
-static JournalRateLimitGroup* journal_rate_limit_group_new(JournalRateLimit *r, const char *id, usec_t ts) {
-        JournalRateLimitGroup *g;
-
-        assert(r);
-        assert(id);
-
-        g = new0(JournalRateLimitGroup, 1);
-        if (!g)
-                return NULL;
-
-        g->id = strdup(id);
-        if (!g->id)
-                goto fail;
-
-        g->hash = string_hash_func(g->id);
-
-        journal_rate_limit_vacuum(r, ts);
-
-        LIST_PREPEND(JournalRateLimitGroup, bucket, r->buckets[g->hash % BUCKETS_MAX], g);
-        LIST_PREPEND(JournalRateLimitGroup, lru, r->lru, g);
-        if (!g->lru_next)
-                r->lru_tail = g;
-        r->n_groups ++;
-
-        g->parent = r;
-        return g;
-
-fail:
-        journal_rate_limit_group_free(g);
-        return NULL;
-}
-
-static uint64_t u64log2(uint64_t n) {
-        unsigned r;
-
-        if (n <= 1)
-                return 0;
-
-        r = 0;
-        for (;;) {
-                n = n >> 1;
-                if (!n)
-                        return r;
-                r++;
-        }
-}
-
-static unsigned burst_modulate(unsigned burst, uint64_t available) {
-        unsigned k;
-
-        /* Modulates the burst rate a bit with the amount of available
-         * disk space */
-
-        k = u64log2(available);
-
-        /* 1MB */
-        if (k <= 20)
-                return burst;
-
-        burst = (burst * (k-20)) / 4;
-
-        /*
-         * Example:
-         *
-         *      <= 1MB = rate * 1
-         *        16MB = rate * 2
-         *       256MB = rate * 3
-         *         4GB = rate * 4
-         *        64GB = rate * 5
-         *         1TB = rate * 6
-         */
-
-        return burst;
-}
-
-int journal_rate_limit_test(JournalRateLimit *r, const char *id, int priority, uint64_t available) {
-        unsigned h;
-        JournalRateLimitGroup *g;
-        JournalRateLimitPool *p;
-        unsigned burst;
-        usec_t ts;
-
-        assert(id);
-
-        if (!r)
-                return 1;
-
-        if (r->interval == 0 || r->burst == 0)
-                return 1;
-
-        burst = burst_modulate(r->burst, available);
-
-        ts = now(CLOCK_MONOTONIC);
-
-        h = string_hash_func(id);
-        g = r->buckets[h % BUCKETS_MAX];
-
-        LIST_FOREACH(bucket, g, g)
-                if (streq(g->id, id))
-                        break;
-
-        if (!g) {
-                g = journal_rate_limit_group_new(r, id, ts);
-                if (!g)
-                        return -ENOMEM;
-        }
-
-        p = &g->pools[priority_map[priority]];
-
-        if (p->begin <= 0) {
-                p->suppressed = 0;
-                p->num = 1;
-                p->begin = ts;
-                return 1;
-        }
-
-        if (p->begin + r->interval < ts) {
-                unsigned s;
-
-                s = p->suppressed;
-                p->suppressed = 0;
-                p->num = 1;
-                p->begin = ts;
-
-                return 1 + s;
-        }
-
-        if (p->num <= burst) {
-                p->num++;
-                return 1;
-        }
-
-        p->suppressed++;
-        return 0;
-}
diff --git a/src/journal/journal-rate-limit.h b/src/journal/journal-rate-limit.h
deleted file mode 100644 (file)
index 2bbdd5f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foojournalratelimithfoo
-#define foojournalratelimithfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "macro.h"
-#include "util.h"
-
-typedef struct JournalRateLimit JournalRateLimit;
-
-JournalRateLimit *journal_rate_limit_new(usec_t interval, unsigned burst);
-void journal_rate_limit_free(JournalRateLimit *r);
-int journal_rate_limit_test(JournalRateLimit *r, const char *id, int priority, uint64_t available);
-
-#endif
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
deleted file mode 100644 (file)
index b5b4fbf..0000000
+++ /dev/null
@@ -1,334 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "sd-journal.h"
-#include "util.h"
-#include "socket-util.h"
-
-#define SNDBUF_SIZE (8*1024*1024)
-
-/* We open a single fd, and we'll share it with the current process,
- * all its threads, and all its subprocesses. This means we need to
- * initialize it atomically, and need to operate on it atomically
- * never assuming we are the only user */
-
-static int journal_fd(void) {
-        int fd;
-        static int fd_plus_one = 0;
-
-retry:
-        if (fd_plus_one > 0)
-                return fd_plus_one - 1;
-
-        fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
-        if (fd < 0)
-                return -errno;
-
-        fd_inc_sndbuf(fd, SNDBUF_SIZE);
-
-        if (!__sync_bool_compare_and_swap(&fd_plus_one, 0, fd+1)) {
-                close_nointr_nofail(fd);
-                goto retry;
-        }
-
-        return fd;
-}
-
-_public_ int sd_journal_print(int priority, const char *format, ...) {
-        int r;
-        va_list ap;
-
-        va_start(ap, format);
-        r = sd_journal_printv(priority, format, ap);
-        va_end(ap);
-
-        return r;
-}
-
-_public_ int sd_journal_printv(int priority, const char *format, va_list ap) {
-        char buffer[8 + LINE_MAX], p[11];
-        struct iovec iov[2];
-
-        if (priority < 0 || priority > 7)
-                return -EINVAL;
-
-        if (!format)
-                return -EINVAL;
-
-        snprintf(p, sizeof(p), "PRIORITY=%i", priority & LOG_PRIMASK);
-        char_array_0(p);
-
-        memcpy(buffer, "MESSAGE=", 8);
-        vsnprintf(buffer+8, sizeof(buffer) - 8, format, ap);
-        char_array_0(buffer);
-
-        zero(iov);
-        IOVEC_SET_STRING(iov[0], buffer);
-        IOVEC_SET_STRING(iov[1], p);
-
-        return sd_journal_sendv(iov, 2);
-}
-
-_public_ int sd_journal_send(const char *format, ...) {
-        int r, n = 0, i = 0, j;
-        va_list ap;
-        struct iovec *iov = NULL;
-
-        va_start(ap, format);
-        while (format) {
-                struct iovec *c;
-                char *buffer;
-
-                if (i >= n) {
-                        n = MAX(i*2, 4);
-                        c = realloc(iov, n * sizeof(struct iovec));
-                        if (!c) {
-                                r = -ENOMEM;
-                                goto fail;
-                        }
-
-                        iov = c;
-                }
-
-                if (vasprintf(&buffer, format, ap) < 0) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-
-                IOVEC_SET_STRING(iov[i++], buffer);
-
-                format = va_arg(ap, char *);
-        }
-        va_end(ap);
-
-        r = sd_journal_sendv(iov, i);
-
-fail:
-        for (j = 0; j < i; j++)
-                free(iov[j].iov_base);
-
-        free(iov);
-
-        return r;
-}
-
-_public_ int sd_journal_sendv(const struct iovec *iov, int n) {
-        int fd, buffer_fd;
-        struct iovec *w;
-        uint64_t *l;
-        int i, j = 0;
-        struct msghdr mh;
-        struct sockaddr_un sa;
-        ssize_t k;
-        union {
-                struct cmsghdr cmsghdr;
-                uint8_t buf[CMSG_SPACE(sizeof(int))];
-        } control;
-        struct cmsghdr *cmsg;
-        /* We use /dev/shm instead of /tmp here, since we want this to
-         * be a tmpfs, and one that is available from early boot on
-         * and where unprivileged users can create files. */
-        char path[] = "/dev/shm/journal.XXXXXX";
-
-        if (!iov || n <= 0)
-                return -EINVAL;
-
-        w = alloca(sizeof(struct iovec) * n * 5);
-        l = alloca(sizeof(uint64_t) * n);
-
-        for (i = 0; i < n; i++) {
-                char *c, *nl;
-
-                if (!iov[i].iov_base ||
-                    iov[i].iov_len <= 1)
-                        return -EINVAL;
-
-                c = memchr(iov[i].iov_base, '=', iov[i].iov_len);
-                if (!c || c == iov[i].iov_base)
-                        return -EINVAL;
-
-                nl = memchr(iov[i].iov_base, '\n', iov[i].iov_len);
-                if (nl) {
-                        if (nl < c)
-                                return -EINVAL;
-
-                        /* Already includes a newline? Bummer, then
-                         * let's write the variable name, then a
-                         * newline, then the size (64bit LE), followed
-                         * by the data and a final newline */
-
-                        w[j].iov_base = iov[i].iov_base;
-                        w[j].iov_len = c - (char*) iov[i].iov_base;
-                        j++;
-
-                        IOVEC_SET_STRING(w[j++], "\n");
-
-                        l[i] = htole64(iov[i].iov_len - (c - (char*) iov[i].iov_base) - 1);
-                        w[j].iov_base = &l[i];
-                        w[j].iov_len = sizeof(uint64_t);
-                        j++;
-
-                        w[j].iov_base = c + 1;
-                        w[j].iov_len = iov[i].iov_len - (c - (char*) iov[i].iov_base) - 1;
-                        j++;
-
-                } else
-                        /* Nothing special? Then just add the line and
-                         * append a newline */
-                        w[j++] = iov[i];
-
-                IOVEC_SET_STRING(w[j++], "\n");
-        }
-
-        fd = journal_fd();
-        if (fd < 0)
-                return fd;
-
-        zero(sa);
-        sa.sun_family = AF_UNIX;
-        strncpy(sa.sun_path, "/run/systemd/journal/socket", sizeof(sa.sun_path));
-
-        zero(mh);
-        mh.msg_name = &sa;
-        mh.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path);
-        mh.msg_iov = w;
-        mh.msg_iovlen = j;
-
-        k = sendmsg(fd, &mh, MSG_NOSIGNAL);
-        if (k >= 0)
-                return 0;
-
-        if (errno != EMSGSIZE && errno != ENOBUFS)
-                return -errno;
-
-        /* Message doesn't fit... Let's dump the data in a temporary
-         * file and just pass a file descriptor of it to the other
-         * side */
-
-        buffer_fd = mkostemp(path, O_CLOEXEC|O_RDWR);
-        if (buffer_fd < 0)
-                return -errno;
-
-        if (unlink(path) < 0) {
-                close_nointr_nofail(buffer_fd);
-                return -errno;
-        }
-
-        n = writev(buffer_fd, w, j);
-        if (n < 0)  {
-                close_nointr_nofail(buffer_fd);
-                return -errno;
-        }
-
-        mh.msg_iov = NULL;
-        mh.msg_iovlen = 0;
-
-        zero(control);
-        mh.msg_control = &control;
-        mh.msg_controllen = sizeof(control);
-
-        cmsg = CMSG_FIRSTHDR(&mh);
-        cmsg->cmsg_level = SOL_SOCKET;
-        cmsg->cmsg_type = SCM_RIGHTS;
-        cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-        memcpy(CMSG_DATA(cmsg), &buffer_fd, sizeof(int));
-
-        mh.msg_controllen = cmsg->cmsg_len;
-
-        k = sendmsg(fd, &mh, MSG_NOSIGNAL);
-        close_nointr_nofail(buffer_fd);
-
-        if (k < 0)
-                return -errno;
-
-        return 0;
-}
-
-_public_ int sd_journal_stream_fd(const char *identifier, int priority, int level_prefix) {
-        union sockaddr_union sa;
-        int fd;
-        char *header;
-        size_t l;
-        ssize_t r;
-
-        if (priority < 0 || priority > 7)
-                return -EINVAL;
-
-        fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
-        if (fd < 0)
-                return -errno;
-
-        zero(sa);
-        sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
-
-        r = connect(fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
-        if (r < 0) {
-                close_nointr_nofail(fd);
-                return -errno;
-        }
-
-        if (shutdown(fd, SHUT_RD) < 0) {
-                close_nointr_nofail(fd);
-                return -errno;
-        }
-
-        fd_inc_sndbuf(fd, SNDBUF_SIZE);
-
-        if (!identifier)
-                identifier = "";
-
-        l = strlen(identifier);
-        header = alloca(l + 1 + 2 + 2 + 2 + 2 + 2);
-
-        memcpy(header, identifier, l);
-        header[l++] = '\n';
-        header[l++] = '0' + priority;
-        header[l++] = '\n';
-        header[l++] = '0' + !!level_prefix;
-        header[l++] = '\n';
-        header[l++] = '0';
-        header[l++] = '\n';
-        header[l++] = '0';
-        header[l++] = '\n';
-        header[l++] = '0';
-        header[l++] = '\n';
-
-        r = loop_write(fd, header, l, false);
-        if (r < 0) {
-                close_nointr_nofail(fd);
-                return (int) r;
-        }
-
-        if ((size_t) r != l) {
-                close_nointr_nofail(fd);
-                return -errno;
-        }
-
-        return fd;
-}
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
deleted file mode 100644 (file)
index 8db3fc9..0000000
+++ /dev/null
@@ -1,308 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <fcntl.h>
-#include <errno.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/poll.h>
-#include <time.h>
-#include <getopt.h>
-
-#include <systemd/sd-journal.h>
-
-#include "log.h"
-#include "util.h"
-#include "build.h"
-#include "pager.h"
-#include "logs-show.h"
-
-static OutputMode arg_output = OUTPUT_SHORT;
-static bool arg_follow = false;
-static bool arg_show_all = false;
-static bool arg_no_pager = false;
-static int arg_lines = -1;
-static bool arg_no_tail = false;
-static bool arg_new_id128 = false;
-
-static int help(void) {
-
-        printf("%s [OPTIONS...] {COMMAND} ...\n\n"
-               "Send control commands to or query the journal.\n\n"
-               "  -h --help           Show this help\n"
-               "     --version        Show package version\n"
-               "     --no-pager       Do not pipe output into a pager\n"
-               "  -a --all            Show all properties, including long and unprintable\n"
-               "  -f --follow         Follow journal\n"
-               "  -n --lines=INTEGER  Journal entries to show\n"
-               "     --no-tail        Show all lines, even in follow mode\n"
-               "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
-               "                      verbose, export, json, cat)\n"
-               "     --new-id128      Generate a new 128 Bit id\n",
-               program_invocation_short_name);
-
-        return 0;
-}
-
-static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_VERSION = 0x100,
-                ARG_NO_PAGER,
-                ARG_NO_TAIL,
-                ARG_NEW_ID128
-        };
-
-        static const struct option options[] = {
-                { "help",      no_argument,       NULL, 'h'           },
-                { "version" ,  no_argument,       NULL, ARG_VERSION   },
-                { "no-pager",  no_argument,       NULL, ARG_NO_PAGER  },
-                { "follow",    no_argument,       NULL, 'f'           },
-                { "output",    required_argument, NULL, 'o'           },
-                { "all",       no_argument,       NULL, 'a'           },
-                { "lines",     required_argument, NULL, 'n'           },
-                { "no-tail",   no_argument,       NULL, ARG_NO_TAIL   },
-                { "new-id128", no_argument,       NULL, ARG_NEW_ID128 },
-                { NULL,        0,                 NULL, 0             }
-        };
-
-        int c, r;
-
-        assert(argc >= 0);
-        assert(argv);
-
-        while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) {
-
-                switch (c) {
-
-                case 'h':
-                        help();
-                        return 0;
-
-                case ARG_VERSION:
-                        puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
-                        puts(SYSTEMD_FEATURES);
-                        return 0;
-
-                case ARG_NO_PAGER:
-                        arg_no_pager = true;
-                        break;
-
-                case 'f':
-                        arg_follow = true;
-                        break;
-
-                case 'o':
-                        arg_output =  output_mode_from_string(optarg);
-                        if (arg_output < 0) {
-                                log_error("Unknown output '%s'.", optarg);
-                                return -EINVAL;
-                        }
-
-                        break;
-
-                case 'a':
-                        arg_show_all = true;
-                        break;
-
-                case 'n':
-                        r = safe_atoi(optarg, &arg_lines);
-                        if (r < 0 || arg_lines < 0) {
-                                log_error("Failed to parse lines '%s'", optarg);
-                                return -EINVAL;
-                        }
-                        break;
-
-                case ARG_NO_TAIL:
-                        arg_no_tail = true;
-                        break;
-
-                case ARG_NEW_ID128:
-                        arg_new_id128 = true;
-                        break;
-
-                case '?':
-                        return -EINVAL;
-
-                default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
-                }
-        }
-
-        if (arg_follow && !arg_no_tail && arg_lines < 0)
-                arg_lines = 10;
-
-        return 1;
-}
-
-static int generate_new_id128(void) {
-        sd_id128_t id;
-        int r;
-        unsigned i;
-
-        r = sd_id128_randomize(&id);
-        if (r < 0) {
-                log_error("Failed to generate ID: %s", strerror(-r));
-                return r;
-        }
-
-        printf("As string:\n"
-               SD_ID128_FORMAT_STR "\n\n"
-               "As UUID:\n"
-               "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n\n"
-               "As macro:\n"
-              "#define MESSAGE_XYZ SD_ID128_MAKE(",
-               SD_ID128_FORMAT_VAL(id),
-               SD_ID128_FORMAT_VAL(id));
-
-        for (i = 0; i < 16; i++)
-                printf("%02x%s", id.bytes[i], i != 15 ? "," : "");
-
-        fputs(")\n", stdout);
-
-        return 0;
-}
-
-int main(int argc, char *argv[]) {
-        int r, i, fd;
-        sd_journal *j = NULL;
-        unsigned line = 0;
-        bool need_seek = false;
-
-        log_parse_environment();
-        log_open();
-
-        r = parse_argv(argc, argv);
-        if (r <= 0)
-                goto finish;
-
-        if (arg_new_id128) {
-                r = generate_new_id128();
-                goto finish;
-        }
-
-        r = sd_journal_open(&j, 0);
-        if (r < 0) {
-                log_error("Failed to open journal: %s", strerror(-r));
-                goto finish;
-        }
-
-        for (i = optind; i < argc; i++) {
-                r = sd_journal_add_match(j, argv[i], strlen(argv[i]));
-                if (r < 0) {
-                        log_error("Failed to add match: %s", strerror(-r));
-                        goto finish;
-                }
-        }
-
-        fd = sd_journal_get_fd(j);
-        if (fd < 0) {
-                log_error("Failed to get wakeup fd: %s", strerror(-fd));
-                goto finish;
-        }
-
-        if (arg_lines >= 0) {
-                r = sd_journal_seek_tail(j);
-                if (r < 0) {
-                        log_error("Failed to seek to tail: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = sd_journal_previous_skip(j, arg_lines);
-        } else {
-                r = sd_journal_seek_head(j);
-                if (r < 0) {
-                        log_error("Failed to seek to head: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = sd_journal_next(j);
-        }
-
-        if (r < 0) {
-                log_error("Failed to iterate through journal: %s", strerror(-r));
-                goto finish;
-        }
-
-        if (!arg_no_pager && !arg_follow) {
-                columns();
-                pager_open();
-        }
-
-        if (arg_output == OUTPUT_JSON) {
-                fputc('[', stdout);
-                fflush(stdout);
-        }
-
-        for (;;) {
-                for (;;) {
-                        if (need_seek) {
-                                r = sd_journal_next(j);
-                                if (r < 0) {
-                                        log_error("Failed to iterate through journal: %s", strerror(-r));
-                                        goto finish;
-                                }
-                        }
-
-                        if (r == 0)
-                                break;
-
-                        line ++;
-
-                        r = output_journal(j, arg_output, line, arg_show_all);
-                        if (r < 0)
-                                goto finish;
-
-                        need_seek = true;
-                }
-
-                if (!arg_follow)
-                        break;
-
-                r = fd_wait_for_event(fd, POLLIN, (usec_t) -1);
-                if (r < 0) {
-                        log_error("Couldn't wait for event: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = sd_journal_process(j);
-                if (r < 0) {
-                        log_error("Failed to process: %s", strerror(-r));
-                        goto finish;
-                }
-        }
-
-        if (arg_output == OUTPUT_JSON)
-                fputs("\n]\n", stdout);
-
-finish:
-        if (j)
-                sd_journal_close(j);
-
-        pager_close();
-
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
deleted file mode 100644 (file)
index a56f6d9..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-%{
-#include <stddef.h>
-#include "conf-parser.h"
-#include "journald.h"
-%}
-struct ConfigPerfItem;
-%null_strings
-%language=ANSI-C
-%define slot-name section_and_lvalue
-%define hash-function-name journald_gperf_hash
-%define lookup-function-name journald_gperf_lookup
-%readonly-tables
-%omit-struct-type
-%struct-type
-%includes
-%%
-Journal.RateLimitInterval,  config_parse_usec,      0, offsetof(Server, rate_limit_interval)
-Journal.RateLimitBurst,     config_parse_unsigned,  0, offsetof(Server, rate_limit_burst)
-Journal.Compress,           config_parse_bool,      0, offsetof(Server, compress)
-Journal.SystemMaxUse,       config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use)
-Journal.SystemMaxFileSize,  config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size)
-Journal.SystemMinFileSize,  config_parse_bytes_off, 0, offsetof(Server, system_metrics.min_size)
-Journal.SystemKeepFree,     config_parse_bytes_off, 0, offsetof(Server, system_metrics.keep_free)
-Journal.RuntimeMaxUse,      config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_use)
-Journal.RuntimeMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_size)
-Journal.RuntimeMinFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.min_size)
-Journal.RuntimeKeepFree,    config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free)
-Journal.ForwardToSyslog,    config_parse_bool,      0, offsetof(Server, forward_to_syslog)
-Journal.ForwardToKMsg,      config_parse_bool,      0, offsetof(Server, forward_to_kmsg)
-Journal.ForwardToConsole,   config_parse_bool,      0, offsetof(Server, forward_to_console)
-Journal.ImportKernel,       config_parse_bool,      0, offsetof(Server, import_proc_kmsg)
diff --git a/src/journal/journald.c b/src/journal/journald.c
deleted file mode 100644 (file)
index 73f8ed6..0000000
+++ /dev/null
@@ -1,2723 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <sys/epoll.h>
-#include <sys/socket.h>
-#include <errno.h>
-#include <sys/signalfd.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <sys/ioctl.h>
-#include <linux/sockios.h>
-#include <sys/statvfs.h>
-
-#include <systemd/sd-journal.h>
-#include <systemd/sd-login.h>
-#include <systemd/sd-messages.h>
-#include <systemd/sd-daemon.h>
-
-#include "hashmap.h"
-#include "journal-file.h"
-#include "socket-util.h"
-#include "cgroup-util.h"
-#include "list.h"
-#include "journal-rate-limit.h"
-#include "journal-internal.h"
-#include "conf-parser.h"
-#include "journald.h"
-#include "virt.h"
-
-#ifdef HAVE_ACL
-#include <sys/acl.h>
-#include <acl/libacl.h>
-#include "acl-util.h"
-#endif
-
-#ifdef HAVE_SELINUX
-#include <selinux/selinux.h>
-#endif
-
-#define USER_JOURNALS_MAX 1024
-#define STDOUT_STREAMS_MAX 4096
-
-#define DEFAULT_RATE_LIMIT_INTERVAL (10*USEC_PER_SEC)
-#define DEFAULT_RATE_LIMIT_BURST 200
-
-#define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC)
-
-#define RECHECK_VAR_AVAILABLE_USEC (30*USEC_PER_SEC)
-
-#define N_IOVEC_META_FIELDS 17
-
-#define ENTRY_SIZE_MAX (1024*1024*32)
-
-typedef enum StdoutStreamState {
-        STDOUT_STREAM_IDENTIFIER,
-        STDOUT_STREAM_PRIORITY,
-        STDOUT_STREAM_LEVEL_PREFIX,
-        STDOUT_STREAM_FORWARD_TO_SYSLOG,
-        STDOUT_STREAM_FORWARD_TO_KMSG,
-        STDOUT_STREAM_FORWARD_TO_CONSOLE,
-        STDOUT_STREAM_RUNNING
-} StdoutStreamState;
-
-struct StdoutStream {
-        Server *server;
-        StdoutStreamState state;
-
-        int fd;
-
-        struct ucred ucred;
-
-        char *identifier;
-        int priority;
-        bool level_prefix:1;
-        bool forward_to_syslog:1;
-        bool forward_to_kmsg:1;
-        bool forward_to_console:1;
-
-        char buffer[LINE_MAX+1];
-        size_t length;
-
-        LIST_FIELDS(StdoutStream, stdout_stream);
-};
-
-static int server_flush_to_var(Server *s);
-
-static uint64_t available_space(Server *s) {
-        char ids[33], *p;
-        const char *f;
-        sd_id128_t machine;
-        struct statvfs ss;
-        uint64_t sum = 0, avail = 0, ss_avail = 0;
-        int r;
-        DIR *d;
-        usec_t ts;
-        JournalMetrics *m;
-
-        ts = now(CLOCK_MONOTONIC);
-
-        if (s->cached_available_space_timestamp + RECHECK_AVAILABLE_SPACE_USEC > ts)
-                return s->cached_available_space;
-
-        r = sd_id128_get_machine(&machine);
-        if (r < 0)
-                return 0;
-
-        if (s->system_journal) {
-                f = "/var/log/journal/";
-                m = &s->system_metrics;
-        } else {
-                f = "/run/log/journal/";
-                m = &s->runtime_metrics;
-        }
-
-        assert(m);
-
-        p = strappend(f, sd_id128_to_string(machine, ids));
-        if (!p)
-                return 0;
-
-        d = opendir(p);
-        free(p);
-
-        if (!d)
-                return 0;
-
-        if (fstatvfs(dirfd(d), &ss) < 0)
-                goto finish;
-
-        for (;;) {
-                struct stat st;
-                struct dirent buf, *de;
-                int k;
-
-                k = readdir_r(d, &buf, &de);
-                if (k != 0) {
-                        r = -k;
-                        goto finish;
-                }
-
-                if (!de)
-                        break;
-
-                if (!dirent_is_file_with_suffix(de, ".journal"))
-                        continue;
-
-                if (fstatat(dirfd(d), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 0)
-                        continue;
-
-                sum += (uint64_t) st.st_blocks * (uint64_t) st.st_blksize;
-        }
-
-        avail = sum >= m->max_use ? 0 : m->max_use - sum;
-
-        ss_avail = ss.f_bsize * ss.f_bavail;
-
-        ss_avail = ss_avail < m->keep_free ? 0 : ss_avail - m->keep_free;
-
-        if (ss_avail < avail)
-                avail = ss_avail;
-
-        s->cached_available_space = avail;
-        s->cached_available_space_timestamp = ts;
-
-finish:
-        closedir(d);
-
-        return avail;
-}
-
-static void server_read_file_gid(Server *s) {
-        const char *adm = "adm";
-        int r;
-
-        assert(s);
-
-        if (s->file_gid_valid)
-                return;
-
-        r = get_group_creds(&adm, &s->file_gid);
-        if (r < 0)
-                log_warning("Failed to resolve 'adm' group: %s", strerror(-r));
-
-        /* if we couldn't read the gid, then it will be 0, but that's
-         * fine and we shouldn't try to resolve the group again, so
-         * let's just pretend it worked right-away. */
-        s->file_gid_valid = true;
-}
-
-static void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
-        int r;
-#ifdef HAVE_ACL
-        acl_t acl;
-        acl_entry_t entry;
-        acl_permset_t permset;
-#endif
-
-        assert(f);
-
-        server_read_file_gid(s);
-
-        r = fchmod_and_fchown(f->fd, 0640, 0, s->file_gid);
-        if (r < 0)
-                log_warning("Failed to fix access mode/rights on %s, ignoring: %s", f->path, strerror(-r));
-
-#ifdef HAVE_ACL
-        if (uid <= 0)
-                return;
-
-        acl = acl_get_fd(f->fd);
-        if (!acl) {
-                log_warning("Failed to read ACL on %s, ignoring: %m", f->path);
-                return;
-        }
-
-        r = acl_find_uid(acl, uid, &entry);
-        if (r <= 0) {
-
-                if (acl_create_entry(&acl, &entry) < 0 ||
-                    acl_set_tag_type(entry, ACL_USER) < 0 ||
-                    acl_set_qualifier(entry, &uid) < 0) {
-                        log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
-                        goto finish;
-                }
-        }
-
-        if (acl_get_permset(entry, &permset) < 0 ||
-            acl_add_perm(permset, ACL_READ) < 0 ||
-            acl_calc_mask(&acl) < 0) {
-                log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
-                goto finish;
-        }
-
-        if (acl_set_fd(f->fd, acl) < 0)
-                log_warning("Failed to set ACL on %s, ignoring: %m", f->path);
-
-finish:
-        acl_free(acl);
-#endif
-}
-
-static JournalFile* find_journal(Server *s, uid_t uid) {
-        char *p;
-        int r;
-        JournalFile *f;
-        char ids[33];
-        sd_id128_t machine;
-
-        assert(s);
-
-        /* We split up user logs only on /var, not on /run. If the
-         * runtime file is open, we write to it exclusively, in order
-         * to guarantee proper order as soon as we flush /run to
-         * /var and close the runtime file. */
-
-        if (s->runtime_journal)
-                return s->runtime_journal;
-
-        if (uid <= 0)
-                return s->system_journal;
-
-        r = sd_id128_get_machine(&machine);
-        if (r < 0)
-                return s->system_journal;
-
-        f = hashmap_get(s->user_journals, UINT32_TO_PTR(uid));
-        if (f)
-                return f;
-
-        if (asprintf(&p, "/var/log/journal/%s/user-%lu.journal", sd_id128_to_string(machine, ids), (unsigned long) uid) < 0)
-                return s->system_journal;
-
-        while (hashmap_size(s->user_journals) >= USER_JOURNALS_MAX) {
-                /* Too many open? Then let's close one */
-                f = hashmap_steal_first(s->user_journals);
-                assert(f);
-                journal_file_close(f);
-        }
-
-        r = journal_file_open(p, O_RDWR|O_CREAT, 0640, s->system_journal, &f);
-        free(p);
-
-        if (r < 0)
-                return s->system_journal;
-
-        server_fix_perms(s, f, uid);
-        f->metrics = s->system_metrics;
-        f->compress = s->compress;
-
-        r = hashmap_put(s->user_journals, UINT32_TO_PTR(uid), f);
-        if (r < 0) {
-                journal_file_close(f);
-                return s->system_journal;
-        }
-
-        return f;
-}
-
-static void server_rotate(Server *s) {
-        JournalFile *f;
-        void *k;
-        Iterator i;
-        int r;
-
-        log_info("Rotating...");
-
-        if (s->runtime_journal) {
-                r = journal_file_rotate(&s->runtime_journal);
-                if (r < 0)
-                        log_error("Failed to rotate %s: %s", s->runtime_journal->path, strerror(-r));
-        }
-
-        if (s->system_journal) {
-                r = journal_file_rotate(&s->system_journal);
-                if (r < 0)
-                        log_error("Failed to rotate %s: %s", s->system_journal->path, strerror(-r));
-        }
-
-        HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) {
-                r = journal_file_rotate(&f);
-                if (r < 0)
-                        log_error("Failed to rotate %s: %s", f->path, strerror(-r));
-                else
-                        hashmap_replace(s->user_journals, k, f);
-        }
-}
-
-static void server_vacuum(Server *s) {
-        char *p;
-        char ids[33];
-        sd_id128_t machine;
-        int r;
-
-        log_info("Vacuuming...");
-
-        r = sd_id128_get_machine(&machine);
-        if (r < 0) {
-                log_error("Failed to get machine ID: %s", strerror(-r));
-                return;
-        }
-
-        sd_id128_to_string(machine, ids);
-
-        if (s->system_journal) {
-                if (asprintf(&p, "/var/log/journal/%s", ids) < 0) {
-                        log_error("Out of memory.");
-                        return;
-                }
-
-                r = journal_directory_vacuum(p, s->system_metrics.max_use, s->system_metrics.keep_free);
-                if (r < 0 && r != -ENOENT)
-                        log_error("Failed to vacuum %s: %s", p, strerror(-r));
-                free(p);
-        }
-
-
-        if (s->runtime_journal) {
-                if (asprintf(&p, "/run/log/journal/%s", ids) < 0) {
-                        log_error("Out of memory.");
-                        return;
-                }
-
-                r = journal_directory_vacuum(p, s->runtime_metrics.max_use, s->runtime_metrics.keep_free);
-                if (r < 0 && r != -ENOENT)
-                        log_error("Failed to vacuum %s: %s", p, strerror(-r));
-                free(p);
-        }
-
-        s->cached_available_space_timestamp = 0;
-}
-
-static char *shortened_cgroup_path(pid_t pid) {
-        int r;
-        char *process_path, *init_path, *path;
-
-        assert(pid > 0);
-
-        r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &process_path);
-        if (r < 0)
-                return NULL;
-
-        r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &init_path);
-        if (r < 0) {
-                free(process_path);
-                return NULL;
-        }
-
-        if (endswith(init_path, "/system"))
-                init_path[strlen(init_path) - 7] = 0;
-        else if (streq(init_path, "/"))
-                init_path[0] = 0;
-
-        if (startswith(process_path, init_path)) {
-                char *p;
-
-                p = strdup(process_path + strlen(init_path));
-                if (!p) {
-                        free(process_path);
-                        free(init_path);
-                        return NULL;
-                }
-                path = p;
-        } else {
-                path = process_path;
-                process_path = NULL;
-        }
-
-        free(process_path);
-        free(init_path);
-
-        return path;
-}
-
-static void dispatch_message_real(Server *s,
-                             struct iovec *iovec, unsigned n, unsigned m,
-                             struct ucred *ucred,
-                             struct timeval *tv) {
-
-        char *pid = NULL, *uid = NULL, *gid = NULL,
-                *source_time = NULL, *boot_id = NULL, *machine_id = NULL,
-                *comm = NULL, *cmdline = NULL, *hostname = NULL,
-                *audit_session = NULL, *audit_loginuid = NULL,
-                *exe = NULL, *cgroup = NULL, *session = NULL,
-                *owner_uid = NULL, *unit = NULL, *selinux_context = NULL;
-
-        char idbuf[33];
-        sd_id128_t id;
-        int r;
-        char *t;
-        uid_t loginuid = 0, realuid = 0;
-        JournalFile *f;
-        bool vacuumed = false;
-
-        assert(s);
-        assert(iovec);
-        assert(n > 0);
-        assert(n + N_IOVEC_META_FIELDS <= m);
-
-        if (ucred) {
-                uint32_t audit;
-                uid_t owner;
-#ifdef HAVE_SELINUX
-                security_context_t con;
-#endif
-
-                realuid = ucred->uid;
-
-                if (asprintf(&pid, "_PID=%lu", (unsigned long) ucred->pid) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], pid);
-
-                if (asprintf(&uid, "_UID=%lu", (unsigned long) ucred->uid) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], uid);
-
-                if (asprintf(&gid, "_GID=%lu", (unsigned long) ucred->gid) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], gid);
-
-                r = get_process_comm(ucred->pid, &t);
-                if (r >= 0) {
-                        comm = strappend("_COMM=", t);
-                        free(t);
-
-                        if (comm)
-                                IOVEC_SET_STRING(iovec[n++], comm);
-                }
-
-                r = get_process_exe(ucred->pid, &t);
-                if (r >= 0) {
-                        exe = strappend("_EXE=", t);
-                        free(t);
-
-                        if (exe)
-                                IOVEC_SET_STRING(iovec[n++], exe);
-                }
-
-                r = get_process_cmdline(ucred->pid, LINE_MAX, false, &t);
-                if (r >= 0) {
-                        cmdline = strappend("_CMDLINE=", t);
-                        free(t);
-
-                        if (cmdline)
-                                IOVEC_SET_STRING(iovec[n++], cmdline);
-                }
-
-                r = audit_session_from_pid(ucred->pid, &audit);
-                if (r >= 0)
-                        if (asprintf(&audit_session, "_AUDIT_SESSION=%lu", (unsigned long) audit) >= 0)
-                                IOVEC_SET_STRING(iovec[n++], audit_session);
-
-                r = audit_loginuid_from_pid(ucred->pid, &loginuid);
-                if (r >= 0)
-                        if (asprintf(&audit_loginuid, "_AUDIT_LOGINUID=%lu", (unsigned long) loginuid) >= 0)
-                                IOVEC_SET_STRING(iovec[n++], audit_loginuid);
-
-                t = shortened_cgroup_path(ucred->pid);
-                if (t) {
-                        cgroup = strappend("_SYSTEMD_CGROUP=", t);
-                        free(t);
-
-                        if (cgroup)
-                                IOVEC_SET_STRING(iovec[n++], cgroup);
-                }
-
-                if (sd_pid_get_session(ucred->pid, &t) >= 0) {
-                        session = strappend("_SYSTEMD_SESSION=", t);
-                        free(t);
-
-                        if (session)
-                                IOVEC_SET_STRING(iovec[n++], session);
-                }
-
-                if (sd_pid_get_unit(ucred->pid, &t) >= 0) {
-                        unit = strappend("_SYSTEMD_UNIT=", t);
-                        free(t);
-
-                        if (unit)
-                                IOVEC_SET_STRING(iovec[n++], unit);
-                }
-
-                if (sd_pid_get_owner_uid(ucred->uid, &owner) >= 0)
-                        if (asprintf(&owner_uid, "_SYSTEMD_OWNER_UID=%lu", (unsigned long) owner) >= 0)
-                                IOVEC_SET_STRING(iovec[n++], owner_uid);
-
-#ifdef HAVE_SELINUX
-                if (getpidcon(ucred->pid, &con) >= 0) {
-                        selinux_context = strappend("_SELINUX_CONTEXT=", con);
-                        if (selinux_context)
-                                IOVEC_SET_STRING(iovec[n++], selinux_context);
-
-                        freecon(con);
-                }
-#endif
-        }
-
-        if (tv) {
-                if (asprintf(&source_time, "_SOURCE_REALTIME_TIMESTAMP=%llu",
-                             (unsigned long long) timeval_load(tv)) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], source_time);
-        }
-
-        /* Note that strictly speaking storing the boot id here is
-         * redundant since the entry includes this in-line
-         * anyway. However, we need this indexed, too. */
-        r = sd_id128_get_boot(&id);
-        if (r >= 0)
-                if (asprintf(&boot_id, "_BOOT_ID=%s", sd_id128_to_string(id, idbuf)) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], boot_id);
-
-        r = sd_id128_get_machine(&id);
-        if (r >= 0)
-                if (asprintf(&machine_id, "_MACHINE_ID=%s", sd_id128_to_string(id, idbuf)) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], machine_id);
-
-        t = gethostname_malloc();
-        if (t) {
-                hostname = strappend("_HOSTNAME=", t);
-                free(t);
-                if (hostname)
-                        IOVEC_SET_STRING(iovec[n++], hostname);
-        }
-
-        assert(n <= m);
-
-        server_flush_to_var(s);
-
-retry:
-        f = find_journal(s, realuid == 0 ? 0 : loginuid);
-        if (!f)
-                log_warning("Dropping message, as we can't find a place to store the data.");
-        else {
-                r = journal_file_append_entry(f, NULL, iovec, n, &s->seqnum, NULL, NULL);
-
-                if (r == -E2BIG && !vacuumed) {
-                        log_info("Allocation limit reached.");
-
-                        server_rotate(s);
-                        server_vacuum(s);
-                        vacuumed = true;
-
-                        log_info("Retrying write.");
-                        goto retry;
-                }
-
-                if (r < 0)
-                        log_error("Failed to write entry, ignoring: %s", strerror(-r));
-        }
-
-        free(pid);
-        free(uid);
-        free(gid);
-        free(comm);
-        free(exe);
-        free(cmdline);
-        free(source_time);
-        free(boot_id);
-        free(machine_id);
-        free(hostname);
-        free(audit_session);
-        free(audit_loginuid);
-        free(cgroup);
-        free(session);
-        free(owner_uid);
-        free(unit);
-        free(selinux_context);
-}
-
-static void driver_message(Server *s, sd_id128_t message_id, const char *format, ...) {
-        char mid[11 + 32 + 1];
-        char buffer[16 + LINE_MAX + 1];
-        struct iovec iovec[N_IOVEC_META_FIELDS + 4];
-        int n = 0;
-        va_list ap;
-        struct ucred ucred;
-
-        assert(s);
-        assert(format);
-
-        IOVEC_SET_STRING(iovec[n++], "PRIORITY=5");
-        IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=driver");
-
-        memcpy(buffer, "MESSAGE=", 8);
-        va_start(ap, format);
-        vsnprintf(buffer + 8, sizeof(buffer) - 8, format, ap);
-        va_end(ap);
-        char_array_0(buffer);
-        IOVEC_SET_STRING(iovec[n++], buffer);
-
-        snprintf(mid, sizeof(mid), "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(message_id));
-        char_array_0(mid);
-        IOVEC_SET_STRING(iovec[n++], mid);
-
-        zero(ucred);
-        ucred.pid = getpid();
-        ucred.uid = getuid();
-        ucred.gid = getgid();
-
-        dispatch_message_real(s, iovec, n, ELEMENTSOF(iovec), &ucred, NULL);
-}
-
-static void dispatch_message(Server *s,
-                             struct iovec *iovec, unsigned n, unsigned m,
-                             struct ucred *ucred,
-                             struct timeval *tv,
-                             int priority) {
-        int rl;
-        char *path = NULL, *c;
-
-        assert(s);
-        assert(iovec || n == 0);
-
-        if (n == 0)
-                return;
-
-        if (!ucred)
-                goto finish;
-
-        path = shortened_cgroup_path(ucred->pid);
-        if (!path)
-                goto finish;
-
-        /* example: /user/lennart/3/foobar
-         *          /system/dbus.service/foobar
-         *
-         * So let's cut of everything past the third /, since that is
-         * wher user directories start */
-
-        c = strchr(path, '/');
-        if (c) {
-                c = strchr(c+1, '/');
-                if (c) {
-                        c = strchr(c+1, '/');
-                        if (c)
-                                *c = 0;
-                }
-        }
-
-        rl = journal_rate_limit_test(s->rate_limit, path, priority & LOG_PRIMASK, available_space(s));
-
-        if (rl == 0) {
-                free(path);
-                return;
-        }
-
-        /* Write a suppression message if we suppressed something */
-        if (rl > 1)
-                driver_message(s, SD_MESSAGE_JOURNAL_DROPPED, "Suppressed %u messages from %s", rl - 1, path);
-
-        free(path);
-
-finish:
-        dispatch_message_real(s, iovec, n, m, ucred, tv);
-}
-
-static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, struct ucred *ucred, struct timeval *tv) {
-        struct msghdr msghdr;
-        struct cmsghdr *cmsg;
-        union {
-                struct cmsghdr cmsghdr;
-                uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
-        } control;
-        union sockaddr_union sa;
-
-        assert(s);
-        assert(iovec);
-        assert(n_iovec > 0);
-
-        zero(msghdr);
-        msghdr.msg_iov = (struct iovec*) iovec;
-        msghdr.msg_iovlen = n_iovec;
-
-        zero(sa);
-        sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/journal/syslog", sizeof(sa.un.sun_path));
-        msghdr.msg_name = &sa;
-        msghdr.msg_namelen = offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path);
-
-        if (ucred) {
-                zero(control);
-                msghdr.msg_control = &control;
-                msghdr.msg_controllen = sizeof(control);
-
-                cmsg = CMSG_FIRSTHDR(&msghdr);
-                cmsg->cmsg_level = SOL_SOCKET;
-                cmsg->cmsg_type = SCM_CREDENTIALS;
-                cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
-                memcpy(CMSG_DATA(cmsg), ucred, sizeof(struct ucred));
-                msghdr.msg_controllen = cmsg->cmsg_len;
-        }
-
-        /* Forward the syslog message we received via /dev/log to
-         * /run/systemd/syslog. Unfortunately we currently can't set
-         * the SO_TIMESTAMP auxiliary data, and hence we don't. */
-
-        if (sendmsg(s->syslog_fd, &msghdr, MSG_NOSIGNAL) >= 0)
-                return;
-
-        /* The socket is full? I guess the syslog implementation is
-         * too slow, and we shouldn't wait for that... */
-        if (errno == EAGAIN)
-                return;
-
-        if (ucred && errno == ESRCH) {
-                struct ucred u;
-
-                /* Hmm, presumably the sender process vanished
-                 * by now, so let's fix it as good as we
-                 * can, and retry */
-
-                u = *ucred;
-                u.pid = getpid();
-                memcpy(CMSG_DATA(cmsg), &u, sizeof(struct ucred));
-
-                if (sendmsg(s->syslog_fd, &msghdr, MSG_NOSIGNAL) >= 0)
-                        return;
-
-                if (errno == EAGAIN)
-                        return;
-        }
-
-        log_debug("Failed to forward syslog message: %m");
-}
-
-static void forward_syslog_raw(Server *s, const char *buffer, struct ucred *ucred, struct timeval *tv) {
-        struct iovec iovec;
-
-        assert(s);
-        assert(buffer);
-
-        IOVEC_SET_STRING(iovec, buffer);
-        forward_syslog_iovec(s, &iovec, 1, ucred, tv);
-}
-
-static void forward_syslog(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred, struct timeval *tv) {
-        struct iovec iovec[5];
-        char header_priority[6], header_time[64], header_pid[16];
-        int n = 0;
-        time_t t;
-        struct tm *tm;
-        char *ident_buf = NULL;
-
-        assert(s);
-        assert(priority >= 0);
-        assert(priority <= 999);
-        assert(message);
-
-        /* First: priority field */
-        snprintf(header_priority, sizeof(header_priority), "<%i>", priority);
-        char_array_0(header_priority);
-        IOVEC_SET_STRING(iovec[n++], header_priority);
-
-        /* Second: timestamp */
-        t = tv ? tv->tv_sec : ((time_t) (now(CLOCK_REALTIME) / USEC_PER_SEC));
-        tm = localtime(&t);
-        if (!tm)
-                return;
-        if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
-                return;
-        IOVEC_SET_STRING(iovec[n++], header_time);
-
-        /* Third: identifier and PID */
-        if (ucred) {
-                if (!identifier) {
-                        get_process_comm(ucred->pid, &ident_buf);
-                        identifier = ident_buf;
-                }
-
-                snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) ucred->pid);
-                char_array_0(header_pid);
-
-                if (identifier)
-                        IOVEC_SET_STRING(iovec[n++], identifier);
-
-                IOVEC_SET_STRING(iovec[n++], header_pid);
-        } else if (identifier) {
-                IOVEC_SET_STRING(iovec[n++], identifier);
-                IOVEC_SET_STRING(iovec[n++], ": ");
-        }
-
-        /* Fourth: message */
-        IOVEC_SET_STRING(iovec[n++], message);
-
-        forward_syslog_iovec(s, iovec, n, ucred, tv);
-
-        free(ident_buf);
-}
-
-static int fixup_priority(int priority) {
-
-        if ((priority & LOG_FACMASK) == 0)
-                return (priority & LOG_PRIMASK) | LOG_USER;
-
-        return priority;
-}
-
-static void forward_kmsg(Server *s, int priority, const char *identifier, const char *message, struct ucred *ucred) {
-        struct iovec iovec[5];
-        char header_priority[6], header_pid[16];
-        int n = 0;
-        char *ident_buf = NULL;
-        int fd;
-
-        assert(s);
-        assert(priority >= 0);
-        assert(priority <= 999);
-        assert(message);
-
-        /* Never allow messages with kernel facility to be written to
-         * kmsg, regardless where the data comes from. */
-        priority = fixup_priority(priority);
-
-        /* First: priority field */
-        snprintf(header_priority, sizeof(header_priority), "<%i>", priority);
-        char_array_0(header_priority);
-        IOVEC_SET_STRING(iovec[n++], header_priority);
-
-        /* Second: identifier and PID */
-        if (ucred) {
-                if (!identifier) {
-                        get_process_comm(ucred->pid, &ident_buf);
-                        identifier = ident_buf;
-                }
-
-                snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) ucred->pid);
-                char_array_0(header_pid);
-
-                if (identifier)
-                        IOVEC_SET_STRING(iovec[n++], identifier);
-
-                IOVEC_SET_STRING(iovec[n++], header_pid);
-        } else if (identifier) {
-                IOVEC_SET_STRING(iovec[n++], identifier);
-                IOVEC_SET_STRING(iovec[n++], ": ");
-        }
-
-        /* Fourth: message */
-        IOVEC_SET_STRING(iovec[n++], message);
-        IOVEC_SET_STRING(iovec[n++], "\n");
-
-        fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-        if (fd < 0) {
-                log_debug("Failed to open /dev/kmsg for logging: %s", strerror(errno));
-                goto finish;
-        }
-
-        if (writev(fd, iovec, n) < 0)
-                log_debug("Failed to write to /dev/kmsg for logging: %s", strerror(errno));
-
-        close_nointr_nofail(fd);
-
-finish:
-        free(ident_buf);
-}
-
-static void forward_console(Server *s, const char *identifier, const char *message, struct ucred *ucred) {
-        struct iovec iovec[4];
-        char header_pid[16];
-        int n = 0, fd;
-        char *ident_buf = NULL;
-
-        assert(s);
-        assert(message);
-
-        /* First: identifier and PID */
-        if (ucred) {
-                if (!identifier) {
-                        get_process_comm(ucred->pid, &ident_buf);
-                        identifier = ident_buf;
-                }
-
-                snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) ucred->pid);
-                char_array_0(header_pid);
-
-                if (identifier)
-                        IOVEC_SET_STRING(iovec[n++], identifier);
-
-                IOVEC_SET_STRING(iovec[n++], header_pid);
-        } else if (identifier) {
-                IOVEC_SET_STRING(iovec[n++], identifier);
-                IOVEC_SET_STRING(iovec[n++], ": ");
-        }
-
-        /* Third: message */
-        IOVEC_SET_STRING(iovec[n++], message);
-        IOVEC_SET_STRING(iovec[n++], "\n");
-
-        fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-        if (fd < 0) {
-                log_debug("Failed to open /dev/console for logging: %s", strerror(errno));
-                goto finish;
-        }
-
-        if (writev(fd, iovec, n) < 0)
-                log_debug("Failed to write to /dev/console for logging: %s", strerror(errno));
-
-        close_nointr_nofail(fd);
-
-finish:
-        free(ident_buf);
-}
-
-static void read_identifier(const char **buf, char **identifier, char **pid) {
-        const char *p;
-        char *t;
-        size_t l, e;
-
-        assert(buf);
-        assert(identifier);
-        assert(pid);
-
-        p = *buf;
-
-        p += strspn(p, WHITESPACE);
-        l = strcspn(p, WHITESPACE);
-
-        if (l <= 0 ||
-            p[l-1] != ':')
-                return;
-
-        e = l;
-        l--;
-
-        if (p[l-1] == ']') {
-                size_t k = l-1;
-
-                for (;;) {
-
-                        if (p[k] == '[') {
-                                t = strndup(p+k+1, l-k-2);
-                                if (t)
-                                        *pid = t;
-
-                                l = k;
-                                break;
-                        }
-
-                        if (k == 0)
-                                break;
-
-                        k--;
-                }
-        }
-
-        t = strndup(p, l);
-        if (t)
-                *identifier = t;
-
-        *buf = p + e;
-        *buf += strspn(*buf, WHITESPACE);
-}
-
-static void process_syslog_message(Server *s, const char *buf, struct ucred *ucred, struct timeval *tv) {
-        char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL, *syslog_pid = NULL;
-        struct iovec iovec[N_IOVEC_META_FIELDS + 6];
-        unsigned n = 0;
-        int priority = LOG_USER | LOG_INFO;
-        char *identifier = NULL, *pid = NULL;
-
-        assert(s);
-        assert(buf);
-
-        if (s->forward_to_syslog)
-                forward_syslog_raw(s, buf, ucred, tv);
-
-        parse_syslog_priority((char**) &buf, &priority);
-        skip_syslog_date((char**) &buf);
-        read_identifier(&buf, &identifier, &pid);
-
-        if (s->forward_to_kmsg)
-                forward_kmsg(s, priority, identifier, buf, ucred);
-
-        if (s->forward_to_console)
-                forward_console(s, identifier, buf, ucred);
-
-        IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=syslog");
-
-        if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
-                IOVEC_SET_STRING(iovec[n++], syslog_priority);
-
-        if (priority & LOG_FACMASK)
-                if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
-
-        if (identifier) {
-                syslog_identifier = strappend("SYSLOG_IDENTIFIER=", identifier);
-                if (syslog_identifier)
-                        IOVEC_SET_STRING(iovec[n++], syslog_identifier);
-        }
-
-        if (pid) {
-                syslog_pid = strappend("SYSLOG_PID=", pid);
-                if (syslog_pid)
-                        IOVEC_SET_STRING(iovec[n++], syslog_pid);
-        }
-
-        message = strappend("MESSAGE=", buf);
-        if (message)
-                IOVEC_SET_STRING(iovec[n++], message);
-
-        dispatch_message(s, iovec, n, ELEMENTSOF(iovec), ucred, tv, priority);
-
-        free(message);
-        free(identifier);
-        free(pid);
-        free(syslog_priority);
-        free(syslog_facility);
-        free(syslog_identifier);
-}
-
-static bool valid_user_field(const char *p, size_t l) {
-        const char *a;
-
-        /* We kinda enforce POSIX syntax recommendations for
-           environment variables here, but make a couple of additional
-           requirements.
-
-           http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap08.html */
-
-        /* No empty field names */
-        if (l <= 0)
-                return false;
-
-        /* Don't allow names longer than 64 chars */
-        if (l > 64)
-                return false;
-
-        /* Variables starting with an underscore are protected */
-        if (p[0] == '_')
-                return false;
-
-        /* Don't allow digits as first character */
-        if (p[0] >= '0' && p[0] <= '9')
-                return false;
-
-        /* Only allow A-Z0-9 and '_' */
-        for (a = p; a < p + l; a++)
-                if (!((*a >= 'A' && *a <= 'Z') ||
-                      (*a >= '0' && *a <= '9') ||
-                      *a == '_'))
-                        return false;
-
-        return true;
-}
-
-static void process_native_message(Server *s, const void *buffer, size_t buffer_size, struct ucred *ucred, struct timeval *tv) {
-        struct iovec *iovec = NULL;
-        unsigned n = 0, m = 0, j, tn = (unsigned) -1;
-        const char *p;
-        size_t remaining;
-        int priority = LOG_INFO;
-        char *identifier = NULL, *message = NULL;
-
-        assert(s);
-        assert(buffer || n == 0);
-
-        p = buffer;
-        remaining = buffer_size;
-
-        while (remaining > 0) {
-                const char *e, *q;
-
-                e = memchr(p, '\n', remaining);
-
-                if (!e) {
-                        /* Trailing noise, let's ignore it, and flush what we collected */
-                        log_debug("Received message with trailing noise, ignoring.");
-                        break;
-                }
-
-                if (e == p) {
-                        /* Entry separator */
-                        dispatch_message(s, iovec, n, m, ucred, tv, priority);
-                        n = 0;
-                        priority = LOG_INFO;
-
-                        p++;
-                        remaining--;
-                        continue;
-                }
-
-                if (*p == '.' || *p == '#') {
-                        /* Ignore control commands for now, and
-                         * comments too. */
-                        remaining -= (e - p) + 1;
-                        p = e + 1;
-                        continue;
-                }
-
-                /* A property follows */
-
-                if (n+N_IOVEC_META_FIELDS >= m) {
-                        struct iovec *c;
-                        unsigned u;
-
-                        u = MAX((n+N_IOVEC_META_FIELDS+1) * 2U, 4U);
-                        c = realloc(iovec, u * sizeof(struct iovec));
-                        if (!c) {
-                                log_error("Out of memory");
-                                break;
-                        }
-
-                        iovec = c;
-                        m = u;
-                }
-
-                q = memchr(p, '=', e - p);
-                if (q) {
-                        if (valid_user_field(p, q - p)) {
-                                size_t l;
-
-                                l = e - p;
-
-                                /* If the field name starts with an
-                                 * underscore, skip the variable,
-                                 * since that indidates a trusted
-                                 * field */
-                                iovec[n].iov_base = (char*) p;
-                                iovec[n].iov_len = l;
-                                n++;
-
-                                /* We need to determine the priority
-                                 * of this entry for the rate limiting
-                                 * logic */
-                                if (l == 10 &&
-                                    memcmp(p, "PRIORITY=", 9) == 0 &&
-                                    p[9] >= '0' && p[9] <= '9')
-                                        priority = (priority & LOG_FACMASK) | (p[9] - '0');
-
-                                else if (l == 17 &&
-                                         memcmp(p, "SYSLOG_FACILITY=", 16) == 0 &&
-                                         p[16] >= '0' && p[16] <= '9')
-                                        priority = (priority & LOG_PRIMASK) | ((p[16] - '0') << 3);
-
-                                else if (l == 18 &&
-                                         memcmp(p, "SYSLOG_FACILITY=", 16) == 0 &&
-                                         p[16] >= '0' && p[16] <= '9' &&
-                                         p[17] >= '0' && p[17] <= '9')
-                                        priority = (priority & LOG_PRIMASK) | (((p[16] - '0')*10 + (p[17] - '0')) << 3);
-
-                                else if (l >= 12 &&
-                                         memcmp(p, "SYSLOG_IDENTIFIER=", 11) == 0) {
-                                        char *t;
-
-                                        t = strndup(p + 11, l - 11);
-                                        if (t) {
-                                                free(identifier);
-                                                identifier = t;
-                                        }
-                                } else if (l >= 8 &&
-                                           memcmp(p, "MESSAGE=", 8) == 0) {
-                                        char *t;
-
-                                        t = strndup(p + 8, l - 8);
-                                        if (t) {
-                                                free(message);
-                                                message = t;
-                                        }
-                                }
-                        }
-
-                        remaining -= (e - p) + 1;
-                        p = e + 1;
-                        continue;
-                } else {
-                        uint64_t l;
-                        char *k;
-
-                        if (remaining < e - p + 1 + sizeof(uint64_t) + 1) {
-                                log_debug("Failed to parse message, ignoring.");
-                                break;
-                        }
-
-                        memcpy(&l, e + 1, sizeof(uint64_t));
-                        l = le64toh(l);
-
-                        if (remaining < e - p + 1 + sizeof(uint64_t) + l + 1 ||
-                            e[1+sizeof(uint64_t)+l] != '\n') {
-                                log_debug("Failed to parse message, ignoring.");
-                                break;
-                        }
-
-                        k = malloc((e - p) + 1 + l);
-                        if (!k) {
-                                log_error("Out of memory");
-                                break;
-                        }
-
-                        memcpy(k, p, e - p);
-                        k[e - p] = '=';
-                        memcpy(k + (e - p) + 1, e + 1 + sizeof(uint64_t), l);
-
-                        if (valid_user_field(p, e - p)) {
-                                iovec[n].iov_base = k;
-                                iovec[n].iov_len = (e - p) + 1 + l;
-                                n++;
-                        } else
-                                free(k);
-
-                        remaining -= (e - p) + 1 + sizeof(uint64_t) + l + 1;
-                        p = e + 1 + sizeof(uint64_t) + l + 1;
-                }
-        }
-
-        if (n <= 0)
-                goto finish;
-
-        tn = n++;
-        IOVEC_SET_STRING(iovec[tn], "_TRANSPORT=journal");
-
-        if (message) {
-                if (s->forward_to_syslog)
-                        forward_syslog(s, priority, identifier, message, ucred, tv);
-
-                if (s->forward_to_kmsg)
-                        forward_kmsg(s, priority, identifier, message, ucred);
-
-                if (s->forward_to_console)
-                        forward_console(s, identifier, message, ucred);
-        }
-
-        dispatch_message(s, iovec, n, m, ucred, tv, priority);
-
-finish:
-        for (j = 0; j < n; j++)  {
-                if (j == tn)
-                        continue;
-
-                if (iovec[j].iov_base < buffer ||
-                    (const uint8_t*) iovec[j].iov_base >= (const uint8_t*) buffer + buffer_size)
-                        free(iovec[j].iov_base);
-        }
-
-        free(identifier);
-        free(message);
-}
-
-static void process_native_file(Server *s, int fd, struct ucred *ucred, struct timeval *tv) {
-        struct stat st;
-        void *p;
-        ssize_t n;
-
-        assert(s);
-        assert(fd >= 0);
-
-        /* Data is in the passed file, since it didn't fit in a
-         * datagram. We can't map the file here, since clients might
-         * then truncate it and trigger a SIGBUS for us. So let's
-         * stupidly read it */
-
-        if (fstat(fd, &st) < 0) {
-                log_error("Failed to stat passed file, ignoring: %m");
-                return;
-        }
-
-        if (!S_ISREG(st.st_mode)) {
-                log_error("File passed is not regular. Ignoring.");
-                return;
-        }
-
-        if (st.st_size <= 0)
-                return;
-
-        if (st.st_size > ENTRY_SIZE_MAX) {
-                log_error("File passed too large. Ignoring.");
-                return;
-        }
-
-        p = malloc(st.st_size);
-        if (!p) {
-                log_error("Out of memory");
-                return;
-        }
-
-        n = pread(fd, p, st.st_size, 0);
-        if (n < 0)
-                log_error("Failed to read file, ignoring: %s", strerror(-n));
-        else if (n > 0)
-                process_native_message(s, p, n, ucred, tv);
-
-        free(p);
-}
-
-static int stdout_stream_log(StdoutStream *s, const char *p) {
-        struct iovec iovec[N_IOVEC_META_FIELDS + 5];
-        char *message = NULL, *syslog_priority = NULL, *syslog_facility = NULL, *syslog_identifier = NULL;
-        unsigned n = 0;
-        int priority;
-
-        assert(s);
-        assert(p);
-
-        if (isempty(p))
-                return 0;
-
-        priority = s->priority;
-
-        if (s->level_prefix)
-                parse_syslog_priority((char**) &p, &priority);
-
-        if (s->forward_to_syslog || s->server->forward_to_syslog)
-                forward_syslog(s->server, fixup_priority(priority), s->identifier, p, &s->ucred, NULL);
-
-        if (s->forward_to_kmsg || s->server->forward_to_kmsg)
-                forward_kmsg(s->server, priority, s->identifier, p, &s->ucred);
-
-        if (s->forward_to_console || s->server->forward_to_console)
-                forward_console(s->server, s->identifier, p, &s->ucred);
-
-        IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=stdout");
-
-        if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
-                IOVEC_SET_STRING(iovec[n++], syslog_priority);
-
-        if (priority & LOG_FACMASK)
-                if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
-
-        if (s->identifier) {
-                syslog_identifier = strappend("SYSLOG_IDENTIFIER=", s->identifier);
-                if (syslog_identifier)
-                        IOVEC_SET_STRING(iovec[n++], syslog_identifier);
-        }
-
-        message = strappend("MESSAGE=", p);
-        if (message)
-                IOVEC_SET_STRING(iovec[n++], message);
-
-        dispatch_message(s->server, iovec, n, ELEMENTSOF(iovec), &s->ucred, NULL, priority);
-
-        free(message);
-        free(syslog_priority);
-        free(syslog_facility);
-        free(syslog_identifier);
-
-        return 0;
-}
-
-static int stdout_stream_line(StdoutStream *s, char *p) {
-        int r;
-
-        assert(s);
-        assert(p);
-
-        p = strstrip(p);
-
-        switch (s->state) {
-
-        case STDOUT_STREAM_IDENTIFIER:
-                if (isempty(p))
-                        s->identifier = NULL;
-                else  {
-                        s->identifier = strdup(p);
-                        if (!s->identifier) {
-                                log_error("Out of memory");
-                                return -ENOMEM;
-                        }
-                }
-
-                s->state = STDOUT_STREAM_PRIORITY;
-                return 0;
-
-        case STDOUT_STREAM_PRIORITY:
-                r = safe_atoi(p, &s->priority);
-                if (r < 0 || s->priority <= 0 || s->priority >= 999) {
-                        log_warning("Failed to parse log priority line.");
-                        return -EINVAL;
-                }
-
-                s->state = STDOUT_STREAM_LEVEL_PREFIX;
-                return 0;
-
-        case STDOUT_STREAM_LEVEL_PREFIX:
-                r = parse_boolean(p);
-                if (r < 0) {
-                        log_warning("Failed to parse level prefix line.");
-                        return -EINVAL;
-                }
-
-                s->level_prefix = !!r;
-                s->state = STDOUT_STREAM_FORWARD_TO_SYSLOG;
-                return 0;
-
-        case STDOUT_STREAM_FORWARD_TO_SYSLOG:
-                r = parse_boolean(p);
-                if (r < 0) {
-                        log_warning("Failed to parse forward to syslog line.");
-                        return -EINVAL;
-                }
-
-                s->forward_to_syslog = !!r;
-                s->state = STDOUT_STREAM_FORWARD_TO_KMSG;
-                return 0;
-
-        case STDOUT_STREAM_FORWARD_TO_KMSG:
-                r = parse_boolean(p);
-                if (r < 0) {
-                        log_warning("Failed to parse copy to kmsg line.");
-                        return -EINVAL;
-                }
-
-                s->forward_to_kmsg = !!r;
-                s->state = STDOUT_STREAM_FORWARD_TO_CONSOLE;
-                return 0;
-
-        case STDOUT_STREAM_FORWARD_TO_CONSOLE:
-                r = parse_boolean(p);
-                if (r < 0) {
-                        log_warning("Failed to parse copy to console line.");
-                        return -EINVAL;
-                }
-
-                s->forward_to_console = !!r;
-                s->state = STDOUT_STREAM_RUNNING;
-                return 0;
-
-        case STDOUT_STREAM_RUNNING:
-                return stdout_stream_log(s, p);
-        }
-
-        assert_not_reached("Unknown stream state");
-}
-
-static int stdout_stream_scan(StdoutStream *s, bool force_flush) {
-        char *p;
-        size_t remaining;
-        int r;
-
-        assert(s);
-
-        p = s->buffer;
-        remaining = s->length;
-        for (;;) {
-                char *end;
-                size_t skip;
-
-                end = memchr(p, '\n', remaining);
-                if (end)
-                        skip = end - p + 1;
-                else if (remaining >= sizeof(s->buffer) - 1) {
-                        end = p + sizeof(s->buffer) - 1;
-                        skip = remaining;
-                } else
-                        break;
-
-                *end = 0;
-
-                r = stdout_stream_line(s, p);
-                if (r < 0)
-                        return r;
-
-                remaining -= skip;
-                p += skip;
-        }
-
-        if (force_flush && remaining > 0) {
-                p[remaining] = 0;
-                r = stdout_stream_line(s, p);
-                if (r < 0)
-                        return r;
-
-                p += remaining;
-                remaining = 0;
-        }
-
-        if (p > s->buffer) {
-                memmove(s->buffer, p, remaining);
-                s->length = remaining;
-        }
-
-        return 0;
-}
-
-static int stdout_stream_process(StdoutStream *s) {
-        ssize_t l;
-        int r;
-
-        assert(s);
-
-        l = read(s->fd, s->buffer+s->length, sizeof(s->buffer)-1-s->length);
-        if (l < 0) {
-
-                if (errno == EAGAIN)
-                        return 0;
-
-                log_warning("Failed to read from stream: %m");
-                return -errno;
-        }
-
-        if (l == 0) {
-                r = stdout_stream_scan(s, true);
-                if (r < 0)
-                        return r;
-
-                return 0;
-        }
-
-        s->length += l;
-        r = stdout_stream_scan(s, false);
-        if (r < 0)
-                return r;
-
-        return 1;
-
-}
-
-static void stdout_stream_free(StdoutStream *s) {
-        assert(s);
-
-        if (s->server) {
-                assert(s->server->n_stdout_streams > 0);
-                s->server->n_stdout_streams --;
-                LIST_REMOVE(StdoutStream, stdout_stream, s->server->stdout_streams, s);
-        }
-
-        if (s->fd >= 0) {
-                if (s->server)
-                        epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL);
-
-                close_nointr_nofail(s->fd);
-        }
-
-        free(s->identifier);
-        free(s);
-}
-
-static int stdout_stream_new(Server *s) {
-        StdoutStream *stream;
-        int fd, r;
-        socklen_t len;
-        struct epoll_event ev;
-
-        assert(s);
-
-        fd = accept4(s->stdout_fd, NULL, NULL, SOCK_NONBLOCK|SOCK_CLOEXEC);
-        if (fd < 0) {
-                if (errno == EAGAIN)
-                        return 0;
-
-                log_error("Failed to accept stdout connection: %m");
-                return -errno;
-        }
-
-        if (s->n_stdout_streams >= STDOUT_STREAMS_MAX) {
-                log_warning("Too many stdout streams, refusing connection.");
-                close_nointr_nofail(fd);
-                return 0;
-        }
-
-        stream = new0(StdoutStream, 1);
-        if (!stream) {
-                log_error("Out of memory.");
-                close_nointr_nofail(fd);
-                return -ENOMEM;
-        }
-
-        stream->fd = fd;
-
-        len = sizeof(stream->ucred);
-        if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &stream->ucred, &len) < 0) {
-                log_error("Failed to determine peer credentials: %m");
-                r = -errno;
-                goto fail;
-        }
-
-        if (shutdown(fd, SHUT_WR) < 0) {
-                log_error("Failed to shutdown writing side of socket: %m");
-                r = -errno;
-                goto fail;
-        }
-
-        zero(ev);
-        ev.data.ptr = stream;
-        ev.events = EPOLLIN;
-        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
-                log_error("Failed to add stream to event loop: %m");
-                r = -errno;
-                goto fail;
-        }
-
-        stream->server = s;
-        LIST_PREPEND(StdoutStream, stdout_stream, s->stdout_streams, stream);
-        s->n_stdout_streams ++;
-
-        return 0;
-
-fail:
-        stdout_stream_free(stream);
-        return r;
-}
-
-static int parse_kernel_timestamp(char **_p, usec_t *t) {
-        usec_t r;
-        int k, i;
-        char *p;
-
-        assert(_p);
-        assert(*_p);
-        assert(t);
-
-        p = *_p;
-
-        if (strlen(p) < 14 || p[0] != '[' || p[13] != ']' || p[6] != '.')
-                return 0;
-
-        r = 0;
-
-        for (i = 1; i <= 5; i++) {
-                r *= 10;
-
-                if (p[i] == ' ')
-                        continue;
-
-                k = undecchar(p[i]);
-                if (k < 0)
-                        return 0;
-
-                r += k;
-        }
-
-        for (i = 7; i <= 12; i++) {
-                r *= 10;
-
-                k = undecchar(p[i]);
-                if (k < 0)
-                        return 0;
-
-                r += k;
-        }
-
-        *t = r;
-        *_p += 14;
-        *_p += strspn(*_p, WHITESPACE);
-
-        return 1;
-}
-
-static void proc_kmsg_line(Server *s, const char *p) {
-        struct iovec iovec[N_IOVEC_META_FIELDS + 7];
-        char *message = NULL, *syslog_priority = NULL, *syslog_pid = NULL, *syslog_facility = NULL, *syslog_identifier = NULL, *source_time = NULL;
-        int priority = LOG_KERN | LOG_INFO;
-        unsigned n = 0;
-        usec_t usec;
-        char *identifier = NULL, *pid = NULL;
-
-        assert(s);
-        assert(p);
-
-        if (isempty(p))
-                return;
-
-        parse_syslog_priority((char **) &p, &priority);
-
-        if (s->forward_to_kmsg && (priority & LOG_FACMASK) != LOG_KERN)
-                return;
-
-        if (parse_kernel_timestamp((char **) &p, &usec) > 0) {
-                if (asprintf(&source_time, "_SOURCE_MONOTONIC_TIMESTAMP=%llu",
-                             (unsigned long long) usec) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], source_time);
-        }
-
-        IOVEC_SET_STRING(iovec[n++], "_TRANSPORT=kernel");
-
-        if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
-                IOVEC_SET_STRING(iovec[n++], syslog_priority);
-
-        if ((priority & LOG_FACMASK) == LOG_KERN) {
-
-                if (s->forward_to_syslog)
-                        forward_syslog(s, priority, "kernel", p, NULL, NULL);
-
-                IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel");
-        } else {
-                read_identifier(&p, &identifier, &pid);
-
-                if (s->forward_to_syslog)
-                        forward_syslog(s, priority, identifier, p, NULL, NULL);
-
-                if (identifier) {
-                        syslog_identifier = strappend("SYSLOG_IDENTIFIER=", identifier);
-                        if (syslog_identifier)
-                                IOVEC_SET_STRING(iovec[n++], syslog_identifier);
-                }
-
-                if (pid) {
-                        syslog_pid = strappend("SYSLOG_PID=", pid);
-                        if (syslog_pid)
-                                IOVEC_SET_STRING(iovec[n++], syslog_pid);
-                }
-
-                if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
-                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
-        }
-
-        message = strappend("MESSAGE=", p);
-        if (message)
-                IOVEC_SET_STRING(iovec[n++], message);
-
-        dispatch_message(s, iovec, n, ELEMENTSOF(iovec), NULL, NULL, priority);
-
-        free(message);
-        free(syslog_priority);
-        free(syslog_identifier);
-        free(syslog_pid);
-        free(syslog_facility);
-        free(source_time);
-        free(identifier);
-        free(pid);
-}
-
-static void proc_kmsg_scan(Server *s) {
-        char *p;
-        size_t remaining;
-
-        assert(s);
-
-        p = s->proc_kmsg_buffer;
-        remaining = s->proc_kmsg_length;
-        for (;;) {
-                char *end;
-                size_t skip;
-
-                end = memchr(p, '\n', remaining);
-                if (end)
-                        skip = end - p + 1;
-                else if (remaining >= sizeof(s->proc_kmsg_buffer) - 1) {
-                        end = p + sizeof(s->proc_kmsg_buffer) - 1;
-                        skip = remaining;
-                } else
-                        break;
-
-                *end = 0;
-
-                proc_kmsg_line(s, p);
-
-                remaining -= skip;
-                p += skip;
-        }
-
-        if (p > s->proc_kmsg_buffer) {
-                memmove(s->proc_kmsg_buffer, p, remaining);
-                s->proc_kmsg_length = remaining;
-        }
-}
-
-static int system_journal_open(Server *s) {
-        int r;
-        char *fn;
-        sd_id128_t machine;
-        char ids[33];
-
-        r = sd_id128_get_machine(&machine);
-        if (r < 0)
-                return r;
-
-        sd_id128_to_string(machine, ids);
-
-        if (!s->system_journal) {
-
-                /* First try to create the machine path, but not the prefix */
-                fn = strappend("/var/log/journal/", ids);
-                if (!fn)
-                        return -ENOMEM;
-                (void) mkdir(fn, 0755);
-                free(fn);
-
-                /* The create the system journal file */
-                fn = join("/var/log/journal/", ids, "/system.journal", NULL);
-                if (!fn)
-                        return -ENOMEM;
-
-                r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, NULL, &s->system_journal);
-                free(fn);
-
-                if (r >= 0) {
-                        journal_default_metrics(&s->system_metrics, s->system_journal->fd);
-
-                        s->system_journal->metrics = s->system_metrics;
-                        s->system_journal->compress = s->compress;
-
-                        server_fix_perms(s, s->system_journal, 0);
-                } else if (r < 0) {
-
-                        if (r != -ENOENT && r != -EROFS)
-                                log_warning("Failed to open system journal: %s", strerror(-r));
-
-                        r = 0;
-                }
-        }
-
-        if (!s->runtime_journal) {
-
-                fn = join("/run/log/journal/", ids, "/system.journal", NULL);
-                if (!fn)
-                        return -ENOMEM;
-
-                if (s->system_journal) {
-
-                        /* Try to open the runtime journal, but only
-                         * if it already exists, so that we can flush
-                         * it into the system journal */
-
-                        r = journal_file_open(fn, O_RDWR, 0640, NULL, &s->runtime_journal);
-                        free(fn);
-
-                        if (r < 0) {
-                                if (r != -ENOENT)
-                                        log_warning("Failed to open runtime journal: %s", strerror(-r));
-
-                                r = 0;
-                        }
-
-                } else {
-
-                        /* OK, we really need the runtime journal, so create
-                         * it if necessary. */
-
-                        (void) mkdir_parents(fn, 0755);
-                        r = journal_file_open(fn, O_RDWR|O_CREAT, 0640, NULL, &s->runtime_journal);
-                        free(fn);
-
-                        if (r < 0) {
-                                log_error("Failed to open runtime journal: %s", strerror(-r));
-                                return r;
-                        }
-                }
-
-                if (s->runtime_journal) {
-                        journal_default_metrics(&s->runtime_metrics, s->runtime_journal->fd);
-
-                        s->runtime_journal->metrics = s->runtime_metrics;
-                        s->runtime_journal->compress = s->compress;
-
-                        server_fix_perms(s, s->runtime_journal, 0);
-                }
-        }
-
-        return r;
-}
-
-static int server_flush_to_var(Server *s) {
-        char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-        Object *o = NULL;
-        int r;
-        sd_id128_t machine;
-        sd_journal *j;
-        usec_t ts;
-
-        assert(s);
-
-        if (!s->runtime_journal)
-                return 0;
-
-        ts = now(CLOCK_MONOTONIC);
-        if (s->var_available_timestamp + RECHECK_VAR_AVAILABLE_USEC > ts)
-                return 0;
-
-        s->var_available_timestamp = ts;
-
-        system_journal_open(s);
-
-        if (!s->system_journal)
-                return 0;
-
-        log_info("Flushing to /var...");
-
-        r = sd_id128_get_machine(&machine);
-        if (r < 0) {
-                log_error("Failed to get machine id: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY);
-        if (r < 0) {
-                log_error("Failed to read runtime journal: %s", strerror(-r));
-                return r;
-        }
-
-        SD_JOURNAL_FOREACH(j) {
-                JournalFile *f;
-
-                f = j->current_file;
-                assert(f && f->current_offset > 0);
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-                if (r < 0) {
-                        log_error("Can't read entry: %s", strerror(-r));
-                        goto finish;
-                }
-
-                r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL);
-                if (r == -E2BIG) {
-                        log_info("Allocation limit reached.");
-
-                        journal_file_post_change(s->system_journal);
-                        server_rotate(s);
-                        server_vacuum(s);
-
-                        r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL);
-                }
-
-                if (r < 0) {
-                        log_error("Can't write entry: %s", strerror(-r));
-                        goto finish;
-                }
-        }
-
-finish:
-        journal_file_post_change(s->system_journal);
-
-        journal_file_close(s->runtime_journal);
-        s->runtime_journal = NULL;
-
-        if (r >= 0) {
-                sd_id128_to_string(machine, path + 17);
-                rm_rf(path, false, true, false);
-        }
-
-        return r;
-}
-
-static int server_read_proc_kmsg(Server *s) {
-        ssize_t l;
-        assert(s);
-        assert(s->proc_kmsg_fd >= 0);
-
-        l = read(s->proc_kmsg_fd, s->proc_kmsg_buffer + s->proc_kmsg_length, sizeof(s->proc_kmsg_buffer) - 1 - s->proc_kmsg_length);
-        if (l < 0) {
-
-                if (errno == EAGAIN || errno == EINTR)
-                        return 0;
-
-                log_error("Failed to read from kernel: %m");
-                return -errno;
-        }
-
-        s->proc_kmsg_length += l;
-
-        proc_kmsg_scan(s);
-        return 1;
-}
-
-static int server_flush_proc_kmsg(Server *s) {
-        int r;
-
-        assert(s);
-
-        if (s->proc_kmsg_fd < 0)
-                return 0;
-
-        log_info("Flushing /proc/kmsg...");
-
-        for (;;) {
-                r = server_read_proc_kmsg(s);
-                if (r < 0)
-                        return r;
-
-                if (r == 0)
-                        break;
-        }
-
-        return 0;
-}
-
-static int process_event(Server *s, struct epoll_event *ev) {
-        assert(s);
-
-        if (ev->data.fd == s->signal_fd) {
-                struct signalfd_siginfo sfsi;
-                ssize_t n;
-
-                if (ev->events != EPOLLIN) {
-                        log_info("Got invalid event from epoll.");
-                        return -EIO;
-                }
-
-                n = read(s->signal_fd, &sfsi, sizeof(sfsi));
-                if (n != sizeof(sfsi)) {
-
-                        if (n >= 0)
-                                return -EIO;
-
-                        if (errno == EINTR || errno == EAGAIN)
-                                return 1;
-
-                        return -errno;
-                }
-
-                if (sfsi.ssi_signo == SIGUSR1) {
-                        server_flush_to_var(s);
-                        return 0;
-                }
-
-                log_debug("Received SIG%s", signal_to_string(sfsi.ssi_signo));
-                return 0;
-
-        } else if (ev->data.fd == s->proc_kmsg_fd) {
-                int r;
-
-                if (ev->events != EPOLLIN) {
-                        log_info("Got invalid event from epoll.");
-                        return -EIO;
-                }
-
-                r = server_read_proc_kmsg(s);
-                if (r < 0)
-                        return r;
-
-                return 1;
-
-        } else if (ev->data.fd == s->native_fd ||
-                   ev->data.fd == s->syslog_fd) {
-
-                if (ev->events != EPOLLIN) {
-                        log_info("Got invalid event from epoll.");
-                        return -EIO;
-                }
-
-                for (;;) {
-                        struct msghdr msghdr;
-                        struct iovec iovec;
-                        struct ucred *ucred = NULL;
-                        struct timeval *tv = NULL;
-                        struct cmsghdr *cmsg;
-                        union {
-                                struct cmsghdr cmsghdr;
-                                uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
-                                            CMSG_SPACE(sizeof(struct timeval)) +
-                                            CMSG_SPACE(sizeof(int))];
-                        } control;
-                        ssize_t n;
-                        int v;
-                        int *fds = NULL;
-                        unsigned n_fds = 0;
-
-                        if (ioctl(ev->data.fd, SIOCINQ, &v) < 0) {
-                                log_error("SIOCINQ failed: %m");
-                                return -errno;
-                        }
-
-                        if (s->buffer_size < (size_t) v) {
-                                void *b;
-                                size_t l;
-
-                                l = MAX(LINE_MAX + (size_t) v, s->buffer_size * 2);
-                                b = realloc(s->buffer, l+1);
-
-                                if (!b) {
-                                        log_error("Couldn't increase buffer.");
-                                        return -ENOMEM;
-                                }
-
-                                s->buffer_size = l;
-                                s->buffer = b;
-                        }
-
-                        zero(iovec);
-                        iovec.iov_base = s->buffer;
-                        iovec.iov_len = s->buffer_size;
-
-                        zero(control);
-                        zero(msghdr);
-                        msghdr.msg_iov = &iovec;
-                        msghdr.msg_iovlen = 1;
-                        msghdr.msg_control = &control;
-                        msghdr.msg_controllen = sizeof(control);
-
-                        n = recvmsg(ev->data.fd, &msghdr, MSG_DONTWAIT|MSG_CMSG_CLOEXEC);
-                        if (n < 0) {
-
-                                if (errno == EINTR || errno == EAGAIN)
-                                        return 1;
-
-                                log_error("recvmsg() failed: %m");
-                                return -errno;
-                        }
-
-                        for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) {
-
-                                if (cmsg->cmsg_level == SOL_SOCKET &&
-                                    cmsg->cmsg_type == SCM_CREDENTIALS &&
-                                    cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred)))
-                                        ucred = (struct ucred*) CMSG_DATA(cmsg);
-                                else if (cmsg->cmsg_level == SOL_SOCKET &&
-                                         cmsg->cmsg_type == SO_TIMESTAMP &&
-                                         cmsg->cmsg_len == CMSG_LEN(sizeof(struct timeval)))
-                                        tv = (struct timeval*) CMSG_DATA(cmsg);
-                                else if (cmsg->cmsg_level == SOL_SOCKET &&
-                                         cmsg->cmsg_type == SCM_RIGHTS) {
-                                        fds = (int*) CMSG_DATA(cmsg);
-                                        n_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
-                                }
-                        }
-
-                        if (ev->data.fd == s->syslog_fd) {
-                                char *e;
-
-                                if (n > 0 && n_fds == 0) {
-                                        e = memchr(s->buffer, '\n', n);
-                                        if (e)
-                                                *e = 0;
-                                        else
-                                                s->buffer[n] = 0;
-
-                                        process_syslog_message(s, strstrip(s->buffer), ucred, tv);
-                                } else if (n_fds > 0)
-                                        log_warning("Got file descriptors via syslog socket. Ignoring.");
-
-                        } else {
-                                if (n > 0 && n_fds == 0)
-                                        process_native_message(s, s->buffer, n, ucred, tv);
-                                else if (n == 0 && n_fds == 1)
-                                        process_native_file(s, fds[0], ucred, tv);
-                                else if (n_fds > 0)
-                                        log_warning("Got too many file descriptors via native socket. Ignoring.");
-                        }
-
-                        close_many(fds, n_fds);
-                }
-
-                return 1;
-
-        } else if (ev->data.fd == s->stdout_fd) {
-
-                if (ev->events != EPOLLIN) {
-                        log_info("Got invalid event from epoll.");
-                        return -EIO;
-                }
-
-                stdout_stream_new(s);
-                return 1;
-
-        } else {
-                StdoutStream *stream;
-
-                if ((ev->events|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
-                        log_info("Got invalid event from epoll.");
-                        return -EIO;
-                }
-
-                /* If it is none of the well-known fds, it must be an
-                 * stdout stream fd. Note that this is a bit ugly here
-                 * (since we rely that none of the well-known fds
-                 * could be interpreted as pointer), but nonetheless
-                 * safe, since the well-known fds would never get an
-                 * fd > 4096, i.e. beyond the first memory page */
-
-                stream = ev->data.ptr;
-
-                if (stdout_stream_process(stream) <= 0)
-                        stdout_stream_free(stream);
-
-                return 1;
-        }
-
-        log_error("Unknown event.");
-        return 0;
-}
-
-static int open_syslog_socket(Server *s) {
-        union sockaddr_union sa;
-        int one, r;
-        struct epoll_event ev;
-
-        assert(s);
-
-        if (s->syslog_fd < 0) {
-
-                s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-                if (s->syslog_fd < 0) {
-                        log_error("socket() failed: %m");
-                        return -errno;
-                }
-
-                zero(sa);
-                sa.un.sun_family = AF_UNIX;
-                strncpy(sa.un.sun_path, "/dev/log", sizeof(sa.un.sun_path));
-
-                unlink(sa.un.sun_path);
-
-                r = bind(s->syslog_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
-                if (r < 0) {
-                        log_error("bind() failed: %m");
-                        return -errno;
-                }
-
-                chmod(sa.un.sun_path, 0666);
-        } else
-                fd_nonblock(s->syslog_fd, 1);
-
-        one = 1;
-        r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
-        if (r < 0) {
-                log_error("SO_PASSCRED failed: %m");
-                return -errno;
-        }
-
-        one = 1;
-        r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
-        if (r < 0) {
-                log_error("SO_TIMESTAMP failed: %m");
-                return -errno;
-        }
-
-        zero(ev);
-        ev.events = EPOLLIN;
-        ev.data.fd = s->syslog_fd;
-        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->syslog_fd, &ev) < 0) {
-                log_error("Failed to add syslog server fd to epoll object: %m");
-                return -errno;
-        }
-
-        return 0;
-}
-
-static int open_native_socket(Server*s) {
-        union sockaddr_union sa;
-        int one, r;
-        struct epoll_event ev;
-
-        assert(s);
-
-        if (s->native_fd < 0) {
-
-                s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-                if (s->native_fd < 0) {
-                        log_error("socket() failed: %m");
-                        return -errno;
-                }
-
-                zero(sa);
-                sa.un.sun_family = AF_UNIX;
-                strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
-
-                unlink(sa.un.sun_path);
-
-                r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
-                if (r < 0) {
-                        log_error("bind() failed: %m");
-                        return -errno;
-                }
-
-                chmod(sa.un.sun_path, 0666);
-        } else
-                fd_nonblock(s->native_fd, 1);
-
-        one = 1;
-        r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
-        if (r < 0) {
-                log_error("SO_PASSCRED failed: %m");
-                return -errno;
-        }
-
-        one = 1;
-        r = setsockopt(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
-        if (r < 0) {
-                log_error("SO_TIMESTAMP failed: %m");
-                return -errno;
-        }
-
-        zero(ev);
-        ev.events = EPOLLIN;
-        ev.data.fd = s->native_fd;
-        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->native_fd, &ev) < 0) {
-                log_error("Failed to add native server fd to epoll object: %m");
-                return -errno;
-        }
-
-        return 0;
-}
-
-static int open_stdout_socket(Server *s) {
-        union sockaddr_union sa;
-        int r;
-        struct epoll_event ev;
-
-        assert(s);
-
-        if (s->stdout_fd < 0) {
-
-                s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-                if (s->stdout_fd < 0) {
-                        log_error("socket() failed: %m");
-                        return -errno;
-                }
-
-                zero(sa);
-                sa.un.sun_family = AF_UNIX;
-                strncpy(sa.un.sun_path, "/run/systemd/journal/stdout", sizeof(sa.un.sun_path));
-
-                unlink(sa.un.sun_path);
-
-                r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
-                if (r < 0) {
-                        log_error("bind() failed: %m");
-                        return -errno;
-                }
-
-                chmod(sa.un.sun_path, 0666);
-
-                if (listen(s->stdout_fd, SOMAXCONN) < 0) {
-                        log_error("liste() failed: %m");
-                        return -errno;
-                }
-        } else
-                fd_nonblock(s->stdout_fd, 1);
-
-        zero(ev);
-        ev.events = EPOLLIN;
-        ev.data.fd = s->stdout_fd;
-        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->stdout_fd, &ev) < 0) {
-                log_error("Failed to add stdout server fd to epoll object: %m");
-                return -errno;
-        }
-
-        return 0;
-}
-
-static int open_proc_kmsg(Server *s) {
-        struct epoll_event ev;
-
-        assert(s);
-
-        if (!s->import_proc_kmsg)
-                return 0;
-
-
-        s->proc_kmsg_fd = open("/proc/kmsg", O_CLOEXEC|O_NONBLOCK|O_NOCTTY);
-        if (s->proc_kmsg_fd < 0) {
-                log_warning("Failed to open /proc/kmsg, ignoring: %m");
-                return 0;
-        }
-
-        zero(ev);
-        ev.events = EPOLLIN;
-        ev.data.fd = s->proc_kmsg_fd;
-        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->proc_kmsg_fd, &ev) < 0) {
-                log_error("Failed to add /proc/kmsg fd to epoll object: %m");
-                return -errno;
-        }
-
-        return 0;
-}
-
-static int open_signalfd(Server *s) {
-        sigset_t mask;
-        struct epoll_event ev;
-
-        assert(s);
-
-        assert_se(sigemptyset(&mask) == 0);
-        sigset_add_many(&mask, SIGINT, SIGTERM, SIGUSR1, -1);
-        assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
-
-        s->signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);
-        if (s->signal_fd < 0) {
-                log_error("signalfd(): %m");
-                return -errno;
-        }
-
-        zero(ev);
-        ev.events = EPOLLIN;
-        ev.data.fd = s->signal_fd;
-
-        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->signal_fd, &ev) < 0) {
-                log_error("epoll_ctl(): %m");
-                return -errno;
-        }
-
-        return 0;
-}
-
-static int server_parse_proc_cmdline(Server *s) {
-        char *line, *w, *state;
-        int r;
-        size_t l;
-
-        if (detect_container(NULL) > 0)
-                return 0;
-
-        r = read_one_line_file("/proc/cmdline", &line);
-        if (r < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
-                return 0;
-        }
-
-        FOREACH_WORD_QUOTED(w, l, line, state) {
-                char *word;
-
-                word = strndup(w, l);
-                if (!word) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (startswith(word, "systemd_journald.forward_to_syslog=")) {
-                        r = parse_boolean(word + 35);
-                        if (r < 0)
-                                log_warning("Failed to parse forward to syslog switch %s. Ignoring.", word + 35);
-                        else
-                                s->forward_to_syslog = r;
-                } else if (startswith(word, "systemd_journald.forward_to_kmsg=")) {
-                        r = parse_boolean(word + 33);
-                        if (r < 0)
-                                log_warning("Failed to parse forward to kmsg switch %s. Ignoring.", word + 33);
-                        else
-                                s->forward_to_kmsg = r;
-                } else if (startswith(word, "systemd_journald.forward_to_console=")) {
-                        r = parse_boolean(word + 36);
-                        if (r < 0)
-                                log_warning("Failed to parse forward to console switch %s. Ignoring.", word + 36);
-                        else
-                                s->forward_to_console = r;
-                }
-
-                free(word);
-        }
-
-        r = 0;
-
-finish:
-        free(line);
-        return r;
-}
-
-static int server_parse_config_file(Server *s) {
-        FILE *f;
-        const char *fn;
-        int r;
-
-        assert(s);
-
-        fn = "/etc/systemd/systemd-journald.conf";
-        f = fopen(fn, "re");
-        if (!f) {
-                if (errno == ENOENT)
-                        return 0;
-
-                log_warning("Failed to open configuration file %s: %m", fn);
-                return -errno;
-        }
-
-        r = config_parse(fn, f, "Journal\0", config_item_perf_lookup, (void*) journald_gperf_lookup, false, s);
-        if (r < 0)
-                log_warning("Failed to parse configuration file: %s", strerror(-r));
-
-        fclose(f);
-
-        return r;
-}
-
-static int server_init(Server *s) {
-        int n, r, fd;
-
-        assert(s);
-
-        zero(*s);
-        s->syslog_fd = s->native_fd = s->stdout_fd = s->signal_fd = s->epoll_fd = s->proc_kmsg_fd = -1;
-        s->compress = true;
-
-        s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL;
-        s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
-
-        s->forward_to_syslog = true;
-        s->import_proc_kmsg = true;
-
-        memset(&s->system_metrics, 0xFF, sizeof(s->system_metrics));
-        memset(&s->runtime_metrics, 0xFF, sizeof(s->runtime_metrics));
-
-        server_parse_config_file(s);
-        server_parse_proc_cmdline(s);
-
-        s->user_journals = hashmap_new(trivial_hash_func, trivial_compare_func);
-        if (!s->user_journals) {
-                log_error("Out of memory.");
-                return -ENOMEM;
-        }
-
-        s->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
-        if (s->epoll_fd < 0) {
-                log_error("Failed to create epoll object: %m");
-                return -errno;
-        }
-
-        n = sd_listen_fds(true);
-        if (n < 0) {
-                log_error("Failed to read listening file descriptors from environment: %s", strerror(-n));
-                return n;
-        }
-
-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
-
-                if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/journal/socket", 0) > 0) {
-
-                        if (s->native_fd >= 0) {
-                                log_error("Too many native sockets passed.");
-                                return -EINVAL;
-                        }
-
-                        s->native_fd = fd;
-
-                } else if (sd_is_socket_unix(fd, SOCK_STREAM, 1, "/run/systemd/journal/stdout", 0) > 0) {
-
-                        if (s->stdout_fd >= 0) {
-                                log_error("Too many stdout sockets passed.");
-                                return -EINVAL;
-                        }
-
-                        s->stdout_fd = fd;
-
-                } else if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/dev/log", 0) > 0) {
-
-                        if (s->syslog_fd >= 0) {
-                                log_error("Too many /dev/log sockets passed.");
-                                return -EINVAL;
-                        }
-
-                        s->syslog_fd = fd;
-
-                } else {
-                        log_error("Unknown socket passed.");
-                        return -EINVAL;
-                }
-        }
-
-        r = open_syslog_socket(s);
-        if (r < 0)
-                return r;
-
-        r = open_native_socket(s);
-        if (r < 0)
-                return r;
-
-        r = open_stdout_socket(s);
-        if (r < 0)
-                return r;
-
-        r = open_proc_kmsg(s);
-        if (r < 0)
-                return r;
-
-        r = system_journal_open(s);
-        if (r < 0)
-                return r;
-
-        r = open_signalfd(s);
-        if (r < 0)
-                return r;
-
-        s->rate_limit = journal_rate_limit_new(s->rate_limit_interval, s->rate_limit_burst);
-        if (!s->rate_limit)
-                return -ENOMEM;
-
-        return 0;
-}
-
-static void server_done(Server *s) {
-        JournalFile *f;
-        assert(s);
-
-        while (s->stdout_streams)
-                stdout_stream_free(s->stdout_streams);
-
-        if (s->system_journal)
-                journal_file_close(s->system_journal);
-
-        if (s->runtime_journal)
-                journal_file_close(s->runtime_journal);
-
-        while ((f = hashmap_steal_first(s->user_journals)))
-                journal_file_close(f);
-
-        hashmap_free(s->user_journals);
-
-        if (s->epoll_fd >= 0)
-                close_nointr_nofail(s->epoll_fd);
-
-        if (s->signal_fd >= 0)
-                close_nointr_nofail(s->signal_fd);
-
-        if (s->syslog_fd >= 0)
-                close_nointr_nofail(s->syslog_fd);
-
-        if (s->native_fd >= 0)
-                close_nointr_nofail(s->native_fd);
-
-        if (s->stdout_fd >= 0)
-                close_nointr_nofail(s->stdout_fd);
-
-        if (s->proc_kmsg_fd >= 0)
-                close_nointr_nofail(s->proc_kmsg_fd);
-
-        if (s->rate_limit)
-                journal_rate_limit_free(s->rate_limit);
-
-        free(s->buffer);
-}
-
-int main(int argc, char *argv[]) {
-        Server server;
-        int r;
-
-        /* if (getppid() != 1) { */
-        /*         log_error("This program should be invoked by init only."); */
-        /*         return EXIT_FAILURE; */
-        /* } */
-
-        if (argc > 1) {
-                log_error("This program does not take arguments.");
-                return EXIT_FAILURE;
-        }
-
-        log_set_target(LOG_TARGET_CONSOLE);
-        log_parse_environment();
-        log_open();
-
-        umask(0022);
-
-        r = server_init(&server);
-        if (r < 0)
-                goto finish;
-
-        server_vacuum(&server);
-        server_flush_to_var(&server);
-        server_flush_proc_kmsg(&server);
-
-        log_debug("systemd-journald running as pid %lu", (unsigned long) getpid());
-        driver_message(&server, SD_MESSAGE_JOURNAL_START, "Journal started");
-
-        sd_notify(false,
-                  "READY=1\n"
-                  "STATUS=Processing requests...");
-
-        for (;;) {
-                struct epoll_event event;
-
-                r = epoll_wait(server.epoll_fd, &event, 1, -1);
-                if (r < 0) {
-
-                        if (errno == EINTR)
-                                continue;
-
-                        log_error("epoll_wait() failed: %m");
-                        r = -errno;
-                        goto finish;
-                } else if (r == 0)
-                        break;
-
-                r = process_event(&server, &event);
-                if (r < 0)
-                        goto finish;
-                else if (r == 0)
-                        break;
-        }
-
-        log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());
-        driver_message(&server, SD_MESSAGE_JOURNAL_STOP, "Journal stopped");
-
-finish:
-        sd_notify(false,
-                  "STATUS=Shutting down...");
-
-        server_done(&server);
-
-        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-}
diff --git a/src/journal/journald.h b/src/journal/journald.h
deleted file mode 100644 (file)
index 6160991..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foojournaldhfoo
-#define foojournaldhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <stdbool.h>
-
-#include "journal-file.h"
-#include "hashmap.h"
-#include "util.h"
-#include "journal-rate-limit.h"
-#include "list.h"
-
-typedef struct StdoutStream StdoutStream;
-
-typedef struct Server {
-        int epoll_fd;
-        int signal_fd;
-        int syslog_fd;
-        int native_fd;
-        int stdout_fd;
-        int proc_kmsg_fd;
-
-        JournalFile *runtime_journal;
-        JournalFile *system_journal;
-        Hashmap *user_journals;
-
-        uint64_t seqnum;
-
-        char *buffer;
-        size_t buffer_size;
-
-        JournalRateLimit *rate_limit;
-        usec_t rate_limit_interval;
-        unsigned rate_limit_burst;
-
-        JournalMetrics runtime_metrics;
-        JournalMetrics system_metrics;
-
-        bool compress;
-
-        bool forward_to_kmsg;
-        bool forward_to_syslog;
-        bool forward_to_console;
-
-        bool import_proc_kmsg;
-        char proc_kmsg_buffer[LINE_MAX+1];
-        size_t proc_kmsg_length;
-
-        uint64_t cached_available_space;
-        usec_t cached_available_space_timestamp;
-
-        uint64_t var_available_timestamp;
-
-        gid_t file_gid;
-        bool file_gid_valid;
-
-        LIST_HEAD(StdoutStream, stdout_streams);
-        unsigned n_stdout_streams;
-} Server;
-
-/* gperf lookup function */
-const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
-
-#endif
diff --git a/src/journal/libsystemd-journal.pc.in b/src/journal/libsystemd-journal.pc.in
deleted file mode 100644 (file)
index 13cc820..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: systemd
-Description: systemd Journal Utility Library
-URL: @PACKAGE_URL@
-Version: @PACKAGE_VERSION@
-Requires: libsystemd-id128 = @PACKAGE_VERSION@
-Libs: -L${libdir} -lsystemd-journal
-Cflags: -I${includedir}
diff --git a/src/journal/libsystemd-journal.sym b/src/journal/libsystemd-journal.sym
deleted file mode 100644 (file)
index 7653880..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-/***
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-***/
-
-/* Original symbols from systemd v38 */
-
-LIBSYSTEMD_JOURNAL_38 {
-global:
-        sd_journal_print;
-        sd_journal_printv;
-        sd_journal_send;
-        sd_journal_sendv;
-        sd_journal_stream_fd;
-        sd_journal_open;
-        sd_journal_close;
-        sd_journal_previous;
-        sd_journal_next;
-        sd_journal_previous_skip;
-        sd_journal_next_skip;
-        sd_journal_get_realtime_usec;
-        sd_journal_get_monotonic_usec;
-        sd_journal_get_data;
-        sd_journal_enumerate_data;
-        sd_journal_restart_data;
-        sd_journal_add_match;
-        sd_journal_flush_matches;
-        sd_journal_seek_head;
-        sd_journal_seek_tail;
-        sd_journal_seek_monotonic_usec;
-        sd_journal_seek_realtime_usec;
-        sd_journal_seek_cursor;
-        sd_journal_get_cursor;
-        sd_journal_query_unique;
-        sd_journal_enumerate_unique;
-        sd_journal_restart_unique;
-        sd_journal_get_fd;
-        sd_journal_process;
-local:
-        *;
-};
diff --git a/src/journal/lookup3.c b/src/journal/lookup3.c
deleted file mode 100644 (file)
index b90093a..0000000
+++ /dev/null
@@ -1,1003 +0,0 @@
-/* Slightly modified by Lennart Poettering, to avoid name clashes, and
- * unexport a few functions. */
-
-#include "lookup3.h"
-
-/*
--------------------------------------------------------------------------------
-lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
-These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final()
-are externally useful functions.  Routines to test the hash are included
-if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-the public domain.  It has no warranty.
-
-You probably want to use hashlittle().  hashlittle() and hashbig()
-hash byte arrays.  hashlittle() is is faster than hashbig() on
-little-endian machines.  Intel and AMD are little-endian machines.
-On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.
-You could implement hashbig2() if you wanted but I haven't bothered here.
-
-If you want to find a hash of, say, exactly 7 integers, do
-  a = i1;  b = i2;  c = i3;
-  mix(a,b,c);
-  a += i4; b += i5; c += i6;
-  mix(a,b,c);
-  a += i7;
-  final(a,b,c);
-then use c as the hash value.  If you have a variable length array of
-4-byte integers to hash, use hashword().  If you have a byte array (like
-a character string), use hashlittle().  If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().
-
-Why is this so big?  I read 12 bytes at a time into 3 4-byte integers,
-then mix those integers.  This is fast (you can do a lot more thorough
-mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-on 1 byte), but shoehorning those bytes into integers efficiently is messy.
--------------------------------------------------------------------------------
-*/
-/* #define SELF_TEST 1 */
-
-#include <stdio.h>      /* defines printf for tests */
-#include <time.h>       /* defines time_t for timings in the test */
-#include <stdint.h>     /* defines uint32_t etc */
-#include <sys/param.h>  /* attempt to define endianness */
-#ifdef linux
-# include <endian.h>    /* attempt to define endianness */
-#endif
-
-/*
- * My best guess at if you are big-endian or little-endian.  This may
- * need adjustment.
- */
-#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
-     __BYTE_ORDER == __LITTLE_ENDIAN) || \
-    (defined(i386) || defined(__i386__) || defined(__i486__) || \
-     defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
-#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
-       __BYTE_ORDER == __BIG_ENDIAN) || \
-      (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
-#else
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 0
-#endif
-
-#define hashsize(n) ((uint32_t)1<<(n))
-#define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
--------------------------------------------------------------------------------
-mix -- mix 3 32-bit values reversibly.
-
-This is reversible, so any information in (a,b,c) before mix() is
-still in (a,b,c) after mix().
-
-If four pairs of (a,b,c) inputs are run through mix(), or through
-mix() in reverse, there are at least 32 bits of the output that
-are sometimes the same for one pair and different for another pair.
-This was tested for:
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or
-  all zero plus a counter that starts at zero.
-
-Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-satisfy this are
-    4  6  8 16 19  4
-    9 15  3 18 27 15
-   14  9  3  7 17  3
-Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose
-the operations, constants, and arrangements of the variables.
-
-This does not achieve avalanche.  There are input bits of (a,b,c)
-that fail to affect some output bits of (a,b,c), especially of a.  The
-most thoroughly mixed value is c, but it doesn't really even achieve
-avalanche in c.
-
-This allows some parallelism.  Read-after-writes are good at doubling
-the number of bits affected, so the goal of mixing pulls in the opposite
-direction as the goal of parallelism.  I did what I could.  Rotates
-seem to cost as much as shifts on every machine I could lay my hands
-on, and rotates are much kinder to the top and bottom bits, so I used
-rotates.
--------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
-  a -= c;  a ^= rot(c, 4);  c += b; \
-  b -= a;  b ^= rot(a, 6);  a += c; \
-  c -= b;  c ^= rot(b, 8);  b += a; \
-  a -= c;  a ^= rot(c,16);  c += b; \
-  b -= a;  b ^= rot(a,19);  a += c; \
-  c -= b;  c ^= rot(b, 4);  b += a; \
-}
-
-/*
--------------------------------------------------------------------------------
-final -- final mixing of 3 32-bit values (a,b,c) into c
-
-Pairs of (a,b,c) values differing in only a few bits will usually
-produce values of c that look totally different.  This was tested for
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or
-  all zero plus a counter that starts at zero.
-
-These constants passed:
- 14 11 25 16 4 14 24
- 12 14 25 16 4 14 24
-and these came close:
-  4  8 15 26 3 22 24
- 10  8 15 26 3 22 24
- 11  8 15 26 3 22 24
--------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
-  c ^= b; c -= rot(b,14); \
-  a ^= c; a -= rot(c,11); \
-  b ^= a; b -= rot(a,25); \
-  c ^= b; c -= rot(b,16); \
-  a ^= c; a -= rot(c,4);  \
-  b ^= a; b -= rot(a,14); \
-  c ^= b; c -= rot(b,24); \
-}
-
-/*
---------------------------------------------------------------------
- This works on all machines.  To be useful, it requires
- -- that the key be an array of uint32_t's, and
- -- that the length be the number of uint32_t's in the key
-
- The function hashword() is identical to hashlittle() on little-endian
- machines, and identical to hashbig() on big-endian machines,
- except that the length has to be measured in uint32_ts rather than in
- bytes.  hashlittle() is more complicated than hashword() only because
- hashlittle() has to dance around fitting the key bytes into registers.
---------------------------------------------------------------------
-*/
-uint32_t jenkins_hashword(
-const uint32_t *k,                   /* the key, an array of uint32_t values */
-size_t          length,               /* the length of the key, in uint32_ts */
-uint32_t        initval)         /* the previous hash, or an arbitrary value */
-{
-  uint32_t a,b,c;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + (((uint32_t)length)<<2) + initval;
-
-  /*------------------------------------------------- handle most of the key */
-  while (length > 3)
-  {
-    a += k[0];
-    b += k[1];
-    c += k[2];
-    mix(a,b,c);
-    length -= 3;
-    k += 3;
-  }
-
-  /*------------------------------------------- handle the last 3 uint32_t's */
-  switch(length)                     /* all the case statements fall through */
-  {
-  case 3 : c+=k[2];
-  case 2 : b+=k[1];
-  case 1 : a+=k[0];
-    final(a,b,c);
-  case 0:     /* case 0: nothing left to add */
-    break;
-  }
-  /*------------------------------------------------------ report the result */
-  return c;
-}
-
-
-/*
---------------------------------------------------------------------
-hashword2() -- same as hashword(), but take two seeds and return two
-32-bit values.  pc and pb must both be nonnull, and *pc and *pb must
-both be initialized with seeds.  If you pass in (*pb)==0, the output
-(*pc) will be the same as the return value from hashword().
---------------------------------------------------------------------
-*/
-void jenkins_hashword2 (
-const uint32_t *k,                   /* the key, an array of uint32_t values */
-size_t          length,               /* the length of the key, in uint32_ts */
-uint32_t       *pc,                      /* IN: seed OUT: primary hash value */
-uint32_t       *pb)               /* IN: more seed OUT: secondary hash value */
-{
-  uint32_t a,b,c;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)(length<<2)) + *pc;
-  c += *pb;
-
-  /*------------------------------------------------- handle most of the key */
-  while (length > 3)
-  {
-    a += k[0];
-    b += k[1];
-    c += k[2];
-    mix(a,b,c);
-    length -= 3;
-    k += 3;
-  }
-
-  /*------------------------------------------- handle the last 3 uint32_t's */
-  switch(length)                     /* all the case statements fall through */
-  {
-  case 3 : c+=k[2];
-  case 2 : b+=k[1];
-  case 1 : a+=k[0];
-    final(a,b,c);
-  case 0:     /* case 0: nothing left to add */
-    break;
-  }
-  /*------------------------------------------------------ report the result */
-  *pc=c; *pb=b;
-}
-
-
-/*
--------------------------------------------------------------------------------
-hashlittle() -- hash a variable-length key into a 32-bit value
-  k       : the key (the unaligned variable-length array of bytes)
-  length  : the length of the key, counting by bytes
-  initval : can be any 4-byte value
-Returns a 32-bit value.  Every bit of the key affects every bit of
-the return value.  Two keys differing by one or two bits will have
-totally different hash values.
-
-The best hash table sizes are powers of 2.  There is no need to do
-mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-use a bitmask.  For example, if you need only 10 bits, do
-  h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (uint8_t **)k, do it like this:
-  for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
-
-By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
-code any way you wish, private, educational, or commercial.  It's free.
-
-Use for hash table lookup, or anything where one collision in 2^^32 is
-acceptable.  Do NOT use for cryptographic purposes.
--------------------------------------------------------------------------------
-*/
-
-uint32_t jenkins_hashlittle( const void *key, size_t length, uint32_t initval)
-{
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
-
-#else /* make valgrind happy */
-
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : return c;
-    }
-
-#endif /* !valgrind */
-
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : return c;                     /* zero length requires no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24;
-    case 11: c+=((uint32_t)k[10])<<16;
-    case 10: c+=((uint32_t)k[9])<<8;
-    case 9 : c+=k[8];
-    case 8 : b+=((uint32_t)k[7])<<24;
-    case 7 : b+=((uint32_t)k[6])<<16;
-    case 6 : b+=((uint32_t)k[5])<<8;
-    case 5 : b+=k[4];
-    case 4 : a+=((uint32_t)k[3])<<24;
-    case 3 : a+=((uint32_t)k[2])<<16;
-    case 2 : a+=((uint32_t)k[1])<<8;
-    case 1 : a+=k[0];
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
-}
-
-
-/*
- * hashlittle2: return 2 32-bit hash values
- *
- * This is identical to hashlittle(), except it returns two 32-bit hash
- * values instead of just one.  This is good enough for hash table
- * lookup with 2^^64 buckets, or if you want a second hash if you're not
- * happy with the first, or if you want a probably-unique 64-bit ID for
- * the key.  *pc is better mixed than *pb, so use *pc first.  If you want
- * a 64-bit value do something like "*pc + (((uint64_t)*pb)<<32)".
- */
-void jenkins_hashlittle2(
-  const void *key,       /* the key to hash */
-  size_t      length,    /* length of the key */
-  uint32_t   *pc,        /* IN: primary initval, OUT: primary hash */
-  uint32_t   *pb)        /* IN: secondary initval, OUT: secondary hash */
-{
-  uint32_t a,b,c;                                          /* internal state */
-  union { const void *ptr; size_t i; } u;     /* needed for Mac Powerbook G4 */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + *pc;
-  c += *pb;
-
-  u.ptr = key;
-  if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]&0xffffff" actually reads beyond the end of the string, but
-     * then masks off the part it's not allowed to read.  Because the
-     * string is aligned, the masked-off tail is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff; break;
-    case 2 : a+=k[0]&0xffff; break;
-    case 1 : a+=k[0]&0xff; break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-#else /* make valgrind happy */
-
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<16;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<8;    /* fall through */
-    case 9 : c+=k8[8];                   /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<16;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<8;    /* fall through */
-    case 5 : b+=k8[4];                   /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<16;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<8;    /* fall through */
-    case 1 : a+=k8[0]; break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-#endif /* !valgrind */
-
-  } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
-    const uint16_t *k = (const uint16_t *)key;         /* read 16-bit chunks */
-    const uint8_t  *k8;
-
-    /*--------------- all but last block: aligned reads and different mixing */
-    while (length > 12)
-    {
-      a += k[0] + (((uint32_t)k[1])<<16);
-      b += k[2] + (((uint32_t)k[3])<<16);
-      c += k[4] + (((uint32_t)k[5])<<16);
-      mix(a,b,c);
-      length -= 12;
-      k += 6;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    k8 = (const uint8_t *)k;
-    switch(length)
-    {
-    case 12: c+=k[4]+(((uint32_t)k[5])<<16);
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 11: c+=((uint32_t)k8[10])<<16;     /* fall through */
-    case 10: c+=k[4];
-             b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 9 : c+=k8[8];                      /* fall through */
-    case 8 : b+=k[2]+(((uint32_t)k[3])<<16);
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 7 : b+=((uint32_t)k8[6])<<16;      /* fall through */
-    case 6 : b+=k[2];
-             a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 5 : b+=k8[4];                      /* fall through */
-    case 4 : a+=k[0]+(((uint32_t)k[1])<<16);
-             break;
-    case 3 : a+=((uint32_t)k8[2])<<16;      /* fall through */
-    case 2 : a+=k[0];
-             break;
-    case 1 : a+=k8[0];
-             break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      a += ((uint32_t)k[1])<<8;
-      a += ((uint32_t)k[2])<<16;
-      a += ((uint32_t)k[3])<<24;
-      b += k[4];
-      b += ((uint32_t)k[5])<<8;
-      b += ((uint32_t)k[6])<<16;
-      b += ((uint32_t)k[7])<<24;
-      c += k[8];
-      c += ((uint32_t)k[9])<<8;
-      c += ((uint32_t)k[10])<<16;
-      c += ((uint32_t)k[11])<<24;
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=((uint32_t)k[11])<<24;
-    case 11: c+=((uint32_t)k[10])<<16;
-    case 10: c+=((uint32_t)k[9])<<8;
-    case 9 : c+=k[8];
-    case 8 : b+=((uint32_t)k[7])<<24;
-    case 7 : b+=((uint32_t)k[6])<<16;
-    case 6 : b+=((uint32_t)k[5])<<8;
-    case 5 : b+=k[4];
-    case 4 : a+=((uint32_t)k[3])<<24;
-    case 3 : a+=((uint32_t)k[2])<<16;
-    case 2 : a+=((uint32_t)k[1])<<8;
-    case 1 : a+=k[0];
-             break;
-    case 0 : *pc=c; *pb=b; return;  /* zero length strings require no mixing */
-    }
-  }
-
-  final(a,b,c);
-  *pc=c; *pb=b;
-}
-
-
-
-/*
- * hashbig():
- * This is the same as hashword() on big-endian machines.  It is different
- * from hashlittle() on all machines.  hashbig() takes advantage of
- * big-endian byte ordering.
- */
-uint32_t jenkins_hashbig( const void *key, size_t length, uint32_t initval)
-{
-  uint32_t a,b,c;
-  union { const void *ptr; size_t i; } u; /* to cast key to (size_t) happily */
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
-
-  u.ptr = key;
-  if (HASH_BIG_ENDIAN && ((u.i & 0x3) == 0)) {
-    const uint32_t *k = (const uint32_t *)key;         /* read 32-bit chunks */
-
-    /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += k[0];
-      b += k[1];
-      c += k[2];
-      mix(a,b,c);
-      length -= 12;
-      k += 3;
-    }
-
-    /*----------------------------- handle the last (probably partial) block */
-    /*
-     * "k[2]<<8" actually reads beyond the end of the string, but
-     * then shifts out the part it's not allowed to read.  Because the
-     * string is aligned, the illegal read is in the same word as the
-     * rest of the string.  Every machine with memory protection I've seen
-     * does it on word boundaries, so is OK with this.  But VALGRIND will
-     * still catch it and complain.  The masking trick does make the hash
-     * noticably faster for short strings (like English words).
-     */
-#ifndef VALGRIND
-
-    switch(length)
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=k[2]&0xffffff00; b+=k[1]; a+=k[0]; break;
-    case 10: c+=k[2]&0xffff0000; b+=k[1]; a+=k[0]; break;
-    case 9 : c+=k[2]&0xff000000; b+=k[1]; a+=k[0]; break;
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=k[1]&0xffffff00; a+=k[0]; break;
-    case 6 : b+=k[1]&0xffff0000; a+=k[0]; break;
-    case 5 : b+=k[1]&0xff000000; a+=k[0]; break;
-    case 4 : a+=k[0]; break;
-    case 3 : a+=k[0]&0xffffff00; break;
-    case 2 : a+=k[0]&0xffff0000; break;
-    case 1 : a+=k[0]&0xff000000; break;
-    case 0 : return c;              /* zero length strings require no mixing */
-    }
-
-#else  /* make valgrind happy */
-
-    k8 = (const uint8_t *)k;
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=k[2]; b+=k[1]; a+=k[0]; break;
-    case 11: c+=((uint32_t)k8[10])<<8;  /* fall through */
-    case 10: c+=((uint32_t)k8[9])<<16;  /* fall through */
-    case 9 : c+=((uint32_t)k8[8])<<24;  /* fall through */
-    case 8 : b+=k[1]; a+=k[0]; break;
-    case 7 : b+=((uint32_t)k8[6])<<8;   /* fall through */
-    case 6 : b+=((uint32_t)k8[5])<<16;  /* fall through */
-    case 5 : b+=((uint32_t)k8[4])<<24;  /* fall through */
-    case 4 : a+=k[0]; break;
-    case 3 : a+=((uint32_t)k8[2])<<8;   /* fall through */
-    case 2 : a+=((uint32_t)k8[1])<<16;  /* fall through */
-    case 1 : a+=((uint32_t)k8[0])<<24; break;
-    case 0 : return c;
-    }
-
-#endif /* !VALGRIND */
-
-  } else {                        /* need to read the key one byte at a time */
-    const uint8_t *k = (const uint8_t *)key;
-
-    /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-    while (length > 12)
-    {
-      a += ((uint32_t)k[0])<<24;
-      a += ((uint32_t)k[1])<<16;
-      a += ((uint32_t)k[2])<<8;
-      a += ((uint32_t)k[3]);
-      b += ((uint32_t)k[4])<<24;
-      b += ((uint32_t)k[5])<<16;
-      b += ((uint32_t)k[6])<<8;
-      b += ((uint32_t)k[7]);
-      c += ((uint32_t)k[8])<<24;
-      c += ((uint32_t)k[9])<<16;
-      c += ((uint32_t)k[10])<<8;
-      c += ((uint32_t)k[11]);
-      mix(a,b,c);
-      length -= 12;
-      k += 12;
-    }
-
-    /*-------------------------------- last block: affect all 32 bits of (c) */
-    switch(length)                   /* all the case statements fall through */
-    {
-    case 12: c+=k[11];
-    case 11: c+=((uint32_t)k[10])<<8;
-    case 10: c+=((uint32_t)k[9])<<16;
-    case 9 : c+=((uint32_t)k[8])<<24;
-    case 8 : b+=k[7];
-    case 7 : b+=((uint32_t)k[6])<<8;
-    case 6 : b+=((uint32_t)k[5])<<16;
-    case 5 : b+=((uint32_t)k[4])<<24;
-    case 4 : a+=k[3];
-    case 3 : a+=((uint32_t)k[2])<<8;
-    case 2 : a+=((uint32_t)k[1])<<16;
-    case 1 : a+=((uint32_t)k[0])<<24;
-             break;
-    case 0 : return c;
-    }
-  }
-
-  final(a,b,c);
-  return c;
-}
-
-
-#ifdef SELF_TEST
-
-/* used for timings */
-void driver1()
-{
-  uint8_t buf[256];
-  uint32_t i;
-  uint32_t h=0;
-  time_t a,z;
-
-  time(&a);
-  for (i=0; i<256; ++i) buf[i] = 'x';
-  for (i=0; i<1; ++i)
-  {
-    h = hashlittle(&buf[0],1,h);
-  }
-  time(&z);
-  if (z-a > 0) printf("time %d %.8x\n", z-a, h);
-}
-
-/* check that every input bit changes every output bit half the time */
-#define HASHSTATE 1
-#define HASHLEN   1
-#define MAXPAIR 60
-#define MAXLEN  70
-void driver2()
-{
-  uint8_t qa[MAXLEN+1], qb[MAXLEN+2], *a = &qa[0], *b = &qb[1];
-  uint32_t c[HASHSTATE], d[HASHSTATE], i=0, j=0, k, l, m=0, z;
-  uint32_t e[HASHSTATE],f[HASHSTATE],g[HASHSTATE],h[HASHSTATE];
-  uint32_t x[HASHSTATE],y[HASHSTATE];
-  uint32_t hlen;
-
-  printf("No more than %d trials should ever be needed \n",MAXPAIR/2);
-  for (hlen=0; hlen < MAXLEN; ++hlen)
-  {
-    z=0;
-    for (i=0; i<hlen; ++i)  /*----------------------- for each input byte, */
-    {
-      for (j=0; j<8; ++j)   /*------------------------ for each input bit, */
-      {
-        for (m=1; m<8; ++m) /*------------ for serveral possible initvals, */
-        {
-          for (l=0; l<HASHSTATE; ++l)
-            e[l]=f[l]=g[l]=h[l]=x[l]=y[l]=~((uint32_t)0);
-
-          /*---- check that every output bit is affected by that input bit */
-          for (k=0; k<MAXPAIR; k+=2)
-          {
-            uint32_t finished=1;
-            /* keys have one bit different */
-            for (l=0; l<hlen+1; ++l) {a[l] = b[l] = (uint8_t)0;}
-            /* have a and b be two keys differing in only one bit */
-            a[i] ^= (k<<j);
-            a[i] ^= (k>>(8-j));
-             c[0] = hashlittle(a, hlen, m);
-            b[i] ^= ((k+1)<<j);
-            b[i] ^= ((k+1)>>(8-j));
-             d[0] = hashlittle(b, hlen, m);
-            /* check every bit is 1, 0, set, and not set at least once */
-            for (l=0; l<HASHSTATE; ++l)
-            {
-              e[l] &= (c[l]^d[l]);
-              f[l] &= ~(c[l]^d[l]);
-              g[l] &= c[l];
-              h[l] &= ~c[l];
-              x[l] &= d[l];
-              y[l] &= ~d[l];
-              if (e[l]|f[l]|g[l]|h[l]|x[l]|y[l]) finished=0;
-            }
-            if (finished) break;
-          }
-          if (k>z) z=k;
-          if (k==MAXPAIR)
-          {
-             printf("Some bit didn't change: ");
-             printf("%.8x %.8x %.8x %.8x %.8x %.8x  ",
-                    e[0],f[0],g[0],h[0],x[0],y[0]);
-             printf("i %d j %d m %d len %d\n", i, j, m, hlen);
-          }
-          if (z==MAXPAIR) goto done;
-        }
-      }
-    }
-   done:
-    if (z < MAXPAIR)
-    {
-      printf("Mix success  %2d bytes  %2d initvals  ",i,m);
-      printf("required  %d  trials\n", z/2);
-    }
-  }
-  printf("\n");
-}
-
-/* Check for reading beyond the end of the buffer and alignment problems */
-void driver3()
-{
-  uint8_t buf[MAXLEN+20], *b;
-  uint32_t len;
-  uint8_t q[] = "This is the time for all good men to come to the aid of their country...";
-  uint32_t h;
-  uint8_t qq[] = "xThis is the time for all good men to come to the aid of their country...";
-  uint32_t i;
-  uint8_t qqq[] = "xxThis is the time for all good men to come to the aid of their country...";
-  uint32_t j;
-  uint8_t qqqq[] = "xxxThis is the time for all good men to come to the aid of their country...";
-  uint32_t ref,x,y;
-  uint8_t *p;
-
-  printf("Endianness.  These lines should all be the same (for values filled in):\n");
-  printf("%.8x                            %.8x                            %.8x\n",
-         hashword((const uint32_t *)q, (sizeof(q)-1)/4, 13),
-         hashword((const uint32_t *)q, (sizeof(q)-5)/4, 13),
-         hashword((const uint32_t *)q, (sizeof(q)-9)/4, 13));
-  p = q;
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  p = &qq[1];
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  p = &qqq[2];
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  p = &qqqq[3];
-  printf("%.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n",
-         hashlittle(p, sizeof(q)-1, 13), hashlittle(p, sizeof(q)-2, 13),
-         hashlittle(p, sizeof(q)-3, 13), hashlittle(p, sizeof(q)-4, 13),
-         hashlittle(p, sizeof(q)-5, 13), hashlittle(p, sizeof(q)-6, 13),
-         hashlittle(p, sizeof(q)-7, 13), hashlittle(p, sizeof(q)-8, 13),
-         hashlittle(p, sizeof(q)-9, 13), hashlittle(p, sizeof(q)-10, 13),
-         hashlittle(p, sizeof(q)-11, 13), hashlittle(p, sizeof(q)-12, 13));
-  printf("\n");
-
-  /* check that hashlittle2 and hashlittle produce the same results */
-  i=47; j=0;
-  hashlittle2(q, sizeof(q), &i, &j);
-  if (hashlittle(q, sizeof(q), 47) != i)
-    printf("hashlittle2 and hashlittle mismatch\n");
-
-  /* check that hashword2 and hashword produce the same results */
-  len = 0xdeadbeef;
-  i=47, j=0;
-  hashword2(&len, 1, &i, &j);
-  if (hashword(&len, 1, 47) != i)
-    printf("hashword2 and hashword mismatch %x %x\n",
-           i, hashword(&len, 1, 47));
-
-  /* check hashlittle doesn't read before or after the ends of the string */
-  for (h=0, b=buf+1; h<8; ++h, ++b)
-  {
-    for (i=0; i<MAXLEN; ++i)
-    {
-      len = i;
-      for (j=0; j<i; ++j) *(b+j)=0;
-
-      /* these should all be equal */
-      ref = hashlittle(b, len, (uint32_t)1);
-      *(b+i)=(uint8_t)~0;
-      *(b-1)=(uint8_t)~0;
-      x = hashlittle(b, len, (uint32_t)1);
-      y = hashlittle(b, len, (uint32_t)1);
-      if ((ref != x) || (ref != y))
-      {
-        printf("alignment error: %.8x %.8x %.8x %d %d\n",ref,x,y,
-               h, i);
-      }
-    }
-  }
-}
-
-/* check for problems with nulls */
- void driver4()
-{
-  uint8_t buf[1];
-  uint32_t h,i,state[HASHSTATE];
-
-
-  buf[0] = ~0;
-  for (i=0; i<HASHSTATE; ++i) state[i] = 1;
-  printf("These should all be different\n");
-  for (i=0, h=0; i<8; ++i)
-  {
-    h = hashlittle(buf, 0, h);
-    printf("%2ld  0-byte strings, hash is  %.8x\n", i, h);
-  }
-}
-
-void driver5()
-{
-  uint32_t b,c;
-  b=0, c=0, hashlittle2("", 0, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* deadbeef deadbeef */
-  b=0xdeadbeef, c=0, hashlittle2("", 0, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* bd5b7dde deadbeef */
-  b=0xdeadbeef, c=0xdeadbeef, hashlittle2("", 0, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* 9c093ccd bd5b7dde */
-  b=0, c=0, hashlittle2("Four score and seven years ago", 30, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* 17770551 ce7226e6 */
-  b=1, c=0, hashlittle2("Four score and seven years ago", 30, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* e3607cae bd371de4 */
-  b=0, c=1, hashlittle2("Four score and seven years ago", 30, &c, &b);
-  printf("hash is %.8lx %.8lx\n", c, b);   /* cd628161 6cbea4b3 */
-  c = hashlittle("Four score and seven years ago", 30, 0);
-  printf("hash is %.8lx\n", c);   /* 17770551 */
-  c = hashlittle("Four score and seven years ago", 30, 1);
-  printf("hash is %.8lx\n", c);   /* cd628161 */
-}
-
-
-int main()
-{
-  driver1();   /* test that the key is hashed: used for timings */
-  driver2();   /* test that whole key is hashed thoroughly */
-  driver3();   /* test that nothing but the key is hashed */
-  driver4();   /* test hashing multiple buffers (all buffers are null) */
-  driver5();   /* test the hash against known vectors */
-  return 1;
-}
-
-#endif  /* SELF_TEST */
diff --git a/src/journal/lookup3.h b/src/journal/lookup3.h
deleted file mode 100644 (file)
index 31cc2f5..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foolookup3hfoo
-#define foolookup3hfoo
-
-#include <inttypes.h>
-#include <sys/types.h>
-
-uint32_t jenkins_hashword(const uint32_t *k, size_t length, uint32_t initval);
-void jenkins_hashword2(const uint32_t *k, size_t length, uint32_t *pc, uint32_t *pb);
-
-uint32_t jenkins_hashlittle(const void *key, size_t length, uint32_t initval);
-void jenkins_hashlittle2(const void *key, size_t length, uint32_t *pc, uint32_t *pb);
-
-uint32_t jenkins_hashbig(const void *key, size_t length, uint32_t initval);
-
-static inline uint64_t hash64(const void *data, size_t length) {
-        uint32_t a = 0, b = 0;
-
-        jenkins_hashlittle2(data, length, &a, &b);
-
-        return ((uint64_t) a << 32ULL) | (uint64_t) b;
-}
-
-#endif
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
deleted file mode 100644 (file)
index baf51db..0000000
+++ /dev/null
@@ -1,1616 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <sys/inotify.h>
-
-#include "sd-journal.h"
-#include "journal-def.h"
-#include "journal-file.h"
-#include "hashmap.h"
-#include "list.h"
-#include "lookup3.h"
-#include "compress.h"
-#include "journal-internal.h"
-
-#define JOURNAL_FILES_MAX 1024
-
-static void detach_location(sd_journal *j) {
-        Iterator i;
-        JournalFile *f;
-
-        assert(j);
-
-        j->current_file = NULL;
-        j->current_field = 0;
-
-        HASHMAP_FOREACH(f, j->files, i)
-                f->current_offset = 0;
-}
-
-static void reset_location(sd_journal *j) {
-        assert(j);
-
-        detach_location(j);
-        zero(j->current_location);
-}
-
-static void init_location(Location *l, JournalFile *f, Object *o) {
-        assert(l);
-        assert(f);
-        assert(o->object.type == OBJECT_ENTRY);
-
-        l->type = LOCATION_DISCRETE;
-        l->seqnum = le64toh(o->entry.seqnum);
-        l->seqnum_id = f->header->seqnum_id;
-        l->realtime = le64toh(o->entry.realtime);
-        l->monotonic = le64toh(o->entry.monotonic);
-        l->boot_id = o->entry.boot_id;
-        l->xor_hash = le64toh(o->entry.xor_hash);
-
-        l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true;
-}
-
-static void set_location(sd_journal *j, JournalFile *f, Object *o, uint64_t offset) {
-        assert(j);
-        assert(f);
-        assert(o);
-
-        init_location(&j->current_location, f, o);
-
-        j->current_file = f;
-        j->current_field = 0;
-
-        f->current_offset = offset;
-}
-
-static int same_field(const void *_a, size_t s, const void *_b, size_t t) {
-        const uint8_t *a = _a, *b = _b;
-        size_t j;
-        bool a_good = false, b_good = false, different = false;
-
-        for (j = 0; j < s && j < t; j++) {
-
-                if (a[j] == '=')
-                        a_good = true;
-                if (b[j] == '=')
-                        b_good = true;
-                if (a[j] != b[j])
-                        different = true;
-
-                if (a_good && b_good)
-                        return different ? 0 : 1;
-        }
-
-        return -EINVAL;
-}
-
-_public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) {
-        Match *m, *after = NULL;
-        uint64_t le_hash;
-
-        if (!j)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-        if (size <= 0)
-                return -EINVAL;
-
-        le_hash = htole64(hash64(data, size));
-
-        LIST_FOREACH(matches, m, j->matches) {
-                int r;
-
-                if (m->le_hash == le_hash &&
-                    m->size == size &&
-                    memcmp(m->data, data, size) == 0)
-                        return 0;
-
-                r = same_field(data, size, m->data, m->size);
-                if (r < 0)
-                        return r;
-                else if (r > 0)
-                        after = m;
-        }
-
-        m = new0(Match, 1);
-        if (!m)
-                return -ENOMEM;
-
-        m->size = size;
-
-        m->data = malloc(m->size);
-        if (!m->data) {
-                free(m);
-                return -ENOMEM;
-        }
-
-        memcpy(m->data, data, size);
-        m->le_hash = le_hash;
-
-        /* Matches for the same fields we order adjacent to each
-         * other */
-        LIST_INSERT_AFTER(Match, matches, j->matches, after, m);
-        j->n_matches ++;
-
-        detach_location(j);
-
-        return 0;
-}
-
-_public_ void sd_journal_flush_matches(sd_journal *j) {
-        if (!j)
-                return;
-
-        while (j->matches) {
-                Match *m = j->matches;
-
-                LIST_REMOVE(Match, matches, j->matches, m);
-                free(m->data);
-                free(m);
-        }
-
-        j->n_matches = 0;
-
-        detach_location(j);
-}
-
-static int compare_order(JournalFile *af, Object *ao,
-                         JournalFile *bf, Object *bo) {
-
-        uint64_t a, b;
-
-        assert(af);
-        assert(ao);
-        assert(bf);
-        assert(bo);
-
-        /* We operate on two different files here, hence we can access
-         * two objects at the same time, which we normally can't.
-         *
-         * If contents and timestamps match, these entries are
-         * identical, even if the seqnum does not match */
-
-        if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id) &&
-            ao->entry.monotonic == bo->entry.monotonic &&
-            ao->entry.realtime == bo->entry.realtime &&
-            ao->entry.xor_hash == bo->entry.xor_hash)
-                return 0;
-
-        if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) {
-
-                /* If this is from the same seqnum source, compare
-                 * seqnums */
-                a = le64toh(ao->entry.seqnum);
-                b = le64toh(bo->entry.seqnum);
-
-                if (a < b)
-                        return -1;
-                if (a > b)
-                        return 1;
-
-                /* Wow! This is weird, different data but the same
-                 * seqnums? Something is borked, but let's make the
-                 * best of it and compare by time. */
-        }
-
-        if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) {
-
-                /* If the boot id matches compare monotonic time */
-                a = le64toh(ao->entry.monotonic);
-                b = le64toh(bo->entry.monotonic);
-
-                if (a < b)
-                        return -1;
-                if (a > b)
-                        return 1;
-        }
-
-        /* Otherwise compare UTC time */
-        a = le64toh(ao->entry.realtime);
-        b = le64toh(ao->entry.realtime);
-
-        if (a < b)
-                return -1;
-        if (a > b)
-                return 1;
-
-        /* Finally, compare by contents */
-        a = le64toh(ao->entry.xor_hash);
-        b = le64toh(ao->entry.xor_hash);
-
-        if (a < b)
-                return -1;
-        if (a > b)
-                return 1;
-
-        return 0;
-}
-
-static int compare_with_location(JournalFile *af, Object *ao, Location *l) {
-        uint64_t a;
-
-        assert(af);
-        assert(ao);
-        assert(l);
-        assert(l->type == LOCATION_DISCRETE);
-
-        if (l->monotonic_set &&
-            sd_id128_equal(ao->entry.boot_id, l->boot_id) &&
-            l->realtime_set &&
-            le64toh(ao->entry.realtime) == l->realtime &&
-            l->xor_hash_set &&
-            le64toh(ao->entry.xor_hash) == l->xor_hash)
-                return 0;
-
-        if (l->seqnum_set &&
-            sd_id128_equal(af->header->seqnum_id, l->seqnum_id)) {
-
-                a = le64toh(ao->entry.seqnum);
-
-                if (a < l->seqnum)
-                        return -1;
-                if (a > l->seqnum)
-                        return 1;
-        }
-
-        if (l->monotonic_set &&
-            sd_id128_equal(ao->entry.boot_id, l->boot_id)) {
-
-                a = le64toh(ao->entry.monotonic);
-
-                if (a < l->monotonic)
-                        return -1;
-                if (a > l->monotonic)
-                        return 1;
-        }
-
-        if (l->realtime_set) {
-
-                a = le64toh(ao->entry.realtime);
-
-                if (a < l->realtime)
-                        return -1;
-                if (a > l->realtime)
-                        return 1;
-        }
-
-        if (l->xor_hash_set) {
-                a = le64toh(ao->entry.xor_hash);
-
-                if (a < l->xor_hash)
-                        return -1;
-                if (a > l->xor_hash)
-                        return 1;
-        }
-
-        return 0;
-}
-
-static int find_location(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
-        Object *o = NULL;
-        uint64_t p = 0;
-        int r;
-
-        assert(j);
-
-        if (!j->matches) {
-                /* No matches is simple */
-
-                if (j->current_location.type == LOCATION_HEAD)
-                        r = journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p);
-                else if (j->current_location.type == LOCATION_TAIL)
-                        r = journal_file_next_entry(f, NULL, 0, DIRECTION_UP, &o, &p);
-                else if (j->current_location.seqnum_set &&
-                         sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
-                        r = journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, &o, &p);
-                else if (j->current_location.monotonic_set)
-                        r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, &o, &p);
-                else if (j->current_location.realtime_set)
-                        r = journal_file_move_to_entry_by_realtime(f, j->current_location.realtime, direction, &o, &p);
-                else
-                        r = journal_file_next_entry(f, NULL, 0, direction, &o, &p);
-
-                if (r <= 0)
-                        return r;
-
-        } else  {
-                Match *m, *term_match = NULL;
-                Object *to = NULL;
-                uint64_t tp = 0;
-
-                /* We have matches, first, let's jump to the monotonic
-                 * position if we have any, since it implies a
-                 * match. */
-
-                if (j->current_location.type == LOCATION_DISCRETE &&
-                    j->current_location.monotonic_set) {
-
-                        r = journal_file_move_to_entry_by_monotonic(f, j->current_location.boot_id, j->current_location.monotonic, direction, &o, &p);
-                        if (r <= 0)
-                                return r == -ENOENT ? 0 : r;
-                }
-
-                LIST_FOREACH(matches, m, j->matches) {
-                        Object *c, *d;
-                        uint64_t cp, dp;
-
-                        r = journal_file_find_data_object_with_hash(f, m->data, m->size, m->le_hash, &d, &dp);
-                        if (r <= 0)
-                                return r;
-
-                        if (j->current_location.type == LOCATION_HEAD)
-                                r = journal_file_next_entry_for_data(f, NULL, 0, dp, DIRECTION_DOWN, &c, &cp);
-                        else if (j->current_location.type == LOCATION_TAIL)
-                                r = journal_file_next_entry_for_data(f, NULL, 0, dp, DIRECTION_UP, &c, &cp);
-                        else if (j->current_location.seqnum_set &&
-                                 sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id))
-                                r = journal_file_move_to_entry_by_seqnum_for_data(f, dp, j->current_location.seqnum, direction, &c, &cp);
-                        else if (j->current_location.realtime_set)
-                                r = journal_file_move_to_entry_by_realtime_for_data(f, dp, j->current_location.realtime, direction, &c, &cp);
-                        else
-                                r = journal_file_next_entry_for_data(f, NULL, 0, dp, direction, &c, &cp);
-
-                        if (r < 0)
-                                return r;
-
-                        if (!term_match) {
-                                term_match = m;
-
-                                if (r > 0) {
-                                        to = c;
-                                        tp = cp;
-                                }
-                        } else if (same_field(term_match->data, term_match->size, m->data, m->size)) {
-
-                                /* Same field as previous match... */
-                                if (r > 0) {
-
-                                        /* Find the earliest of the OR matches */
-
-                                        if (!to ||
-                                            (direction == DIRECTION_DOWN && cp < tp) ||
-                                            (direction == DIRECTION_UP && cp > tp)) {
-                                                to = c;
-                                                tp = cp;
-                                        }
-
-                                }
-
-                        } else {
-
-                                /* Previous term is finished, did anything match? */
-                                if (!to)
-                                        return 0;
-
-                                /* Find the last of the AND matches */
-                                if (!o ||
-                                    (direction == DIRECTION_DOWN && tp > p) ||
-                                    (direction == DIRECTION_UP && tp < p)) {
-                                        o = to;
-                                        p = tp;
-                                }
-
-                                term_match = m;
-
-                                if (r > 0) {
-                                        to = c;
-                                        tp = cp;
-                                } else {
-                                        to = NULL;
-                                        tp = 0;
-                                }
-                        }
-                }
-
-                /* Last term is finished, did anything match? */
-                if (!to)
-                        return 0;
-
-                if (!o ||
-                    (direction == DIRECTION_DOWN && tp > p) ||
-                    (direction == DIRECTION_UP && tp < p)) {
-                        o = to;
-                        p = tp;
-                }
-
-                if (!o)
-                        return 0;
-        }
-
-        if (ret)
-                *ret = o;
-
-        if (offset)
-                *offset = p;
-
-        return 1;
-}
-
-static int next_with_matches(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
-        int r;
-        uint64_t cp;
-        Object *c;
-
-        assert(j);
-        assert(f);
-        assert(ret);
-        assert(offset);
-
-        c = *ret;
-        cp = *offset;
-
-        if (!j->matches) {
-                /* No matches is easy */
-
-                r = journal_file_next_entry(f, c, cp, direction, &c, &cp);
-                if (r <= 0)
-                        return r;
-
-                if (ret)
-                        *ret = c;
-                if (offset)
-                        *offset = cp;
-                return 1;
-        }
-
-        /* So there are matches we have to adhere to, let's find the
-         * first entry that matches all of them */
-
-        for (;;) {
-                uint64_t np, n;
-                bool found, term_result = false;
-                Match *m, *term_match = NULL;
-                Object *npo = NULL;
-
-                n = journal_file_entry_n_items(c);
-
-                /* Make sure we don't match the entry we are starting
-                 * from. */
-                found = cp != *offset;
-
-                np = 0;
-                LIST_FOREACH(matches, m, j->matches) {
-                        uint64_t q, k;
-                        Object *qo = NULL;
-
-                        /* Let's check if this is the beginning of a
-                         * new term, i.e. has a different field prefix
-                         * as the preceeding match. */
-                        if (!term_match) {
-                                term_match = m;
-                                term_result = false;
-                        } else if (!same_field(term_match->data, term_match->size, m->data, m->size)) {
-                                if (!term_result)
-                                        found = false;
-
-                                term_match = m;
-                                term_result = false;
-                        }
-
-                        for (k = 0; k < n; k++)
-                                if (c->entry.items[k].hash == m->le_hash)
-                                        break;
-
-                        if (k >= n) {
-                                /* Hmm, didn't find any field that
-                                 * matched this rule, so ignore this
-                                 * match. Go on with next match */
-                                continue;
-                        }
-
-                        term_result = true;
-
-                        /* Hmm, so, this field matched, let's remember
-                         * where we'd have to try next, in case the other
-                         * matches are not OK */
-
-                        r = journal_file_next_entry_for_data(f, c, cp, le64toh(c->entry.items[k].object_offset), direction, &qo, &q);
-                        if (r < 0)
-                                return r;
-
-                        if (r > 0) {
-
-                                if (direction == DIRECTION_DOWN) {
-                                        if (q > np) {
-                                                np = q;
-                                                npo = qo;
-                                        }
-                                } else {
-                                        if (np == 0 || q < np) {
-                                                np = q;
-                                                npo = qo;
-                                        }
-                                }
-                        }
-                }
-
-                /* Check the last term */
-                if (term_match && !term_result)
-                        found = false;
-
-                /* Did this entry match against all matches? */
-                if (found) {
-                        if (ret)
-                                *ret = c;
-                        if (offset)
-                                *offset = cp;
-                        return 1;
-                }
-
-                /* Did we find a subsequent entry? */
-                if (np == 0)
-                        return 0;
-
-                /* Hmm, ok, this entry only matched partially, so
-                 * let's try another one */
-                cp = np;
-                c = npo;
-        }
-}
-
-static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) {
-        Object *c;
-        uint64_t cp;
-        int compare_value, r;
-
-        assert(j);
-        assert(f);
-
-        if (f->current_offset > 0) {
-                cp = f->current_offset;
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY, cp, &c);
-                if (r < 0)
-                        return r;
-
-                r = next_with_matches(j, f, direction, &c, &cp);
-                if (r <= 0)
-                        return r;
-
-                compare_value = 1;
-        } else {
-                r = find_location(j, f, direction, &c, &cp);
-                if (r <= 0)
-                        return r;
-
-                compare_value = 0;
-        }
-
-        for (;;) {
-                bool found;
-
-                if (j->current_location.type == LOCATION_DISCRETE) {
-                        int k;
-
-                        k = compare_with_location(f, c, &j->current_location);
-                        if (direction == DIRECTION_DOWN)
-                                found = k >= compare_value;
-                        else
-                                found = k <= -compare_value;
-                } else
-                        found = true;
-
-                if (found) {
-                        if (ret)
-                                *ret = c;
-                        if (offset)
-                                *offset = cp;
-                        return 1;
-                }
-
-                r = next_with_matches(j, f, direction, &c, &cp);
-                if (r <= 0)
-                        return r;
-        }
-}
-
-static int real_journal_next(sd_journal *j, direction_t direction) {
-        JournalFile *f, *new_current = NULL;
-        Iterator i;
-        int r;
-        uint64_t new_offset = 0;
-        Object *new_entry = NULL;
-
-        if (!j)
-                return -EINVAL;
-
-        HASHMAP_FOREACH(f, j->files, i) {
-                Object *o;
-                uint64_t p;
-                bool found;
-
-                r = next_beyond_location(j, f, direction, &o, &p);
-                if (r < 0)
-                        return r;
-                else if (r == 0)
-                        continue;
-
-                if (!new_current)
-                        found = true;
-                else {
-                        int k;
-
-                        k = compare_order(f, o, new_current, new_entry);
-
-                        if (direction == DIRECTION_DOWN)
-                                found = k < 0;
-                        else
-                                found = k > 0;
-                }
-
-                if (found) {
-                        new_current = f;
-                        new_entry = o;
-                        new_offset = p;
-                }
-        }
-
-        if (!new_current)
-                return 0;
-
-        set_location(j, new_current, new_entry, new_offset);
-
-        return 1;
-}
-
-_public_ int sd_journal_next(sd_journal *j) {
-        return real_journal_next(j, DIRECTION_DOWN);
-}
-
-_public_ int sd_journal_previous(sd_journal *j) {
-        return real_journal_next(j, DIRECTION_UP);
-}
-
-static int real_journal_next_skip(sd_journal *j, direction_t direction, uint64_t skip) {
-        int c = 0, r;
-
-        if (!j)
-                return -EINVAL;
-
-        if (skip == 0) {
-                /* If this is not a discrete skip, then at least
-                 * resolve the current location */
-                if (j->current_location.type != LOCATION_DISCRETE)
-                        return real_journal_next(j, direction);
-
-                return 0;
-        }
-
-        do {
-                r = real_journal_next(j, direction);
-                if (r < 0)
-                        return r;
-
-                if (r == 0)
-                        return c;
-
-                skip--;
-                c++;
-        } while (skip > 0);
-
-        return c;
-}
-
-_public_ int sd_journal_next_skip(sd_journal *j, uint64_t skip) {
-        return real_journal_next_skip(j, DIRECTION_DOWN, skip);
-}
-
-_public_ int sd_journal_previous_skip(sd_journal *j, uint64_t skip) {
-        return real_journal_next_skip(j, DIRECTION_UP, skip);
-}
-
-_public_ int sd_journal_get_cursor(sd_journal *j, char **cursor) {
-        Object *o;
-        int r;
-        char bid[33], sid[33];
-
-        if (!j)
-                return -EINVAL;
-        if (!cursor)
-                return -EINVAL;
-
-        if (!j->current_file || j->current_file->current_offset <= 0)
-                return -EADDRNOTAVAIL;
-
-        r = journal_file_move_to_object(j->current_file, OBJECT_ENTRY, j->current_file->current_offset, &o);
-        if (r < 0)
-                return r;
-
-        sd_id128_to_string(j->current_file->header->seqnum_id, sid);
-        sd_id128_to_string(o->entry.boot_id, bid);
-
-        if (asprintf(cursor,
-                     "s=%s;i=%llx;b=%s;m=%llx;t=%llx;x=%llx;p=%s",
-                     sid, (unsigned long long) le64toh(o->entry.seqnum),
-                     bid, (unsigned long long) le64toh(o->entry.monotonic),
-                     (unsigned long long) le64toh(o->entry.realtime),
-                     (unsigned long long) le64toh(o->entry.xor_hash),
-                     file_name_from_path(j->current_file->path)) < 0)
-                return -ENOMEM;
-
-        return 1;
-}
-
-_public_ int sd_journal_seek_cursor(sd_journal *j, const char *cursor) {
-        char *w;
-        size_t l;
-        char *state;
-        unsigned long long seqnum, monotonic, realtime, xor_hash;
-        bool
-                seqnum_id_set = false,
-                seqnum_set = false,
-                boot_id_set = false,
-                monotonic_set = false,
-                realtime_set = false,
-                xor_hash_set = false;
-        sd_id128_t seqnum_id, boot_id;
-
-        if (!j)
-                return -EINVAL;
-        if (!cursor)
-                return -EINVAL;
-
-        FOREACH_WORD_SEPARATOR(w, l, cursor, ";", state) {
-                char *item;
-                int k = 0;
-
-                if (l < 2 || w[1] != '=')
-                        return -EINVAL;
-
-                item = strndup(w, l);
-                if (!item)
-                        return -ENOMEM;
-
-                switch (w[0]) {
-
-                case 's':
-                        seqnum_id_set = true;
-                        k = sd_id128_from_string(w+2, &seqnum_id);
-                        break;
-
-                case 'i':
-                        seqnum_set = true;
-                        if (sscanf(w+2, "%llx", &seqnum) != 1)
-                                k = -EINVAL;
-                        break;
-
-                case 'b':
-                        boot_id_set = true;
-                        k = sd_id128_from_string(w+2, &boot_id);
-                        break;
-
-                case 'm':
-                        monotonic_set = true;
-                        if (sscanf(w+2, "%llx", &monotonic) != 1)
-                                k = -EINVAL;
-                        break;
-
-                case 't':
-                        realtime_set = true;
-                        if (sscanf(w+2, "%llx", &realtime) != 1)
-                                k = -EINVAL;
-                        break;
-
-                case 'x':
-                        xor_hash_set = true;
-                        if (sscanf(w+2, "%llx", &xor_hash) != 1)
-                                k = -EINVAL;
-                        break;
-                }
-
-                free(item);
-
-                if (k < 0)
-                        return k;
-        }
-
-        if ((!seqnum_set || !seqnum_id_set) &&
-            (!monotonic_set || !boot_id_set) &&
-            !realtime_set)
-                return -EINVAL;
-
-        reset_location(j);
-
-        j->current_location.type = LOCATION_DISCRETE;
-
-        if (realtime_set) {
-                j->current_location.realtime = (uint64_t) realtime;
-                j->current_location.realtime_set = true;
-        }
-
-        if (seqnum_set && seqnum_id_set) {
-                j->current_location.seqnum = (uint64_t) seqnum;
-                j->current_location.seqnum_id = seqnum_id;
-                j->current_location.seqnum_set = true;
-        }
-
-        if (monotonic_set && boot_id_set) {
-                j->current_location.monotonic = (uint64_t) monotonic;
-                j->current_location.boot_id = boot_id;
-                j->current_location.monotonic_set = true;
-        }
-
-        if (xor_hash_set) {
-                j->current_location.xor_hash = (uint64_t) xor_hash;
-                j->current_location.xor_hash_set = true;
-        }
-
-        return 0;
-}
-
-_public_ int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec) {
-        if (!j)
-                return -EINVAL;
-
-        reset_location(j);
-        j->current_location.type = LOCATION_DISCRETE;
-        j->current_location.boot_id = boot_id;
-        j->current_location.monotonic = usec;
-        j->current_location.monotonic_set = true;
-
-        return 0;
-}
-
-_public_ int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec) {
-        if (!j)
-                return -EINVAL;
-
-        reset_location(j);
-        j->current_location.type = LOCATION_DISCRETE;
-        j->current_location.realtime = usec;
-        j->current_location.realtime_set = true;
-
-        return 0;
-}
-
-_public_ int sd_journal_seek_head(sd_journal *j) {
-        if (!j)
-                return -EINVAL;
-
-        reset_location(j);
-        j->current_location.type = LOCATION_HEAD;
-
-        return 0;
-}
-
-_public_ int sd_journal_seek_tail(sd_journal *j) {
-        if (!j)
-                return -EINVAL;
-
-        reset_location(j);
-        j->current_location.type = LOCATION_TAIL;
-
-        return 0;
-}
-
-static int add_file(sd_journal *j, const char *prefix, const char *dir, const char *filename) {
-        char *fn;
-        int r;
-        JournalFile *f;
-
-        assert(j);
-        assert(prefix);
-        assert(filename);
-
-        if ((j->flags & SD_JOURNAL_SYSTEM_ONLY) &&
-            !startswith(filename, "system.journal"))
-                return 0;
-
-        if (dir)
-                fn = join(prefix, "/", dir, "/", filename, NULL);
-        else
-                fn = join(prefix, "/", filename, NULL);
-
-        if (!fn)
-                return -ENOMEM;
-
-        if (hashmap_get(j->files, fn)) {
-                free(fn);
-                return 0;
-        }
-
-        if (hashmap_size(j->files) >= JOURNAL_FILES_MAX) {
-                log_debug("Too many open journal files, not adding %s, ignoring.", fn);
-                free(fn);
-                return 0;
-        }
-
-        r = journal_file_open(fn, O_RDONLY, 0, NULL, &f);
-        free(fn);
-
-        if (r < 0) {
-                if (errno == ENOENT)
-                        return 0;
-
-                return r;
-        }
-
-        /* journal_file_dump(f); */
-
-        r = hashmap_put(j->files, f->path, f);
-        if (r < 0) {
-                journal_file_close(f);
-                return r;
-        }
-
-        log_debug("File %s got added.", f->path);
-
-        return 0;
-}
-
-static int remove_file(sd_journal *j, const char *prefix, const char *dir, const char *filename) {
-        char *fn;
-        JournalFile *f;
-
-        assert(j);
-        assert(prefix);
-        assert(filename);
-
-        if (dir)
-                fn = join(prefix, "/", dir, "/", filename, NULL);
-        else
-                fn = join(prefix, "/", filename, NULL);
-
-        if (!fn)
-                return -ENOMEM;
-
-        f = hashmap_get(j->files, fn);
-        free(fn);
-
-        if (!f)
-                return 0;
-
-        hashmap_remove(j->files, f->path);
-        journal_file_close(f);
-
-        log_debug("File %s got removed.", f->path);
-        return 0;
-}
-
-static int add_directory(sd_journal *j, const char *prefix, const char *dir) {
-        char *fn;
-        int r;
-        DIR *d;
-        int wd;
-        sd_id128_t id, mid;
-
-        assert(j);
-        assert(prefix);
-        assert(dir);
-
-        if ((j->flags & SD_JOURNAL_LOCAL_ONLY) &&
-            (sd_id128_from_string(dir, &id) < 0 ||
-             sd_id128_get_machine(&mid) < 0 ||
-             !sd_id128_equal(id, mid)))
-            return 0;
-
-        fn = join(prefix, "/", dir, NULL);
-        if (!fn)
-                return -ENOMEM;
-
-        d = opendir(fn);
-
-        if (!d) {
-                free(fn);
-                if (errno == ENOENT)
-                        return 0;
-
-                return -errno;
-        }
-
-        wd = inotify_add_watch(j->inotify_fd, fn,
-                               IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB|IN_DELETE|
-                               IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT|
-                               IN_DONT_FOLLOW|IN_ONLYDIR);
-        if (wd > 0) {
-                if (hashmap_put(j->inotify_wd_dirs, INT_TO_PTR(wd), fn) < 0)
-                        inotify_rm_watch(j->inotify_fd, wd);
-                else
-                        fn = NULL;
-        }
-
-        free(fn);
-
-        for (;;) {
-                struct dirent buf, *de;
-
-                r = readdir_r(d, &buf, &de);
-                if (r != 0 || !de)
-                        break;
-
-                if (!dirent_is_file_with_suffix(de, ".journal"))
-                        continue;
-
-                r = add_file(j, prefix, dir, de->d_name);
-                if (r < 0)
-                        log_debug("Failed to add file %s/%s/%s: %s", prefix, dir, de->d_name, strerror(-r));
-        }
-
-        closedir(d);
-
-        log_debug("Directory %s/%s got added.", prefix, dir);
-
-        return 0;
-}
-
-static void remove_directory_wd(sd_journal *j, int wd) {
-        char *p;
-
-        assert(j);
-        assert(wd > 0);
-
-        if (j->inotify_fd >= 0)
-                inotify_rm_watch(j->inotify_fd, wd);
-
-        p = hashmap_remove(j->inotify_wd_dirs, INT_TO_PTR(wd));
-
-        if (p) {
-                log_debug("Directory %s got removed.", p);
-                free(p);
-        }
-}
-
-static void add_root_wd(sd_journal *j, const char *p) {
-        int wd;
-        char *k;
-
-        assert(j);
-        assert(p);
-
-        wd = inotify_add_watch(j->inotify_fd, p,
-                               IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB|IN_DELETE|
-                               IN_DONT_FOLLOW|IN_ONLYDIR);
-        if (wd <= 0)
-                return;
-
-        k = strdup(p);
-        if (!k || hashmap_put(j->inotify_wd_roots, INT_TO_PTR(wd), k) < 0) {
-                inotify_rm_watch(j->inotify_fd, wd);
-                free(k);
-        }
-}
-
-static void remove_root_wd(sd_journal *j, int wd) {
-        char *p;
-
-        assert(j);
-        assert(wd > 0);
-
-        if (j->inotify_fd >= 0)
-                inotify_rm_watch(j->inotify_fd, wd);
-
-        p = hashmap_remove(j->inotify_wd_roots, INT_TO_PTR(wd));
-
-        if (p) {
-                log_debug("Root %s got removed.", p);
-                free(p);
-        }
-}
-
-_public_ int sd_journal_open(sd_journal **ret, int flags) {
-        sd_journal *j;
-        const char *p;
-        const char search_paths[] =
-                "/run/log/journal\0"
-                "/var/log/journal\0";
-        int r;
-
-        if (!ret)
-                return -EINVAL;
-
-        if (flags & ~(SD_JOURNAL_LOCAL_ONLY|
-                      SD_JOURNAL_RUNTIME_ONLY|
-                      SD_JOURNAL_SYSTEM_ONLY))
-                return -EINVAL;
-
-        j = new0(sd_journal, 1);
-        if (!j)
-                return -ENOMEM;
-
-        j->flags = flags;
-
-        j->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC);
-        if (j->inotify_fd < 0) {
-                r = -errno;
-                goto fail;
-        }
-
-        j->files = hashmap_new(string_hash_func, string_compare_func);
-        if (!j->files) {
-                r = -ENOMEM;
-                goto fail;
-        }
-
-        j->inotify_wd_dirs = hashmap_new(trivial_hash_func, trivial_compare_func);
-        j->inotify_wd_roots = hashmap_new(trivial_hash_func, trivial_compare_func);
-
-        if (!j->inotify_wd_dirs || !j->inotify_wd_roots) {
-                r = -ENOMEM;
-                goto fail;
-        }
-
-        /* We ignore most errors here, since the idea is to only open
-         * what's actually accessible, and ignore the rest. */
-
-        NULSTR_FOREACH(p, search_paths) {
-                DIR *d;
-
-                if ((flags & SD_JOURNAL_RUNTIME_ONLY) &&
-                    !path_startswith(p, "/run"))
-                        continue;
-
-                d = opendir(p);
-                if (!d) {
-                        if (errno != ENOENT)
-                                log_debug("Failed to open %s: %m", p);
-                        continue;
-                }
-
-                add_root_wd(j, p);
-
-                for (;;) {
-                        struct dirent buf, *de;
-                        sd_id128_t id;
-
-                        r = readdir_r(d, &buf, &de);
-                        if (r != 0 || !de)
-                                break;
-
-                        if (dirent_is_file_with_suffix(de, ".journal")) {
-                                r = add_file(j, p, NULL, de->d_name);
-                                if (r < 0)
-                                        log_debug("Failed to add file %s/%s: %s", p, de->d_name, strerror(-r));
-
-                        } else if ((de->d_type == DT_DIR || de->d_type == DT_UNKNOWN) &&
-                                   sd_id128_from_string(de->d_name, &id) >= 0) {
-
-                                r = add_directory(j, p, de->d_name);
-                                if (r < 0)
-                                        log_debug("Failed to add directory %s/%s: %s", p, de->d_name, strerror(-r));
-                        }
-                }
-
-                closedir(d);
-        }
-
-        *ret = j;
-        return 0;
-
-fail:
-        sd_journal_close(j);
-
-        return r;
-};
-
-_public_ void sd_journal_close(sd_journal *j) {
-        if (!j)
-                return;
-
-        if (j->inotify_wd_dirs) {
-                void *k;
-
-                while ((k = hashmap_first_key(j->inotify_wd_dirs)))
-                        remove_directory_wd(j, PTR_TO_INT(k));
-
-                hashmap_free(j->inotify_wd_dirs);
-        }
-
-        if (j->inotify_wd_roots) {
-                void *k;
-
-                while ((k = hashmap_first_key(j->inotify_wd_roots)))
-                        remove_root_wd(j, PTR_TO_INT(k));
-
-                hashmap_free(j->inotify_wd_roots);
-        }
-
-        if (j->files) {
-                JournalFile *f;
-
-                while ((f = hashmap_steal_first(j->files)))
-                        journal_file_close(f);
-
-                hashmap_free(j->files);
-        }
-
-        sd_journal_flush_matches(j);
-
-        if (j->inotify_fd >= 0)
-                close_nointr_nofail(j->inotify_fd);
-
-        free(j);
-}
-
-_public_ int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret) {
-        Object *o;
-        JournalFile *f;
-        int r;
-
-        if (!j)
-                return -EINVAL;
-        if (!ret)
-                return -EINVAL;
-
-        f = j->current_file;
-        if (!f)
-                return -EADDRNOTAVAIL;
-
-        if (f->current_offset <= 0)
-                return -EADDRNOTAVAIL;
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-        if (r < 0)
-                return r;
-
-        *ret = le64toh(o->entry.realtime);
-        return 0;
-}
-
-_public_ int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id) {
-        Object *o;
-        JournalFile *f;
-        int r;
-        sd_id128_t id;
-
-        if (!j)
-                return -EINVAL;
-        if (!ret)
-                return -EINVAL;
-
-        f = j->current_file;
-        if (!f)
-                return -EADDRNOTAVAIL;
-
-        if (f->current_offset <= 0)
-                return -EADDRNOTAVAIL;
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-        if (r < 0)
-                return r;
-
-        if (ret_boot_id)
-                *ret_boot_id = o->entry.boot_id;
-        else {
-                r = sd_id128_get_boot(&id);
-                if (r < 0)
-                        return r;
-
-                if (!sd_id128_equal(id, o->entry.boot_id))
-                        return -ESTALE;
-        }
-
-        *ret = le64toh(o->entry.monotonic);
-        return 0;
-}
-
-_public_ int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *size) {
-        JournalFile *f;
-        uint64_t i, n;
-        size_t field_length;
-        int r;
-        Object *o;
-
-        if (!j)
-                return -EINVAL;
-        if (!field)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-        if (!size)
-                return -EINVAL;
-
-        if (isempty(field) || strchr(field, '='))
-                return -EINVAL;
-
-        f = j->current_file;
-        if (!f)
-                return -EADDRNOTAVAIL;
-
-        if (f->current_offset <= 0)
-                return -EADDRNOTAVAIL;
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-        if (r < 0)
-                return r;
-
-        field_length = strlen(field);
-
-        n = journal_file_entry_n_items(o);
-        for (i = 0; i < n; i++) {
-                uint64_t p, l, le_hash;
-                size_t t;
-
-                p = le64toh(o->entry.items[i].object_offset);
-                le_hash = o->entry.items[i].hash;
-                r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
-                if (r < 0)
-                        return r;
-
-                if (le_hash != o->data.hash)
-                        return -EBADMSG;
-
-                l = le64toh(o->object.size) - offsetof(Object, data.payload);
-
-                if (o->object.flags & OBJECT_COMPRESSED) {
-
-#ifdef HAVE_XZ
-                        if (uncompress_startswith(o->data.payload, l,
-                                                  &f->compress_buffer, &f->compress_buffer_size,
-                                                  field, field_length, '=')) {
-
-                                uint64_t rsize;
-
-                                if (!uncompress_blob(o->data.payload, l,
-                                                     &f->compress_buffer, &f->compress_buffer_size, &rsize))
-                                        return -EBADMSG;
-
-                                *data = f->compress_buffer;
-                                *size = (size_t) rsize;
-
-                                return 0;
-                        }
-#else
-                        return -EPROTONOSUPPORT;
-#endif
-
-                } else if (l >= field_length+1 &&
-                           memcmp(o->data.payload, field, field_length) == 0 &&
-                           o->data.payload[field_length] == '=') {
-
-                        t = (size_t) l;
-
-                        if ((uint64_t) t != l)
-                                return -E2BIG;
-
-                        *data = o->data.payload;
-                        *size = t;
-
-                        return 0;
-                }
-
-                r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-                if (r < 0)
-                        return r;
-        }
-
-        return -ENOENT;
-}
-
-_public_ int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *size) {
-        JournalFile *f;
-        uint64_t p, l, n, le_hash;
-        int r;
-        Object *o;
-        size_t t;
-
-        if (!j)
-                return -EINVAL;
-        if (!data)
-                return -EINVAL;
-        if (!size)
-                return -EINVAL;
-
-        f = j->current_file;
-        if (!f)
-                return -EADDRNOTAVAIL;
-
-        if (f->current_offset <= 0)
-                return -EADDRNOTAVAIL;
-
-        r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
-        if (r < 0)
-                return r;
-
-        n = journal_file_entry_n_items(o);
-        if (j->current_field >= n)
-                return 0;
-
-        p = le64toh(o->entry.items[j->current_field].object_offset);
-        le_hash = o->entry.items[j->current_field].hash;
-        r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
-        if (r < 0)
-                return r;
-
-        if (le_hash != o->data.hash)
-                return -EBADMSG;
-
-        l = le64toh(o->object.size) - offsetof(Object, data.payload);
-        t = (size_t) l;
-
-        /* We can't read objects larger than 4G on a 32bit machine */
-        if ((uint64_t) t != l)
-                return -E2BIG;
-
-        if (o->object.flags & OBJECT_COMPRESSED) {
-#ifdef HAVE_XZ
-                uint64_t rsize;
-
-                if (!uncompress_blob(o->data.payload, l, &f->compress_buffer, &f->compress_buffer_size, &rsize))
-                        return -EBADMSG;
-
-                *data = f->compress_buffer;
-                *size = (size_t) rsize;
-#else
-                return -EPROTONOSUPPORT;
-#endif
-        } else {
-                *data = o->data.payload;
-                *size = t;
-        }
-
-        j->current_field ++;
-
-        return 1;
-}
-
-_public_ void sd_journal_restart_data(sd_journal *j) {
-        if (!j)
-                return;
-
-        j->current_field = 0;
-}
-
-_public_ int sd_journal_get_fd(sd_journal *j) {
-        if (!j)
-                return -EINVAL;
-
-        return j->inotify_fd;
-}
-
-static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
-        char *p;
-        int r;
-
-        assert(j);
-        assert(e);
-
-        /* Is this a subdirectory we watch? */
-        p = hashmap_get(j->inotify_wd_dirs, INT_TO_PTR(e->wd));
-        if (p) {
-
-                if (!(e->mask & IN_ISDIR) && e->len > 0 && endswith(e->name, ".journal")) {
-
-                        /* Event for a journal file */
-
-                        if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
-                                r = add_file(j, p, NULL, e->name);
-                                if (r < 0)
-                                        log_debug("Failed to add file %s/%s: %s", p, e->name, strerror(-r));
-                        } else if (e->mask & (IN_DELETE|IN_UNMOUNT)) {
-
-                                r = remove_file(j, p, NULL, e->name);
-                                if (r < 0)
-                                        log_debug("Failed to remove file %s/%s: %s", p, e->name, strerror(-r));
-                        }
-
-                } else if (e->len == 0) {
-
-                        /* Event for the directory itself */
-
-                        if (e->mask & (IN_DELETE_SELF|IN_MOVE_SELF|IN_UNMOUNT))
-                                remove_directory_wd(j, e->wd);
-                }
-
-                return;
-        }
-
-        /* Must be the root directory then? */
-        p = hashmap_get(j->inotify_wd_roots, INT_TO_PTR(e->wd));
-        if (p) {
-                sd_id128_t id;
-
-                if (!(e->mask & IN_ISDIR) && e->len > 0 && endswith(e->name, ".journal")) {
-
-                        /* Event for a journal file */
-
-                        if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
-                                r = add_file(j, p, NULL, e->name);
-                                if (r < 0)
-                                        log_debug("Failed to add file %s/%s: %s", p, e->name, strerror(-r));
-                        } else if (e->mask & (IN_DELETE|IN_UNMOUNT)) {
-
-                                r = remove_file(j, p, NULL, e->name);
-                                if (r < 0)
-                                        log_debug("Failed to remove file %s/%s: %s", p, e->name, strerror(-r));
-                        }
-
-                } else if ((e->mask & IN_ISDIR) && e->len > 0 && sd_id128_from_string(e->name, &id) >= 0) {
-
-                        /* Event for subdirectory */
-
-                        if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
-
-                                r = add_directory(j, p, e->name);
-                                if (r < 0)
-                                        log_debug("Failed to add directory %s/%s: %s", p, e->name, strerror(-r));
-                        }
-                }
-
-                return;
-        }
-
-        if (e->mask & IN_IGNORED)
-                return;
-
-        log_warning("Unknown inotify event.");
-}
-
-_public_ int sd_journal_process(sd_journal *j) {
-        uint8_t buffer[sizeof(struct inotify_event) + FILENAME_MAX];
-
-        if (!j)
-                return -EINVAL;
-
-        for (;;) {
-                struct inotify_event *e;
-                ssize_t l;
-
-                l = read(j->inotify_fd, buffer, sizeof(buffer));
-                if (l < 0) {
-                        if (errno == EINTR || errno == EAGAIN)
-                                return 0;
-
-                        return -errno;
-                }
-
-                e = (struct inotify_event*) buffer;
-                while (l > 0) {
-                        size_t step;
-
-                        process_inotify_event(j, e);
-
-                        step = sizeof(struct inotify_event) + e->len;
-                        assert(step <= (size_t) l);
-
-                        e = (struct inotify_event*) ((uint8_t*) e + step);
-                        l -= step;
-                }
-        }
-}
-
-/* _public_ int sd_journal_query_unique(sd_journal *j, const char *field) { */
-/*         if (!j) */
-/*                 return -EINVAL; */
-/*         if (!field) */
-/*                 return -EINVAL; */
-
-/*         return -ENOTSUP; */
-/* } */
-
-/* _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l) { */
-/*         if (!j) */
-/*                 return -EINVAL; */
-/*         if (!data) */
-/*                 return -EINVAL; */
-/*         if (!l) */
-/*                 return -EINVAL; */
-
-/*         return -ENOTSUP; */
-/* } */
-
-/* _public_ void sd_journal_restart_unique(sd_journal *j) { */
-/*         if (!j) */
-/*                 return; */
-/* } */
diff --git a/src/journal/systemd-journald.conf b/src/journal/systemd-journald.conf
deleted file mode 100644 (file)
index 710b0aa..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-# See system-journald.conf(5) for details
-
-[Journal]
-#Compress=yes
-#RateLimitInterval=10s
-#RateLimitBurst=200
-#SystemMaxUse=
-#SystemKeepFree=
-#SystemMaxFileSize=
-#SystemMinFileSize=
-#RuntimeMaxUse=
-#RuntimeKeepFree=
-#RuntimeMaxFileSize=
-#RuntimeMinFileSize=
-#ForwardToSyslog=yes
-#ForwardToKMsg=no
-#ForwardToConsole=no
-#ImportKernel=yes
diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
deleted file mode 100644 (file)
index a023509..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <fcntl.h>
-#include <unistd.h>
-
-#include <systemd/sd-journal.h>
-
-#include "journal-file.h"
-#include "log.h"
-
-int main(int argc, char *argv[]) {
-        dual_timestamp ts;
-        JournalFile *f;
-        struct iovec iovec;
-        static const char test[] = "test", test2[] = "test2";
-        Object *o;
-        uint64_t p;
-
-        log_set_max_level(LOG_DEBUG);
-
-        unlink("test.journal");
-
-        assert_se(journal_file_open("test.journal", O_RDWR|O_CREAT, 0666, NULL, &f) == 0);
-
-        dual_timestamp_get(&ts);
-
-        iovec.iov_base = (void*) test;
-        iovec.iov_len = strlen(test);
-        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
-
-        iovec.iov_base = (void*) test2;
-        iovec.iov_len = strlen(test2);
-        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
-
-        iovec.iov_base = (void*) test;
-        iovec.iov_len = strlen(test);
-        assert_se(journal_file_append_entry(f, &ts, &iovec, 1, NULL, NULL, NULL) == 0);
-
-        journal_file_dump(f);
-
-        assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 1);
-
-        assert(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 2);
-
-        assert(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 3);
-
-        assert(journal_file_next_entry(f, o, p, DIRECTION_DOWN, &o, &p) == 0);
-
-        assert(journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 1);
-
-        assert(journal_file_skip_entry(f, o, p, 2, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 3);
-
-        assert(journal_file_skip_entry(f, o, p, -2, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 1);
-
-        assert(journal_file_skip_entry(f, o, p, -2, &o, &p) == 1);
-        assert(le64toh(o->entry.seqnum) == 1);
-
-        assert(journal_file_find_data_object(f, test, strlen(test), NULL, &p) == 1);
-        assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_DOWN, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 1);
-
-        assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_UP, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 3);
-
-        assert(journal_file_find_data_object(f, test2, strlen(test2), NULL, &p) == 1);
-        assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_UP, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 2);
-
-        assert(journal_file_next_entry_for_data(f, NULL, 0, p, DIRECTION_DOWN, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 2);
-
-        assert(journal_file_find_data_object(f, "quux", 4, NULL, &p) == 0);
-
-        assert(journal_file_move_to_entry_by_seqnum(f, 1, DIRECTION_DOWN, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 1);
-
-        assert(journal_file_move_to_entry_by_seqnum(f, 3, DIRECTION_DOWN, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 3);
-
-        assert(journal_file_move_to_entry_by_seqnum(f, 2, DIRECTION_DOWN, &o, NULL) == 1);
-        assert(le64toh(o->entry.seqnum) == 2);
-
-        assert(journal_file_move_to_entry_by_seqnum(f, 10, DIRECTION_DOWN, &o, NULL) == 0);
-
-        journal_file_rotate(&f);
-        journal_file_rotate(&f);
-
-        journal_file_close(f);
-
-        journal_directory_vacuum(".", 3000000, 0);
-
-        log_error("Exiting...");
-
-        return 0;
-}
similarity index 100%
rename from src/locale/kbd-model-map
rename to src/kbd-model-map
index dc35156..7bd7dcb 100644 (file)
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <libkmod.h>
 
 #include "macro.h"
 #include "execute.h"
@@ -36,20 +35,13 @@ static const char * const kmod_table[] = {
         "unix",    "/proc/net/unix"
 };
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-static void systemd_kmod_log(void *data, int priority, const char *file, int line,
-                             const char *fn, const char *format, va_list args)
-{
-        log_meta(priority, file, line, fn, format, args);
-}
-#pragma GCC diagnostic pop
-
 int kmod_setup(void) {
-        unsigned i;
-        struct kmod_ctx *ctx = NULL;
-        struct kmod_module *mod;
-        int err;
+        unsigned i, n = 0;
+        const char * cmdline[3 + ELEMENTSOF(kmod_table) + 1];
+        ExecCommand command;
+        ExecContext context;
+        pid_t pid;
+        int r;
 
         for (i = 0; i < ELEMENTSOF(kmod_table); i += 2) {
 
@@ -57,40 +49,34 @@ int kmod_setup(void) {
                         continue;
 
                 log_debug("Your kernel apparently lacks built-in %s support. Might be a good idea to compile it in. "
-                          "We'll now try to work around this by loading the module...",
-                          kmod_table[i]);
+                          "We'll now try to work around this by calling '/sbin/modprobe %s'...",
+                          kmod_table[i], kmod_table[i]);
+
+                cmdline[3 + n++] = kmod_table[i];
+        }
 
-                if (!ctx) {
-                        ctx = kmod_new(NULL, NULL);
-                        if (!ctx) {
-                                log_error("Failed to allocate memory for kmod");
-                                return -ENOMEM;
-                        }
+        if (n <= 0)
+                return 0;
 
-                        kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
+        cmdline[0] = "/sbin/modprobe";
+        cmdline[1] = "-qab";
+        cmdline[2] = "--";
+        cmdline[3 + n] = NULL;
 
-                        kmod_load_resources(ctx);
-                }
+        zero(command);
+        zero(context);
 
-                err = kmod_module_new_from_name(ctx, kmod_table[i], &mod);
-                if (err < 0) {
-                        log_error("Failed to load module '%s'", kmod_table[i]);
-                        continue;
-                }
+        command.path = (char*) cmdline[0];
+        command.argv = (char**) cmdline;
 
-                err = kmod_module_probe_insert_module(mod, KMOD_PROBE_APPLY_BLACKLIST, NULL, NULL, NULL, NULL);
-                if (err == 0)
-                        log_info("Inserted module '%s'", kmod_module_get_name(mod));
-                else if (err == KMOD_PROBE_APPLY_BLACKLIST)
-                        log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
-                else
-                        log_error("Failed to insert '%s'", kmod_module_get_name(mod));
+        exec_context_init(&context);
+        r = exec_spawn(&command, NULL, &context, NULL, 0, NULL, false, false, false, false, NULL, NULL, &pid);
+        exec_context_done(&context);
 
-                kmod_module_unref(mod);
+        if (r < 0) {
+                log_error("Failed to spawn %s: %s", cmdline[0], strerror(-r));
+                return r;
         }
 
-        if (ctx)
-                ctx = kmod_unref(ctx);
-
-        return 0;
+        return wait_for_terminate_and_warn(cmdline[0], pid);
 }
diff --git a/src/kmsg-syslogd.c b/src/kmsg-syslogd.c
new file mode 100644 (file)
index 0000000..0901a0e
--- /dev/null
@@ -0,0 +1,513 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <assert.h>
+#include <time.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/poll.h>
+#include <sys/epoll.h>
+#include <sys/un.h>
+#include <fcntl.h>
+#include <sys/signalfd.h>
+
+#include "util.h"
+#include "log.h"
+#include "sd-daemon.h"
+#include "fdset.h"
+
+#define SERVER_FD_MAX 16
+
+typedef struct Stream Stream;
+
+typedef struct Server {
+        FDSet *syslog_fds;
+        int kmsg_fd;
+        int epoll_fd;
+        int signal_fd;
+} Server;
+
+static void server_done(Server *s) {
+        assert(s);
+
+        if (s->epoll_fd >= 0)
+                close_nointr_nofail(s->epoll_fd);
+
+        if (s->kmsg_fd >= 0)
+                close_nointr_nofail(s->kmsg_fd);
+
+        if (s->signal_fd >= 0)
+                close_nointr_nofail(s->signal_fd);
+
+        if (s->syslog_fds)
+                fdset_free(s->syslog_fds);
+}
+
+static int server_init(Server *s, unsigned n_sockets) {
+        int r;
+        unsigned i;
+        struct epoll_event ev;
+        sigset_t mask;
+
+        assert(s);
+        assert(n_sockets > 0);
+
+        zero(*s);
+
+        s->kmsg_fd = s->signal_fd = -1;
+
+        if ((s->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) {
+                r = -errno;
+                log_error("Failed to create epoll object: %s", strerror(errno));
+                goto fail;
+        }
+
+        if (!(s->syslog_fds = fdset_new())) {
+                r = -ENOMEM;
+                log_error("Failed to allocate file descriptor set: %s", strerror(errno));
+                goto fail;
+        }
+
+        for (i = 0; i < n_sockets; i++) {
+                int fd, one = 1;
+
+                fd = SD_LISTEN_FDS_START+i;
+
+                if ((r = sd_is_socket(fd, AF_UNSPEC, SOCK_DGRAM, -1)) < 0) {
+                        log_error("Failed to determine file descriptor type: %s", strerror(-r));
+                        goto fail;
+                }
+
+                if (!r) {
+                        log_error("Wrong file descriptor type.");
+                        r = -EINVAL;
+                        goto fail;
+                }
+
+                if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0)
+                        log_error("SO_PASSCRED failed: %m");
+
+                zero(ev);
+                ev.events = EPOLLIN;
+                ev.data.fd = fd;
+                if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
+                        r = -errno;
+                        log_error("Failed to add server fd to epoll object: %s", strerror(errno));
+                        goto fail;
+                }
+
+                if ((r = fdset_put(s->syslog_fds, fd)) < 0) {
+                        log_error("Failed to store file descriptor in set: %s", strerror(-r));
+                        goto fail;
+                }
+        }
+
+        if ((s->kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
+                log_error("Failed to open /dev/kmsg for logging: %m");
+                return -errno;
+        }
+
+        assert_se(sigemptyset(&mask) == 0);
+        sigset_add_many(&mask, SIGINT, SIGTERM, -1);
+        assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+
+        if ((s->signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0) {
+                log_error("signalfd(): %m");
+                return -errno;
+        }
+
+        zero(ev);
+        ev.events = EPOLLIN;
+        ev.data.fd = s->signal_fd;
+
+        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, s->signal_fd, &ev) < 0) {
+                log_error("epoll_ctl(): %m");
+                return -errno;
+        }
+
+        return 0;
+
+fail:
+        server_done(s);
+        return r;
+}
+
+static void skip_date(const char **buf) {
+        enum {
+                LETTER,
+                SPACE,
+                NUMBER,
+                SPACE_OR_NUMBER,
+                COLON
+        } sequence[] = {
+                LETTER, LETTER, LETTER,
+                SPACE,
+                SPACE_OR_NUMBER, NUMBER,
+                SPACE,
+                SPACE_OR_NUMBER, NUMBER,
+                COLON,
+                SPACE_OR_NUMBER, NUMBER,
+                COLON,
+                SPACE_OR_NUMBER, NUMBER,
+                SPACE
+        };
+
+        const char *p;
+        unsigned i;
+
+        assert(buf);
+        assert(*buf);
+
+        p = *buf;
+
+        for (i = 0; i < ELEMENTSOF(sequence); i++, p++) {
+
+                if (!*p)
+                        return;
+
+                switch (sequence[i]) {
+
+                case SPACE:
+                        if (*p != ' ')
+                                return;
+                        break;
+
+                case SPACE_OR_NUMBER:
+                        if (*p == ' ')
+                                break;
+
+                        /* fall through */
+
+                case NUMBER:
+                        if (*p < '0' || *p > '9')
+                                return;
+
+                        break;
+
+                case LETTER:
+                        if (!(*p >= 'A' && *p <= 'Z') &&
+                            !(*p >= 'a' && *p <= 'z'))
+                                return;
+
+                        break;
+
+                case COLON:
+                        if (*p != ':')
+                                return;
+                        break;
+
+                }
+        }
+
+        *buf = p;
+}
+
+static int read_process(const char **buf, struct iovec *iovec) {
+        const char *p;
+        size_t l;
+
+        assert(buf);
+        assert(*buf);
+        assert(iovec);
+
+        p = *buf;
+
+        p += strspn(p, WHITESPACE);
+        l = strcspn(p, WHITESPACE);
+
+        if (l <= 0 ||
+            p[l-1] != ':')
+                return 0;
+
+        l--;
+
+        if (p[l-1] == ']') {
+                size_t k = l-1;
+
+                for (;;) {
+
+                        if (p[k] == '[') {
+                                l = k;
+                                break;
+                        }
+
+                        if (k == 0)
+                                break;
+
+                        k--;
+                }
+        }
+
+        iovec->iov_base = (char*) p;
+        iovec->iov_len = l;
+        *buf = p + l;
+        return 1;
+}
+
+static void skip_pid(const char **buf) {
+        const char *p;
+
+        assert(buf);
+        assert(*buf);
+
+        p = *buf;
+
+        if (*p != '[')
+                return;
+
+        p++;
+        p += strspn(p, "0123456789");
+
+        if (*p != ']')
+                return;
+
+        p++;
+
+        *buf = p;
+}
+
+static int write_message(Server *s, const char *buf, struct ucred *ucred) {
+        ssize_t k;
+        char priority[6], pid[16];
+        struct iovec iovec[5];
+        unsigned i = 0;
+        char *process = NULL;
+        int r = 0;
+        int prio = LOG_USER | LOG_INFO;
+
+        assert(s);
+        assert(buf);
+
+        parse_syslog_priority((char**) &buf, &prio);
+
+        if (*buf == 0)
+                return 0;
+
+        if ((prio & LOG_FACMASK) == 0)
+                prio = LOG_USER | LOG_PRI(prio);
+
+        /* First, set priority field */
+        snprintf(priority, sizeof(priority), "<%i>", prio);
+        char_array_0(priority);
+        IOVEC_SET_STRING(iovec[i++], priority);
+
+        /* Second, skip date */
+        skip_date(&buf);
+
+        /* Then, add process if set */
+        if (read_process(&buf, &iovec[i]) > 0)
+                i++;
+        else if (ucred &&
+                 ucred->pid > 0 &&
+                 get_process_name(ucred->pid, &process) >= 0)
+                IOVEC_SET_STRING(iovec[i++], process);
+
+        /* Skip the stored PID if we have a better one */
+        if (ucred) {
+                snprintf(pid, sizeof(pid), "[%lu]: ", (unsigned long) ucred->pid);
+                char_array_0(pid);
+                IOVEC_SET_STRING(iovec[i++], pid);
+
+                skip_pid(&buf);
+
+                if (*buf == ':')
+                        buf++;
+
+                buf += strspn(buf, WHITESPACE);
+        }
+
+        /* Is the remaining message empty? */
+        if (*buf) {
+
+                /* And the rest is the message */
+                IOVEC_SET_STRING(iovec[i++], buf);
+                IOVEC_SET_STRING(iovec[i++], "\n");
+
+                if ((k = writev(s->kmsg_fd, iovec, i)) <= 0) {
+                        log_error("Failed to write log message to kmsg: %s", k < 0 ? strerror(errno) : "short write");
+                        r = k < 0 ? -errno : -EIO;
+                }
+        }
+
+        free(process);
+
+        return r;
+}
+
+static int process_event(Server *s, struct epoll_event *ev) {
+        assert(s);
+
+        if (ev->events != EPOLLIN) {
+                log_info("Got invalid event from epoll.");
+                return -EIO;
+        }
+
+        if (ev->data.fd == s->signal_fd) {
+                struct signalfd_siginfo sfsi;
+                ssize_t n;
+
+                if ((n = read(s->signal_fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
+
+                        if (n >= 0)
+                                return -EIO;
+
+                        if (errno == EINTR || errno == EAGAIN)
+                                return 0;
+
+                        return -errno;
+                }
+
+                log_debug("Received SIG%s", signal_to_string(sfsi.ssi_signo));
+                return 0;
+
+        } else {
+                for (;;) {
+                        char buf[LINE_MAX+1];
+                        struct msghdr msghdr;
+                        struct iovec iovec;
+                        struct ucred *ucred;
+                        union {
+                                struct cmsghdr cmsghdr;
+                                uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
+                        } control;
+                        ssize_t n;
+                        int k;
+                        char *e;
+
+                        zero(iovec);
+                        iovec.iov_base = buf;
+                        iovec.iov_len = sizeof(buf)-1;
+
+                        zero(control);
+                        zero(msghdr);
+                        msghdr.msg_iov = &iovec;
+                        msghdr.msg_iovlen = 1;
+                        msghdr.msg_control = &control;
+                        msghdr.msg_controllen = sizeof(control);
+
+                        if ((n = recvmsg(ev->data.fd, &msghdr, MSG_DONTWAIT)) < 0) {
+
+                                if (errno == EINTR || errno == EAGAIN)
+                                        return 1;
+
+                                log_error("recvmsg() failed: %m");
+                                return -errno;
+                        }
+
+                        if (msghdr.msg_controllen >= CMSG_LEN(sizeof(struct ucred)) &&
+                            control.cmsghdr.cmsg_level == SOL_SOCKET &&
+                            control.cmsghdr.cmsg_type == SCM_CREDENTIALS &&
+                            control.cmsghdr.cmsg_len == CMSG_LEN(sizeof(struct ucred)))
+                                ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr);
+                        else
+                                ucred = NULL;
+
+                        if ((e = memchr(buf, '\n', n)))
+                                *e = 0;
+                        else
+                                buf[n] = 0;
+
+                        if ((k = write_message(s, strstrip(buf), ucred)) < 0)
+                                return k;
+                }
+        }
+
+        return 1;
+}
+
+int main(int argc, char *argv[]) {
+        Server server;
+        int r = EXIT_FAILURE, n;
+
+        if (getppid() != 1) {
+                log_error("This program should be invoked by init only.");
+                return EXIT_FAILURE;
+        }
+
+        if (argc > 1) {
+                log_error("This program does not take arguments.");
+                return EXIT_FAILURE;
+        }
+
+        log_set_target(LOG_TARGET_KMSG);
+        log_parse_environment();
+        log_open();
+
+        umask(0022);
+
+        if ((n = sd_listen_fds(true)) < 0) {
+                log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
+                return EXIT_FAILURE;
+        }
+
+        if (n <= 0 || n > SERVER_FD_MAX) {
+                log_error("No or too many file descriptors passed.");
+                return EXIT_FAILURE;
+        }
+
+        if (server_init(&server, (unsigned) n) < 0)
+                return EXIT_FAILURE;
+
+        log_debug("systemd-kmsg-syslogd running as pid %lu", (unsigned long) getpid());
+
+        sd_notify(false,
+                  "READY=1\n"
+                  "STATUS=Processing messages...");
+
+        for (;;) {
+                struct epoll_event event;
+                int k;
+
+                if ((k = epoll_wait(server.epoll_fd, &event, 1, -1)) < 0) {
+
+                        if (errno == EINTR)
+                                continue;
+
+                        log_error("epoll_wait() failed: %m");
+                        goto fail;
+                }
+
+                if (k <= 0)
+                        break;
+
+                if ((k = process_event(&server, &event)) < 0)
+                        goto fail;
+
+                if (k == 0)
+                        break;
+        }
+
+        r = EXIT_SUCCESS;
+
+        log_debug("systemd-kmsg-syslogd stopped as pid %lu", (unsigned long) getpid());
+
+fail:
+        sd_notify(false,
+                  "STATUS=Shutting down...");
+
+        server_done(&server);
+
+        return r;
+}
index 2c887a0..d9d195b 100644 (file)
@@ -109,7 +109,7 @@ int label_fix(const char *path, bool ignore_enoent) {
                         return 0;
 
                 if (r == 0) {
-                        r = lsetfilecon(path, fcon);
+                        r = setfilecon(path, fcon);
                         freecon(fcon);
 
                         /* If the FS doesn't support labels, then exit without warning */
diff --git a/src/libsystemd-id128.sym b/src/libsystemd-id128.sym
deleted file mode 100644 (file)
index 2373fe6..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/***
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-***/
-
-/* Original symbols from systemd v38 */
-
-LIBSYSTEMD_ID128_38 {
-global:
-        sd_id128_to_string;
-        sd_id128_from_string;
-        sd_id128_randomize;
-        sd_id128_get_machine;
-        sd_id128_get_boot;
-local:
-        *;
-};
similarity index 78%
rename from src/login/libsystemd-login.sym
rename to src/libsystemd-login.sym
index a5e6c1e..0d51fa7 100644 (file)
@@ -33,16 +33,3 @@ global:
 local:
         *;
 };
-
-LIBSYSTEMD_LOGIN_38 {
-global:
-        sd_pid_get_unit;
-        sd_session_get_service;
-} LIBSYSTEMD_LOGIN_31;
-
-LIBSYSTEMD_LOGIN_43 {
-global:
-        sd_session_get_type;
-        sd_session_get_class;
-        sd_session_get_display;
-} LIBSYSTEMD_LOGIN_38;
index d869ee0..d114faa 100644 (file)
@@ -61,7 +61,7 @@ static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
                 free(f);
 
                 if (r < 0)
-                        log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->id, strerror(-r));
+                        log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->meta.id, strerror(-r));
         }
 
         r = 0;
@@ -84,8 +84,8 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
         if (!path)
                 return -ENOMEM;
 
-        if (u->manager->unit_path_cache &&
-            !set_get(u->manager->unit_path_cache, path))
+        if (u->meta.manager->unit_path_cache &&
+            !set_get(u->meta.manager->unit_path_cache, path))
                 r = 0;
         else
                 r = iterate_dir(u, path, dependency);
@@ -94,7 +94,7 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
         if (r < 0)
                 return r;
 
-        if (u->instance) {
+        if (u->meta.instance) {
                 char *template;
                 /* Also try the template dir */
 
@@ -108,8 +108,8 @@ static int process_dir(Unit *u, const char *unit_path, const char *name, const c
                 if (!path)
                         return -ENOMEM;
 
-                if (u->manager->unit_path_cache &&
-                    !set_get(u->manager->unit_path_cache, path))
+                if (u->meta.manager->unit_path_cache &&
+                    !set_get(u->meta.manager->unit_path_cache, path))
                         r = 0;
                 else
                         r = iterate_dir(u, path, dependency);
@@ -130,10 +130,10 @@ int unit_load_dropin(Unit *u) {
 
         /* Load dependencies from supplementary drop-in directories */
 
-        SET_FOREACH(t, u->names, i) {
+        SET_FOREACH(t, u->meta.names, i) {
                 char **p;
 
-                STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
+                STRV_FOREACH(p, u->meta.manager->lookup_paths.unit_path) {
                         int r;
 
                         r = process_dir(u, *p, t, ".wants", UNIT_WANTS);
index 44ce4bb..41797d2 100644 (file)
@@ -85,13 +85,11 @@ $1.PAMName,                      config_parse_unit_string_printf,    0,
 $1.KillMode,                     config_parse_kill_mode,             0,                             offsetof($1, exec_context.kill_mode)
 $1.KillSignal,                   config_parse_kill_signal,           0,                             offsetof($1, exec_context.kill_signal)
 $1.SendSIGKILL,                  config_parse_bool,                  0,                             offsetof($1, exec_context.send_sigkill)
-$1.IgnoreSIGPIPE,                config_parse_bool,                  0,                             offsetof($1, exec_context.ignore_sigpipe)
 $1.UtmpIdentifier,               config_parse_unit_string_printf,    0,                             offsetof($1, exec_context.utmp_id)
-$1.ControlGroupModify,           config_parse_bool,                  0,                             offsetof($1, exec_context.control_group_modify)
-$1.ControlGroupPersistent,       config_parse_tristate,              0,                             offsetof($1, exec_context.control_group_persistent)'
+$1.ControlGroupModify,           config_parse_bool,                  0,                             offsetof($1, exec_context.control_group_modify)'
 )m4_dnl
 Unit.Names,                      config_parse_unit_names,            0,                             0
-Unit.Description,                config_parse_unit_string_printf,    0,                             offsetof(Unit, description)
+Unit.Description,                config_parse_unit_string_printf,    0,                             offsetof(Meta, description)
 Unit.Requires,                   config_parse_unit_deps,             UNIT_REQUIRES,                 0
 Unit.RequiresOverridable,        config_parse_unit_deps,             UNIT_REQUIRES_OVERRIDABLE,     0
 Unit.Requisite,                  config_parse_unit_deps,             UNIT_REQUISITE,                0
@@ -102,17 +100,15 @@ Unit.Conflicts,                  config_parse_unit_deps,             UNIT_CONFLI
 Unit.Before,                     config_parse_unit_deps,             UNIT_BEFORE,                   0
 Unit.After,                      config_parse_unit_deps,             UNIT_AFTER,                    0
 Unit.OnFailure,                  config_parse_unit_deps,             UNIT_ON_FAILURE,               0
-Unit.PropagateReloadTo,          config_parse_unit_deps,             UNIT_PROPAGATE_RELOAD_TO,      0
-Unit.PropagateReloadFrom,        config_parse_unit_deps,             UNIT_PROPAGATE_RELOAD_FROM,    0
-Unit.StopWhenUnneeded,           config_parse_bool,                  0,                             offsetof(Unit, stop_when_unneeded)
-Unit.RefuseManualStart,          config_parse_bool,                  0,                             offsetof(Unit, refuse_manual_start)
-Unit.RefuseManualStop,           config_parse_bool,                  0,                             offsetof(Unit, refuse_manual_stop)
-Unit.AllowIsolate,               config_parse_bool,                  0,                             offsetof(Unit, allow_isolate)
-Unit.DefaultDependencies,        config_parse_bool,                  0,                             offsetof(Unit, default_dependencies)
-Unit.OnFailureIsolate,           config_parse_bool,                  0,                             offsetof(Unit, on_failure_isolate)
-Unit.IgnoreOnIsolate,            config_parse_bool,                  0,                             offsetof(Unit, ignore_on_isolate)
-Unit.IgnoreOnSnapshot,           config_parse_bool,                  0,                             offsetof(Unit, ignore_on_snapshot)
-Unit.JobTimeoutSec,              config_parse_usec,                  0,                             offsetof(Unit, job_timeout)
+Unit.StopWhenUnneeded,           config_parse_bool,                  0,                             offsetof(Meta, stop_when_unneeded)
+Unit.RefuseManualStart,          config_parse_bool,                  0,                             offsetof(Meta, refuse_manual_start)
+Unit.RefuseManualStop,           config_parse_bool,                  0,                             offsetof(Meta, refuse_manual_stop)
+Unit.AllowIsolate,               config_parse_bool,                  0,                             offsetof(Meta, allow_isolate)
+Unit.DefaultDependencies,        config_parse_bool,                  0,                             offsetof(Meta, default_dependencies)
+Unit.OnFailureIsolate,           config_parse_bool,                  0,                             offsetof(Meta, on_failure_isolate)
+Unit.IgnoreOnIsolate,            config_parse_bool,                  0,                             offsetof(Meta, ignore_on_isolate)
+Unit.IgnoreOnSnapshot,           config_parse_bool,                  0,                             offsetof(Meta, ignore_on_snapshot)
+Unit.JobTimeoutSec,              config_parse_usec,                  0,                             offsetof(Meta, job_timeout)
 Unit.ConditionPathExists,        config_parse_unit_condition_path,   CONDITION_PATH_EXISTS,         0
 Unit.ConditionPathExistsGlob,    config_parse_unit_condition_path,   CONDITION_PATH_EXISTS_GLOB,    0
 Unit.ConditionPathIsDirectory,   config_parse_unit_condition_path,   CONDITION_PATH_IS_DIRECTORY,   0
@@ -135,10 +131,6 @@ Service.ExecStop,                config_parse_exec,                  SERVICE_EXE
 Service.ExecStopPost,            config_parse_exec,                  SERVICE_EXEC_STOP_POST,        offsetof(Service, exec_command)
 Service.RestartSec,              config_parse_usec,                  0,                             offsetof(Service, restart_usec)
 Service.TimeoutSec,              config_parse_usec,                  0,                             offsetof(Service, timeout_usec)
-Service.WatchdogSec,             config_parse_usec,                  0,                             offsetof(Service, watchdog_usec)
-Service.StartLimitInterval,      config_parse_usec,                  0,                             offsetof(Service, start_limit.interval)
-Service.StartLimitBurst,         config_parse_unsigned,              0,                             offsetof(Service, start_limit.burst)
-Service.StartLimitAction,        config_parse_start_limit_action,    0,                             offsetof(Service, start_limit_action)
 Service.Type,                    config_parse_service_type,          0,                             offsetof(Service, type)
 Service.Restart,                 config_parse_service_restart,       0,                             offsetof(Service, restart)
 Service.PermissionsStartOnly,    config_parse_bool,                  0,                             offsetof(Service, permissions_start_only)
@@ -176,16 +168,15 @@ Socket.Accept,                   config_parse_bool,                  0,
 Socket.MaxConnections,           config_parse_unsigned,              0,                             offsetof(Socket, max_connections)
 Socket.KeepAlive,                config_parse_bool,                  0,                             offsetof(Socket, keep_alive)
 Socket.Priority,                 config_parse_int,                   0,                             offsetof(Socket, priority)
-Socket.ReceiveBuffer,            config_parse_bytes_size,            0,                             offsetof(Socket, receive_buffer)
-Socket.SendBuffer,               config_parse_bytes_size,            0,                             offsetof(Socket, send_buffer)
+Socket.ReceiveBuffer,            config_parse_size,                  0,                             offsetof(Socket, receive_buffer)
+Socket.SendBuffer,               config_parse_size,                  0,                             offsetof(Socket, send_buffer)
 Socket.IPTOS,                    config_parse_ip_tos,                0,                             offsetof(Socket, ip_tos)
 Socket.IPTTL,                    config_parse_int,                   0,                             offsetof(Socket, ip_ttl)
 Socket.Mark,                     config_parse_int,                   0,                             offsetof(Socket, mark)
-Socket.PipeSize,                 config_parse_bytes_size,            0,                             offsetof(Socket, pipe_size)
+Socket.PipeSize,                 config_parse_size,                  0,                             offsetof(Socket, pipe_size)
 Socket.FreeBind,                 config_parse_bool,                  0,                             offsetof(Socket, free_bind)
 Socket.Transparent,              config_parse_bool,                  0,                             offsetof(Socket, transparent)
 Socket.Broadcast,                config_parse_bool,                  0,                             offsetof(Socket, broadcast)
-Socket.PassCredentials,          config_parse_bool,                  0,                             offsetof(Socket, pass_cred)
 Socket.TCPCongestion,            config_parse_string,                0,                             offsetof(Socket, tcp_congestion)
 Socket.MessageQueueMaxMessages,  config_parse_long,                  0,                             offsetof(Socket, mq_maxmsg)
 Socket.MessageQueueMessageSize,  config_parse_long,                  0,                             offsetof(Socket, mq_msgsize)
@@ -218,7 +209,6 @@ m4_dnl
 Path.PathExists,                 config_parse_path_spec,             0,                             0
 Path.PathExistsGlob,             config_parse_path_spec,             0,                             0
 Path.PathChanged,                config_parse_path_spec,             0,                             0
-Path.PathModified,               config_parse_path_spec,             0,                             0
 Path.DirectoryNotEmpty,          config_parse_path_spec,             0,                             0
 Path.Unit,                       config_parse_path_unit,             0,                             0
 Path.MakeDirectory,              config_parse_bool,                  0,                             offsetof(Path, make_directory)
index b963d7f..12079c6 100644 (file)
@@ -84,8 +84,7 @@ int config_parse_unit_deps(
                 char *t, *k;
                 int r;
 
-                t = strndup(w, l);
-                if (!t)
+                if (!(t = strndup(w, l)))
                         return -ENOMEM;
 
                 k = unit_name_printf(u, t);
@@ -95,8 +94,12 @@ int config_parse_unit_deps(
                         return -ENOMEM;
 
                 r = unit_add_dependency_by_name(u, d, k, NULL, true);
-                if (r < 0)
-                        log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", filename, line, k, strerror(-r));
+
+                if (r < 0) {
+                        log_error("Failed to add dependency on %s, ignoring: %s", k, strerror(-r));
+                        free(k);
+                        return 0;
+                }
 
                 free(k);
         }
@@ -269,7 +272,7 @@ int config_parse_socket_listen(
         assert(rvalue);
         assert(data);
 
-        s = SOCKET(data);
+        s = (Socket*) data;
 
         if (!(p = new0(SocketPort, 1)))
                 return -ENOMEM;
@@ -380,7 +383,7 @@ int config_parse_socket_bind(
         assert(rvalue);
         assert(data);
 
-        s = SOCKET(data);
+        s = (Socket*) data;
 
         if ((b = socket_address_bind_ipv6_only_from_string(rvalue)) < 0) {
                 int r;
@@ -1262,7 +1265,6 @@ int config_parse_timer_unit(
         Timer *t = data;
         int r;
         DBusError error;
-        Unit *u;
 
         assert(filename);
         assert(lvalue);
@@ -1276,15 +1278,12 @@ int config_parse_timer_unit(
                 return 0;
         }
 
-        r = manager_load_unit(UNIT(t)->manager, rvalue, NULL, NULL, &u);
-        if (r < 0) {
+        if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, NULL, &t->unit)) < 0) {
                 log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
                 dbus_error_free(&error);
                 return 0;
         }
 
-        unit_ref_set(&t->unit, u);
-
         return 0;
 }
 
@@ -1348,7 +1347,6 @@ int config_parse_path_unit(
         Path *t = data;
         int r;
         DBusError error;
-        Unit *u;
 
         assert(filename);
         assert(lvalue);
@@ -1362,14 +1360,12 @@ int config_parse_path_unit(
                 return 0;
         }
 
-        if ((r = manager_load_unit(UNIT(t)->manager, rvalue, NULL, &error, &u)) < 0) {
+        if ((r = manager_load_unit(t->meta.manager, rvalue, NULL, &error, &t->unit)) < 0) {
                 log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
                 dbus_error_free(&error);
                 return 0;
         }
 
-        unit_ref_set(&t->unit, u);
-
         return 0;
 }
 
@@ -1386,7 +1382,6 @@ int config_parse_socket_service(
         Socket *s = data;
         int r;
         DBusError error;
-        Unit *x;
 
         assert(filename);
         assert(lvalue);
@@ -1400,15 +1395,12 @@ int config_parse_socket_service(
                 return 0;
         }
 
-        r = manager_load_unit(UNIT(s)->manager, rvalue, NULL, &error, &x);
-        if (r < 0) {
+        if ((r = manager_load_unit(s->meta.manager, rvalue, NULL, &error, (Unit**) &s->service)) < 0) {
                 log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
                 dbus_error_free(&error);
                 return 0;
         }
 
-        unit_ref_set(&s->service, x);
-
         return 0;
 }
 
@@ -1424,6 +1416,7 @@ int config_parse_service_sockets(
 
         Service *s = data;
         int r;
+        DBusError error;
         char *state, *w;
         size_t l;
 
@@ -1432,34 +1425,35 @@ int config_parse_service_sockets(
         assert(rvalue);
         assert(data);
 
-        FOREACH_WORD_QUOTED(w, l, rvalue, state) {
-                char *t, *k;
-
-                t = strndup(w, l);
-                if (!t)
-                        return -ENOMEM;
+        dbus_error_init(&error);
 
-                k = unit_name_printf(UNIT(s), t);
-                free(t);
+        FOREACH_WORD_QUOTED(w, l, rvalue, state) {
+                char *t;
+                Unit *sock;
 
-                if (!k)
+                if (!(t = strndup(w, l)))
                         return -ENOMEM;
 
-                if (!endswith(k, ".socket")) {
+                if (!endswith(t, ".socket")) {
                         log_error("[%s:%u] Unit must be of type socket, ignoring: %s", filename, line, rvalue);
-                        free(k);
+                        free(t);
                         continue;
                 }
 
-                r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_WANTS, UNIT_AFTER, k, NULL, true);
-                if (r < 0)
-                        log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", filename, line, k, strerror(-r));
+                r = manager_load_unit(s->meta.manager, t, NULL, &error, &sock);
+                free(t);
 
-                r = unit_add_dependency_by_name(UNIT(s), UNIT_TRIGGERED_BY, k, NULL, true);
-                if (r < 0)
+                if (r < 0) {
+                        log_error("[%s:%u] Failed to load unit %s, ignoring: %s", filename, line, rvalue, bus_error(&error, r));
+                        dbus_error_free(&error);
+                        continue;
+                }
+
+                if ((r = set_ensure_allocated(&s->configured_sockets, trivial_hash_func, trivial_compare_func)) < 0)
                         return r;
 
-                free(k);
+                if ((r = set_put(s->configured_sockets, sock)) < 0)
+                        return r;
         }
 
         return 0;
@@ -1569,7 +1563,7 @@ int config_parse_unit_condition_path(
         if (!c)
                 return -ENOMEM;
 
-        LIST_PREPEND(Condition, conditions, u->conditions, c);
+        LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
         return 0;
 }
 
@@ -1602,7 +1596,7 @@ int config_parse_unit_condition_string(
         if (!(c = condition_new(cond, rvalue, trigger, negate)))
                 return -ENOMEM;
 
-        LIST_PREPEND(Condition, conditions, u->conditions, c);
+        LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
         return 0;
 }
 
@@ -1643,12 +1637,11 @@ int config_parse_unit_condition_null(
         if (!(c = condition_new(CONDITION_NULL, NULL, trigger, negate)))
                 return -ENOMEM;
 
-        LIST_PREPEND(Condition, conditions, u->conditions, c);
+        LIST_PREPEND(Condition, conditions, u->meta.conditions, c);
         return 0;
 }
 
 DEFINE_CONFIG_PARSE_ENUM(config_parse_notify_access, notify_access, NotifyAccess, "Failed to parse notify access specifier");
-DEFINE_CONFIG_PARSE_ENUM(config_parse_start_limit_action, start_limit_action, StartLimitAction, "Failed to parse start limit action specifier");
 
 int config_parse_unit_cgroup_attr(
                 const char *filename,
@@ -2110,7 +2103,7 @@ static int merge_by_names(Unit **u, Set *names, const char *id) {
                          * ours? Then let's try it the other way
                          * round */
 
-                        other = manager_get_unit((*u)->manager, k);
+                        other = manager_get_unit((*u)->meta.manager, k);
                         free(k);
 
                         if (other)
@@ -2164,7 +2157,7 @@ static int load_from_path(Unit *u, const char *path) {
         } else  {
                 char **p;
 
-                STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
+                STRV_FOREACH(p, u->meta.manager->lookup_paths.unit_path) {
 
                         /* Instead of opening the path right away, we manually
                          * follow all symlinks and add their name to our unit
@@ -2174,8 +2167,8 @@ static int load_from_path(Unit *u, const char *path) {
                                 goto finish;
                         }
 
-                        if (u->manager->unit_path_cache &&
-                            !set_get(u->manager->unit_path_cache, filename))
+                        if (u->meta.manager->unit_path_cache &&
+                            !set_get(u->meta.manager->unit_path_cache, filename))
                                 r = -ENOENT;
                         else
                                 r = open_follow(&filename, &f, symlink_names, &id);
@@ -2211,7 +2204,7 @@ static int load_from_path(Unit *u, const char *path) {
                 goto finish;
 
         if (merged != u) {
-                u->load_state = UNIT_MERGED;
+                u->meta.load_state = UNIT_MERGED;
                 r = 0;
                 goto finish;
         }
@@ -2223,21 +2216,21 @@ static int load_from_path(Unit *u, const char *path) {
         }
 
         if (null_or_empty(&st))
-                u->load_state = UNIT_MASKED;
+                u->meta.load_state = UNIT_MASKED;
         else {
                 /* Now, parse the file contents */
                 r = config_parse(filename, f, UNIT_VTABLE(u)->sections, config_item_perf_lookup, (void*) load_fragment_gperf_lookup, false, u);
                 if (r < 0)
                         goto finish;
 
-                u->load_state = UNIT_LOADED;
+                u->meta.load_state = UNIT_LOADED;
         }
 
-        free(u->fragment_path);
-        u->fragment_path = filename;
+        free(u->meta.fragment_path);
+        u->meta.fragment_path = filename;
         filename = NULL;
 
-        u->fragment_mtime = timespec_load(&st.st_mtim);
+        u->meta.fragment_mtime = timespec_load(&st.st_mtim);
 
         r = 0;
 
@@ -2257,49 +2250,49 @@ int unit_load_fragment(Unit *u) {
         const char *t;
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
-        assert(u->id);
+        assert(u->meta.load_state == UNIT_STUB);
+        assert(u->meta.id);
 
         /* First, try to find the unit under its id. We always look
          * for unit files in the default directories, to make it easy
          * to override things by placing things in /etc/systemd/system */
-        if ((r = load_from_path(u, u->id)) < 0)
+        if ((r = load_from_path(u, u->meta.id)) < 0)
                 return r;
 
         /* Try to find an alias we can load this with */
-        if (u->load_state == UNIT_STUB)
-                SET_FOREACH(t, u->names, i) {
+        if (u->meta.load_state == UNIT_STUB)
+                SET_FOREACH(t, u->meta.names, i) {
 
-                        if (t == u->id)
+                        if (t == u->meta.id)
                                 continue;
 
                         if ((r = load_from_path(u, t)) < 0)
                                 return r;
 
-                        if (u->load_state != UNIT_STUB)
+                        if (u->meta.load_state != UNIT_STUB)
                                 break;
                 }
 
         /* And now, try looking for it under the suggested (originally linked) path */
-        if (u->load_state == UNIT_STUB && u->fragment_path) {
+        if (u->meta.load_state == UNIT_STUB && u->meta.fragment_path) {
 
-                if ((r = load_from_path(u, u->fragment_path)) < 0)
+                if ((r = load_from_path(u, u->meta.fragment_path)) < 0)
                         return r;
 
-                if (u->load_state == UNIT_STUB) {
+                if (u->meta.load_state == UNIT_STUB) {
                         /* Hmm, this didn't work? Then let's get rid
                          * of the fragment path stored for us, so that
                          * we don't point to an invalid location. */
-                        free(u->fragment_path);
-                        u->fragment_path = NULL;
+                        free(u->meta.fragment_path);
+                        u->meta.fragment_path = NULL;
                 }
         }
 
         /* Look for a template */
-        if (u->load_state == UNIT_STUB && u->instance) {
+        if (u->meta.load_state == UNIT_STUB && u->meta.instance) {
                 char *k;
 
-                if (!(k = unit_name_template(u->id)))
+                if (!(k = unit_name_template(u->meta.id)))
                         return -ENOMEM;
 
                 r = load_from_path(u, k);
@@ -2308,10 +2301,10 @@ int unit_load_fragment(Unit *u) {
                 if (r < 0)
                         return r;
 
-                if (u->load_state == UNIT_STUB)
-                        SET_FOREACH(t, u->names, i) {
+                if (u->meta.load_state == UNIT_STUB)
+                        SET_FOREACH(t, u->meta.names, i) {
 
-                                if (t == u->id)
+                                if (t == u->meta.id)
                                         continue;
 
                                 if (!(k = unit_name_template(t)))
@@ -2323,7 +2316,7 @@ int unit_load_fragment(Unit *u) {
                                 if (r < 0)
                                         return r;
 
-                                if (u->load_state != UNIT_STUB)
+                                if (u->meta.load_state != UNIT_STUB)
                                         break;
                         }
         }
@@ -2338,7 +2331,7 @@ void unit_dump_config_items(FILE *f) {
         } table[] = {
                 { config_parse_int,                   "INTEGER" },
                 { config_parse_unsigned,              "UNSIGNED" },
-                { config_parse_bytes_size,            "SIZE" },
+                { config_parse_size,                  "SIZE" },
                 { config_parse_bool,                  "BOOLEAN" },
                 { config_parse_string,                "STRING" },
                 { config_parse_path,                  "PATH" },
index 79fc76d..fbb31f9 100644 (file)
@@ -76,7 +76,6 @@ int config_parse_unit_condition_string(const char *filename, unsigned line, cons
 int config_parse_unit_condition_null(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_kill_mode(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_notify_access(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-int config_parse_start_limit_action(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_unit_cgroup_attr(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_unit_cpu_shares(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
 int config_parse_unit_memory_limit(const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
index 7f692e9..87ee022 100644 (file)
@@ -141,7 +141,7 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
         }
 
-#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
+#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) || defined(TARGET_SLP)
         if (r <= 0 &&
             (r = parse_env_file("/etc/default/locale", NEWLINE,
                                 "LANG",              &variables[VARIABLE_LANG],
@@ -199,7 +199,7 @@ int locale_setup(void) {
                 if (r != -ENOENT)
                         log_warning("Failed to read /etc/profile.env: %s", strerror(-r));
         }
-#elif defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA )
+#elif defined(TARGET_MANDRIVA)
         if (r <= 0 &&
             (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                 "LANG",              &variables[VARIABLE_LANG],
similarity index 87%
rename from src/locale/localed.c
rename to src/localed.c
index e9f9f86..c6b48de 100644 (file)
@@ -129,12 +129,8 @@ static char *data[_PROP_MAX] = {
         NULL
 };
 
-typedef struct State {
-        char *x11_layout, *x11_model, *x11_variant, *x11_options;
-        char *vc_keymap, *vc_keymap_toggle;
-} State;
-
-static State state;
+static char *x11_layout = NULL, *x11_model = NULL, *x11_variant = NULL, *x11_options = NULL;
+static char *vc_keymap = NULL, *vc_keymap_toggle = NULL;
 
 static usec_t remain_until = 0;
 
@@ -164,19 +160,19 @@ static void free_data_locale(void) {
 }
 
 static void free_data_x11(void) {
-        free(state.x11_layout);
-        free(state.x11_model);
-        free(state.x11_variant);
-        free(state.x11_options);
+        free(x11_layout);
+        free(x11_model);
+        free(x11_variant);
+        free(x11_options);
 
-        state.x11_layout = state.x11_model = state.x11_variant = state.x11_options = NULL;
+        x11_layout = x11_model = x11_variant = x11_options = NULL;
 }
 
 static void free_data_vconsole(void) {
-        free(state.vc_keymap);
-        free(state.vc_keymap_toggle);
+        free(vc_keymap);
+        free(vc_keymap_toggle);
 
-        state.vc_keymap = state.vc_keymap_toggle = NULL;
+        vc_keymap = vc_keymap_toggle = NULL;
 }
 
 static void simplify(void) {
@@ -252,8 +248,8 @@ static int read_data_vconsole(void) {
         free_data_vconsole();
 
         r = parse_env_file("/etc/vconsole.conf", NEWLINE,
-                           "KEYMAP",        &state.vc_keymap,
-                           "KEYMAP_TOGGLE", &state.vc_keymap_toggle,
+                           "KEYMAP",        &vc_keymap,
+                           "KEYMAP_TOGGLE", &vc_keymap_toggle,
                            NULL);
 
         if (r < 0 && r != -ENOENT)
@@ -310,20 +306,20 @@ static int read_data_x11(void) {
                         if (strv_length(a) == 3) {
 
                                 if (streq(a[1], "XkbLayout")) {
-                                        free(state.x11_layout);
-                                        state.x11_layout = a[2];
+                                        free(x11_layout);
+                                        x11_layout = a[2];
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbModel")) {
-                                        free(state.x11_model);
-                                        state.x11_model = a[2];
+                                        free(x11_model);
+                                        x11_model = a[2];
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbVariant")) {
-                                        free(state.x11_variant);
-                                        state.x11_variant = a[2];
+                                        free(x11_variant);
+                                        x11_variant = a[2];
                                         a[2] = NULL;
                                 } else if (streq(a[1], "XkbOptions")) {
-                                        free(state.x11_options);
-                                        state.x11_options = a[2];
+                                        free(x11_options);
+                                        x11_options = a[2];
                                         a[2] = NULL;
                                 }
                         }
@@ -509,12 +505,12 @@ static int write_data_vconsole(void) {
         if (r < 0 && r != -ENOENT)
                 return r;
 
-        if (isempty(state.vc_keymap))
+        if (isempty(vc_keymap))
                 l = strv_env_unset(l, "KEYMAP");
         else {
                 char *s, **u;
 
-                s = strappend("KEYMAP=", state.vc_keymap);
+                s = strappend("KEYMAP=", vc_keymap);
                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;
@@ -530,12 +526,12 @@ static int write_data_vconsole(void) {
                 l = u;
         }
 
-        if (isempty(state.vc_keymap_toggle))
+        if (isempty(vc_keymap_toggle))
                 l = strv_env_unset(l, "KEYMAP_TOGGLE");
         else  {
                 char *s, **u;
 
-                s = strappend("KEYMAP_TOGGLE=", state.vc_keymap_toggle);
+                s = strappend("KEYMAP_TOGGLE=", vc_keymap_toggle);
                 if (!s) {
                         strv_free(l);
                         return -ENOMEM;
@@ -571,10 +567,10 @@ static int write_data_x11(void) {
         char *temp_path;
         int r;
 
-        if (isempty(state.x11_layout) &&
-            isempty(state.x11_model) &&
-            isempty(state.x11_variant) &&
-            isempty(state.x11_options)) {
+        if (isempty(x11_layout) &&
+            isempty(x11_model) &&
+            isempty(x11_variant) &&
+            isempty(x11_options)) {
 
 #ifdef TARGET_FEDORA
                 unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
@@ -604,17 +600,17 @@ static int write_data_x11(void) {
               "        Identifier \"system-keyboard\"\n"
               "        MatchIsKeyboard \"on\"\n", f);
 
-        if (!isempty(state.x11_layout))
-                fprintf(f, "        Option \"XkbLayout\" \"%s\"\n", state.x11_layout);
+        if (!isempty(x11_layout))
+                fprintf(f, "        Option \"XkbLayout\" \"%s\"\n", x11_layout);
 
-        if (!isempty(state.x11_model))
-                fprintf(f, "        Option \"XkbModel\" \"%s\"\n", state.x11_model);
+        if (!isempty(x11_model))
+                fprintf(f, "        Option \"XkbModel\" \"%s\"\n", x11_model);
 
-        if (!isempty(state.x11_variant))
-                fprintf(f, "        Option \"XkbVariant\" \"%s\"\n", state.x11_variant);
+        if (!isempty(x11_variant))
+                fprintf(f, "        Option \"XkbVariant\" \"%s\"\n", x11_variant);
 
-        if (!isempty(state.x11_options))
-                fprintf(f, "        Option \"XkbOptions\" \"%s\"\n", state.x11_options);
+        if (!isempty(x11_options))
+                fprintf(f, "        Option \"XkbOptions\" \"%s\"\n", x11_options);
 
         fputs("EndSection\n", f);
         fflush(f);
@@ -746,13 +742,13 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
 
         assert(connection);
 
-        if (isempty(state.vc_keymap)) {
+        if (isempty(vc_keymap)) {
 
                 modified =
-                        !isempty(state.x11_layout) ||
-                        !isempty(state.x11_model) ||
-                        !isempty(state.x11_variant) ||
-                        !isempty(state.x11_options);
+                        !isempty(x11_layout) ||
+                        !isempty(x11_model) ||
+                        !isempty(x11_variant) ||
+                        !isempty(x11_options);
 
                 free_data_x11();
         } else {
@@ -776,20 +772,20 @@ static int convert_vconsole_to_x11(DBusConnection *connection) {
                         if (r == 0)
                                 break;
 
-                        if (!streq(state.vc_keymap, a[0])) {
+                        if (!streq(vc_keymap, a[0])) {
                                 strv_free(a);
                                 continue;
                         }
 
-                        if (!streq_ptr(state.x11_layout, strnulldash(a[1])) ||
-                            !streq_ptr(state.x11_model, strnulldash(a[2])) ||
-                            !streq_ptr(state.x11_variant, strnulldash(a[3])) ||
-                            !streq_ptr(state.x11_options, strnulldash(a[4]))) {
+                        if (!streq_ptr(x11_layout, strnulldash(a[1])) ||
+                            !streq_ptr(x11_model, strnulldash(a[2])) ||
+                            !streq_ptr(x11_variant, strnulldash(a[3])) ||
+                            !streq_ptr(x11_options, strnulldash(a[4]))) {
 
-                                if (free_and_set(&state.x11_layout, strnulldash(a[1])) < 0 ||
-                                    free_and_set(&state.x11_model, strnulldash(a[2])) < 0 ||
-                                    free_and_set(&state.x11_variant, strnulldash(a[3])) < 0 ||
-                                    free_and_set(&state.x11_options, strnulldash(a[4])) < 0) {
+                                if (free_and_set(&x11_layout, strnulldash(a[1])) < 0 ||
+                                    free_and_set(&x11_model, strnulldash(a[2])) < 0 ||
+                                    free_and_set(&x11_variant, strnulldash(a[3])) < 0 ||
+                                    free_and_set(&x11_options, strnulldash(a[4])) < 0) {
                                         strv_free(a);
                                         fclose(f);
                                         return -ENOMEM;
@@ -840,11 +836,11 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
 
         assert(connection);
 
-        if (isempty(state.x11_layout)) {
+        if (isempty(x11_layout)) {
 
                 modified =
-                        !isempty(state.vc_keymap) ||
-                        !isempty(state.vc_keymap_toggle);
+                        !isempty(vc_keymap) ||
+                        !isempty(vc_keymap_toggle);
 
                 free_data_x11();
         } else {
@@ -872,13 +868,13 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                 break;
 
                         /* Determine how well matching this entry is */
-                        if (streq_ptr(state.x11_layout, a[1]))
+                        if (streq_ptr(x11_layout, a[1]))
                                 /* If we got an exact match, this is best */
                                 matching = 10;
                         else {
                                 size_t x;
 
-                                x = strcspn(state.x11_layout, ",");
+                                x = strcspn(x11_layout, ",");
 
                                 /* We have multiple X layouts, look
                                  * for an entry that matches our key
@@ -886,7 +882,7 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                  * layout stripped off. */
                                 if (x > 0 &&
                                     strlen(a[1]) == x &&
-                                    strncmp(state.x11_layout, a[1], x) == 0)
+                                    strncmp(x11_layout, a[1], x) == 0)
                                         matching = 5;
                                 else  {
                                         size_t w;
@@ -898,19 +894,19 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
                                         w = strcspn(a[1], ",");
 
                                         if (x > 0 && x == w &&
-                                            memcmp(state.x11_layout, a[1], x) == 0)
+                                            memcmp(x11_layout, a[1], x) == 0)
                                                 matching = 1;
                                 }
                         }
 
                         if (matching > 0 &&
-                            streq_ptr(state.x11_model, a[2])) {
+                            streq_ptr(x11_model, a[2])) {
                                 matching++;
 
-                                if (streq_ptr(state.x11_variant, a[3])) {
+                                if (streq_ptr(x11_variant, a[3])) {
                                         matching++;
 
-                                        if (streq_ptr(state.x11_options, a[4]))
+                                        if (streq_ptr(x11_options, a[4]))
                                                 matching++;
                                 }
                         }
@@ -935,12 +931,12 @@ static int convert_x11_to_vconsole(DBusConnection *connection) {
 
                 fclose(f);
 
-                if (!streq_ptr(state.vc_keymap, new_keymap)) {
-                        free(state.vc_keymap);
-                        state.vc_keymap = new_keymap;
+                if (!streq_ptr(vc_keymap, new_keymap)) {
+                        free(vc_keymap);
+                        vc_keymap = new_keymap;
 
-                        free(state.vc_keymap_toggle);
-                        state.vc_keymap_toggle = NULL;
+                        free(vc_keymap_toggle);
+                        vc_keymap_toggle = NULL;
 
                         modified = true;
                 } else
@@ -1005,27 +1001,22 @@ static int append_locale(DBusMessageIter *i, const char *property, void *userdat
         return r;
 }
 
-static const BusProperty bus_locale_properties[] = {
-        { "Locale",               append_locale,             "as", 0 },
-        { "X11Layout",            bus_property_append_string, "s", offsetof(State, x11_layout),       true },
-        { "X11Model",             bus_property_append_string, "s", offsetof(State, x11_model),        true },
-        { "X11Variant",           bus_property_append_string, "s", offsetof(State, x11_variant),      true },
-        { "X11Options",           bus_property_append_string, "s", offsetof(State, x11_options),      true },
-        { "VConsoleKeymap",       bus_property_append_string, "s", offsetof(State, vc_keymap),        true },
-        { "VConsoleKeymapToggle", bus_property_append_string, "s", offsetof(State, vc_keymap_toggle), true },
-        { NULL, }
-};
-
-static const BusBoundProperties bps[] = {
-        { "org.freedesktop.locale1", bus_locale_properties, &state },
-        { NULL, }
-};
-
 static DBusHandlerResult locale_message_handler(
                 DBusConnection *connection,
                 DBusMessage *message,
                 void *userdata) {
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.locale1", "Locale",               append_locale,              "as", NULL                   },
+                { "org.freedesktop.locale1", "X11Layout",            bus_property_append_string, "s",  x11_layout             },
+                { "org.freedesktop.locale1", "X11Model",             bus_property_append_string, "s",  x11_model              },
+                { "org.freedesktop.locale1", "X11Variant",           bus_property_append_string, "s",  x11_variant            },
+                { "org.freedesktop.locale1", "X11Options",           bus_property_append_string, "s",  x11_options            },
+                { "org.freedesktop.locale1", "VConsoleKeymap",       bus_property_append_string, "s",  vc_keymap              },
+                { "org.freedesktop.locale1", "VConsoleKeymapToggle", bus_property_append_string, "s",  vc_keymap_toggle       },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusMessage *reply = NULL, *changed = NULL;
         DBusError error;
         int r;
@@ -1100,7 +1091,7 @@ static DBusHandlerResult locale_message_handler(
 
                 if (modified) {
 
-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-locale", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-locale", interactive, &error);
                         if (r < 0) {
                                 strv_free(l);
                                 return bus_send_error_reply(connection, message, &error, r);
@@ -1178,15 +1169,15 @@ static DBusHandlerResult locale_message_handler(
                 if (isempty(keymap_toggle))
                         keymap_toggle = NULL;
 
-                if (!streq_ptr(keymap, state.vc_keymap) ||
-                    !streq_ptr(keymap_toggle, state.vc_keymap_toggle)) {
+                if (!streq_ptr(keymap, vc_keymap) ||
+                    !streq_ptr(keymap_toggle, vc_keymap_toggle)) {
 
-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
-                        if (free_and_set(&state.vc_keymap, keymap) < 0 ||
-                            free_and_set(&state.vc_keymap_toggle, keymap_toggle) < 0)
+                        if (free_and_set(&vc_keymap, keymap) < 0 ||
+                            free_and_set(&vc_keymap_toggle, keymap_toggle) < 0)
                                 goto oom;
 
                         r = write_data_vconsole();
@@ -1195,7 +1186,7 @@ static DBusHandlerResult locale_message_handler(
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 
-                        log_info("Changed virtual console keymap to '%s'", strempty(state.vc_keymap));
+                        log_info("Changed virtual console keymap to '%s'", strempty(vc_keymap));
 
                         r = load_vconsole_keymap(connection, NULL);
                         if (r < 0)
@@ -1246,19 +1237,19 @@ static DBusHandlerResult locale_message_handler(
                 if (isempty(options))
                         options = NULL;
 
-                if (!streq_ptr(layout, state.x11_layout) ||
-                    !streq_ptr(model, state.x11_model) ||
-                    !streq_ptr(variant, state.x11_variant) ||
-                    !streq_ptr(options, state.x11_options)) {
+                if (!streq_ptr(layout, x11_layout) ||
+                    !streq_ptr(model, x11_model) ||
+                    !streq_ptr(variant, x11_variant) ||
+                    !streq_ptr(options, x11_options)) {
 
-                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.locale1.set-keyboard", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
-                        if (free_and_set(&state.x11_layout, layout) < 0 ||
-                            free_and_set(&state.x11_model, model) < 0 ||
-                            free_and_set(&state.x11_variant, variant) < 0 ||
-                            free_and_set(&state.x11_options, options) < 0)
+                        if (free_and_set(&x11_layout, layout) < 0 ||
+                            free_and_set(&x11_model, model) < 0 ||
+                            free_and_set(&x11_variant, variant) < 0 ||
+                            free_and_set(&x11_options, options) < 0)
                                 goto oom;
 
                         r = write_data_x11();
@@ -1267,7 +1258,7 @@ static DBusHandlerResult locale_message_handler(
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 
-                        log_info("Changed X11 keyboard layout to '%s'", strempty(state.x11_layout));
+                        log_info("Changed X11 keyboard layout to '%s'", strempty(x11_layout));
 
                         changed = bus_properties_changed_new(
                                         "/org/freedesktop/locale1",
@@ -1287,7 +1278,8 @@ static DBusHandlerResult locale_message_handler(
                         }
                 }
         } else
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
+
 
         if (!(reply = dbus_message_new_method_return(message)))
                 goto oom;
index c37ab22..b8ce122 100644 (file)
--- a/src/log.c
+++ b/src/log.c
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <stddef.h>
 
 #include "log.h"
 #include "util.h"
 #include "macro.h"
-#include "socket-util.h"
 
-#define SNDBUF_SIZE (8*1024*1024)
+#define SYSLOG_TIMEOUT_USEC (5*USEC_PER_SEC)
 
 static LogTarget log_target = LOG_TARGET_CONSOLE;
 static int log_max_level = LOG_INFO;
@@ -41,7 +39,6 @@ static int log_max_level = LOG_INFO;
 static int console_fd = STDERR_FILENO;
 static int syslog_fd = -1;
 static int kmsg_fd = -1;
-static int journal_fd = -1;
 
 static bool syslog_is_stream = false;
 
@@ -72,8 +69,7 @@ static int log_open_console(void) {
 
         if (getpid() == 1) {
 
-                console_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-                if (console_fd < 0) {
+                if ((console_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
                         log_error("Failed to open /dev/console for logging: %s", strerror(-console_fd));
                         return console_fd;
                 }
@@ -99,8 +95,7 @@ static int log_open_kmsg(void) {
         if (kmsg_fd >= 0)
                 return 0;
 
-        kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-        if (kmsg_fd < 0) {
+        if ((kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
                 log_error("Failed to open /dev/kmsg for logging: %s", strerror(errno));
                 return -errno;
         }
@@ -120,22 +115,28 @@ void log_close_syslog(void) {
 }
 
 static int create_log_socket(int type) {
+        struct timeval tv;
         int fd;
 
-        /* All output to the syslog/journal fds we do asynchronously,
-         * and if the buffers are full we just drop the messages */
-
-        fd = socket(AF_UNIX, type|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-        if (fd < 0)
+        if ((fd = socket(AF_UNIX, type|SOCK_CLOEXEC, 0)) < 0)
                 return -errno;
 
-        fd_inc_sndbuf(fd, SNDBUF_SIZE);
+        /* Make sure we don't block for more than 5s when talking to
+         * syslog */
+        timeval_store(&tv, SYSLOG_TIMEOUT_USEC);
+        if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) < 0) {
+                close_nointr_nofail(fd);
+                return -errno;
+        }
 
         return fd;
 }
 
 static int log_open_syslog(void) {
-        union sockaddr_union sa;
+        union {
+                struct sockaddr sa;
+                struct sockaddr_un un;
+        } sa;
         int r;
 
         if (syslog_fd >= 0)
@@ -145,9 +146,8 @@ static int log_open_syslog(void) {
         sa.un.sun_family = AF_UNIX;
         strncpy(sa.un.sun_path, "/dev/log", sizeof(sa.un.sun_path));
 
-        syslog_fd = create_log_socket(SOCK_DGRAM);
-        if (syslog_fd < 0) {
-                r = syslog_fd;
+        if ((syslog_fd = create_log_socket(SOCK_DGRAM)) < 0) {
+                r = -errno;
                 goto fail;
         }
 
@@ -157,9 +157,8 @@ static int log_open_syslog(void) {
                 /* Some legacy syslog systems still use stream
                  * sockets. They really shouldn't. But what can we
                  * do... */
-                syslog_fd = create_log_socket(SOCK_STREAM);
-                if (syslog_fd < 0) {
-                        r = syslog_fd;
+                if ((syslog_fd = create_log_socket(SOCK_STREAM)) < 0) {
+                        r = -errno;
                         goto fail;
                 }
 
@@ -182,47 +181,6 @@ fail:
         return r;
 }
 
-void log_close_journal(void) {
-
-        if (journal_fd < 0)
-                return;
-
-        close_nointr_nofail(journal_fd);
-        journal_fd = -1;
-}
-
-static int log_open_journal(void) {
-        union sockaddr_union sa;
-        int r;
-
-        if (journal_fd >= 0)
-                return 0;
-
-        journal_fd = create_log_socket(SOCK_DGRAM);
-        if (journal_fd < 0) {
-                r = journal_fd;
-                goto fail;
-        }
-
-        zero(sa);
-        sa.un.sun_family = AF_UNIX;
-        strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
-
-        if (connect(journal_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) {
-                r = -errno;
-                goto fail;
-        }
-
-        log_debug("Successfully opened journal for logging.");
-
-        return 0;
-
-fail:
-        log_close_journal();
-        log_debug("Failed to open journal for logging: %s", strerror(-r));
-        return r;
-}
-
 int log_open(void) {
         int r;
 
@@ -233,7 +191,6 @@ int log_open(void) {
          * because there is no reason to close it. */
 
         if (log_target == LOG_TARGET_NULL) {
-                log_close_journal();
                 log_close_syslog();
                 log_close_console();
                 return 0;
@@ -244,41 +201,22 @@ int log_open(void) {
             isatty(STDERR_FILENO) <= 0) {
 
                 if (log_target == LOG_TARGET_AUTO ||
-                    log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
-                    log_target == LOG_TARGET_JOURNAL) {
-                        r = log_open_journal();
-                        if (r >= 0) {
-                                log_close_syslog();
-                                log_close_console();
-                                return r;
-                        }
-                }
-
-                if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
-                    log_target == LOG_TARGET_SYSLOG) {
-                        r = log_open_syslog();
-                        if (r >= 0) {
-                                log_close_journal();
+                    log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
+                    log_target == LOG_TARGET_SYSLOG)
+                        if ((r = log_open_syslog()) >= 0) {
                                 log_close_console();
                                 return r;
                         }
-                }
-
                 if (log_target == LOG_TARGET_AUTO ||
-                    log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
                     log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
-                    log_target == LOG_TARGET_KMSG) {
-                        r = log_open_kmsg();
-                        if (r >= 0) {
-                                log_close_journal();
+                    log_target == LOG_TARGET_KMSG)
+                        if ((r = log_open_kmsg()) >= 0) {
                                 log_close_syslog();
                                 log_close_console();
                                 return r;
                         }
-                }
         }
 
-        log_close_journal();
         log_close_syslog();
 
         /* Get the real /dev/console if we are PID=1, hence reopen */
@@ -294,14 +232,9 @@ void log_set_target(LogTarget target) {
 }
 
 void log_close(void) {
-        log_close_journal();
-        log_close_syslog();
-        log_close_kmsg();
         log_close_console();
-}
-
-void log_forget_fds(void) {
-        console_fd = kmsg_fd = syslog_fd = journal_fd = -1;
+        log_close_kmsg();
+        log_close_syslog();
 }
 
 void log_set_max_level(int level) {
@@ -325,18 +258,16 @@ static int write_to_console(
         if (console_fd < 0)
                 return 0;
 
+        snprintf(location, sizeof(location), "(%s:%u) ", file, line);
+        char_array_0(location);
+
         highlight = LOG_PRI(level) <= LOG_ERR && show_color;
 
         zero(iovec);
-
-        if (show_location) {
-                snprintf(location, sizeof(location), "(%s:%u) ", file, line);
-                char_array_0(location);
+        if (show_location)
                 IOVEC_SET_STRING(iovec[n++], location);
-        }
-
         if (highlight)
-                IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_RED_ON);
+                IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_ON);
         IOVEC_SET_STRING(iovec[n++], buffer);
         if (highlight)
                 IOVEC_SET_STRING(iovec[n++], ANSI_HIGHLIGHT_OFF);
@@ -395,8 +326,7 @@ static int write_to_syslog(
         for (;;) {
                 ssize_t n;
 
-                n = sendmsg(syslog_fd, &msghdr, MSG_NOSIGNAL);
-                if (n < 0)
+                if ((n = sendmsg(syslog_fd, &msghdr, MSG_NOSIGNAL)) < 0)
                         return -errno;
 
                 if (!syslog_is_stream ||
@@ -441,48 +371,6 @@ static int write_to_kmsg(
         return 1;
 }
 
-static int write_to_journal(
-        int level,
-        const char*file,
-        int line,
-        const char *func,
-        const char *buffer) {
-
-        char header[LINE_MAX];
-        struct iovec iovec[3];
-        struct msghdr mh;
-
-        if (journal_fd < 0)
-                return 0;
-
-        snprintf(header, sizeof(header),
-                 "PRIORITY=%i\n"
-                 "CODE_FILE=%s\n"
-                 "CODE_LINE=%i\n"
-                 "CODE_FUNCTION=%s\n"
-                 "MESSAGE=",
-                 LOG_PRI(level),
-                 file,
-                 line,
-                 func);
-
-        char_array_0(header);
-
-        zero(iovec);
-        IOVEC_SET_STRING(iovec[0], header);
-        IOVEC_SET_STRING(iovec[1], buffer);
-        IOVEC_SET_STRING(iovec[2], "\n");
-
-        zero(mh);
-        mh.msg_iov = iovec;
-        mh.msg_iovlen = ELEMENTSOF(iovec);
-
-        if (sendmsg(journal_fd, &mh, MSG_NOSIGNAL) < 0)
-                return -errno;
-
-        return 1;
-}
-
 static int log_dispatch(
         int level,
         const char*file,
@@ -512,25 +400,11 @@ static int log_dispatch(
                         *(e++) = 0;
 
                 if (log_target == LOG_TARGET_AUTO ||
-                    log_target == LOG_TARGET_JOURNAL_OR_KMSG ||
-                    log_target == LOG_TARGET_JOURNAL) {
-
-                        k = write_to_journal(level, file, line, func, buffer);
-                        if (k < 0) {
-                                if (k != -EAGAIN)
-                                        log_close_journal();
-                                log_open_kmsg();
-                        } else if (k > 0)
-                                r++;
-                }
-
-                if (log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
+                    log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
                     log_target == LOG_TARGET_SYSLOG) {
 
-                        k = write_to_syslog(level, file, line, func, buffer);
-                        if (k < 0) {
-                                if (k != -EAGAIN)
-                                        log_close_syslog();
+                        if ((k = write_to_syslog(level, file, line, func, buffer)) < 0) {
+                                log_close_syslog();
                                 log_open_kmsg();
                         } else if (k > 0)
                                 r++;
@@ -541,19 +415,16 @@ static int log_dispatch(
                      log_target == LOG_TARGET_SYSLOG_OR_KMSG ||
                      log_target == LOG_TARGET_KMSG)) {
 
-                        k = write_to_kmsg(level, file, line, func, buffer);
-                        if (k < 0) {
+                        if ((k = write_to_kmsg(level, file, line, func, buffer)) < 0) {
                                 log_close_kmsg();
                                 log_open_console();
                         } else if (k > 0)
                                 r++;
                 }
 
-                if (k <= 0) {
-                        k = write_to_console(level, file, line, func, buffer);
-                        if (k < 0)
-                                return k;
-                }
+                if (k <= 0 &&
+                    (k = write_to_console(level, file, line, func, buffer)) < 0)
+                        return k;
 
                 buffer = e;
         } while (buffer);
@@ -610,34 +481,34 @@ int log_meta(
         return r;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-_noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format) {
+void log_assert(
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) {
+
         static char buffer[LINE_MAX];
+        int saved_errno = errno;
+        va_list ap;
 
-        snprintf(buffer, sizeof(buffer), format, text, file, line, func);
+        va_start(ap, format);
+        vsnprintf(buffer, sizeof(buffer), format, ap);
+        va_end(ap);
 
         char_array_0(buffer);
         log_abort_msg = buffer;
 
         log_dispatch(LOG_CRIT, file, line, func, buffer);
         abort();
-}
-#pragma GCC diagnostic pop
-
-void log_assert_failed(const char *text, const char *file, int line, const char *func) {
-        log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
-}
 
-void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func) {
-        log_assert(text, file, line, func, "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
+        /* If the user chose to ignore this SIGABRT, we are happy to go on, as if nothing happened. */
+        errno = saved_errno;
 }
 
 int log_set_target_from_string(const char *e) {
         LogTarget t;
 
-        t = log_target_from_string(e);
-        if (t < 0)
+        if ((t = log_target_from_string(e)) < 0)
                 return -EINVAL;
 
         log_set_target(t);
@@ -647,9 +518,8 @@ int log_set_target_from_string(const char *e) {
 int log_set_max_level_from_string(const char *e) {
         int t;
 
-        t = log_level_from_string(e);
-        if (t < 0)
-                return t;
+        if ((t = log_level_from_string(e)) < 0)
+                return -EINVAL;
 
         log_set_max_level(t);
         return 0;
@@ -694,9 +564,8 @@ void log_show_location(bool b) {
 int log_show_color_from_string(const char *e) {
         int t;
 
-        t = parse_boolean(e);
-        if (t < 0)
-                return t;
+        if ((t = parse_boolean(e)) < 0)
+                return -EINVAL;
 
         log_show_color(t);
         return 0;
@@ -705,9 +574,8 @@ int log_show_color_from_string(const char *e) {
 int log_show_location_from_string(const char *e) {
         int t;
 
-        t = parse_boolean(e);
-        if (t < 0)
-                return t;
+        if ((t = parse_boolean(e)) < 0)
+                return -EINVAL;
 
         log_show_location(t);
         return 0;
@@ -715,13 +583,11 @@ int log_show_location_from_string(const char *e) {
 
 static const char *const log_target_table[] = {
         [LOG_TARGET_CONSOLE] = "console",
-        [LOG_TARGET_KMSG] = "kmsg",
-        [LOG_TARGET_JOURNAL] = "journal",
-        [LOG_TARGET_JOURNAL_OR_KMSG] = "journal-or-kmsg",
         [LOG_TARGET_SYSLOG] = "syslog",
+        [LOG_TARGET_KMSG] = "kmsg",
         [LOG_TARGET_SYSLOG_OR_KMSG] = "syslog-or-kmsg",
-        [LOG_TARGET_AUTO] = "auto",
-        [LOG_TARGET_NULL] = "null"
+        [LOG_TARGET_NULL] = "null",
+        [LOG_TARGET_AUTO] = "auto"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget);
index 7028a13..c402afb 100644 (file)
--- a/src/log.h
+++ b/src/log.h
 
 #include "macro.h"
 
+/* If set to SYSLOG and /dev/log can not be opened we fall back to
+ * KSMG. If KMSG fails, we fall back to CONSOLE */
 typedef enum LogTarget{
         LOG_TARGET_CONSOLE,
         LOG_TARGET_KMSG,
-        LOG_TARGET_JOURNAL,
-        LOG_TARGET_JOURNAL_OR_KMSG,
         LOG_TARGET_SYSLOG,
         LOG_TARGET_SYSLOG_OR_KMSG,
-        LOG_TARGET_AUTO, /* console if stderr is tty, JOURNAL_OR_KMSG otherwise */
+        LOG_TARGET_AUTO, /* console if stderr is tty, SYSLOG_OR_KMSG otherwise */
         LOG_TARGET_NULL,
         _LOG_TARGET_MAX,
         _LOG_TARGET_INVALID = -1
@@ -57,10 +57,8 @@ int log_get_max_level(void);
 
 int log_open(void);
 void log_close(void);
-void log_forget_fds(void);
 
 void log_close_syslog(void);
-void log_close_journal(void);
 void log_close_kmsg(void);
 void log_close_console(void);
 
@@ -73,8 +71,11 @@ int log_meta(
         const char *func,
         const char *format, ...) _printf_attr_(5,6);
 
-_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func);
-_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func);
+_noreturn_ void log_assert(
+        const char*file,
+        int line,
+        const char *func,
+        const char *format, ...) _printf_attr_(4,5);
 
 /* This modifies the buffer passed! */
 int log_dump_internal(
diff --git a/src/login/multi-seat-x.c b/src/login/multi-seat-x.c
deleted file mode 100644 (file)
index 7133e02..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <string.h>
-#include <unistd.h>
-
-#include <libudev.h>
-
-#include "util.h"
-
-int main(int argc, char *argv[]) {
-
-        struct udev *udev = NULL;
-        struct udev_enumerate *enumerator = NULL;
-        struct udev_list_entry *first, *item;
-        int i;
-        const char *seat = NULL;
-        char **new_argv;
-        char *path = NULL, *device_node = NULL;
-        int r;
-        FILE *f = NULL;
-
-        /* This binary will go away as soon as X natively supports
-         * display enumeration with udev in a way that covers both PCI
-         * and USB. */
-
-        /* This will simply determine the fb device id of the graphics
-         * device assigned to a seat and write a configuration file
-         * from it and then spawn the real X server. */
-
-        /* If this file is removed, don't forget to remove the code
-         * that invokes this in gdm and other display managers. */
-
-        for (i = 1; i < argc; i++)
-                if (streq(argv[i], "-seat"))
-                        seat = argv[i+1];
-
-        if (isempty(seat) || streq(seat, "seat0")) {
-                argv[0] = (char*) X_SERVER;
-                execv(X_SERVER, argv);
-                log_error("Failed to execute real X server: %m");
-                goto fail;
-        }
-
-        udev = udev_new();
-        if (!udev) {
-                log_error("Failed to allocate udev environment.");
-                goto fail;
-        }
-
-        enumerator = udev_enumerate_new(udev);
-        if (!enumerator) {
-                log_error("Failed to allocate udev enumerator.");
-                goto fail;
-        }
-
-        udev_enumerate_add_match_subsystem(enumerator, "graphics");
-        udev_enumerate_add_match_tag(enumerator, seat);
-
-        r = udev_enumerate_scan_devices(enumerator);
-        if (r < 0) {
-                log_error("Failed to enumerate devices.");
-                goto fail;
-        }
-
-        first = udev_enumerate_get_list_entry(enumerator);
-        udev_list_entry_foreach(item, first) {
-                struct udev_device *d;
-                const char *dn;
-
-                d = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
-                if (!d)
-                        continue;
-
-                dn = udev_device_get_devnode(d);
-
-                if (dn) {
-                        device_node = strdup(dn);
-                        if (!device_node) {
-                                udev_device_unref(d);
-                                log_error("Out of memory.");
-                                goto fail;
-                        }
-                }
-
-                udev_device_unref(d);
-
-                if (device_node)
-                        break;
-        }
-
-        if (!device_node) {
-                log_error("Failed to find device node for seat %s.", seat);
-                goto fail;
-        }
-
-        r = safe_mkdir("/run/systemd/multi-session-x", 0755, 0, 0);
-        if (r < 0) {
-                log_error("Failed to create directory: %s", strerror(-r));
-                goto fail;
-        }
-
-        path = strappend("/run/systemd/multi-session-x/", seat);
-        if (!path) {
-                log_error("Out of memory");
-                goto fail;
-        }
-
-        f = fopen(path, "we");
-        if (!f) {
-                log_error("Failed to write configuration file: %m");
-                goto fail;
-        }
-
-        fprintf(f,
-                "Section \"Device\"\n"
-                "        Identifier \"udev\"\n"
-                "        Driver \"fbdev\"\n"
-                "        Option \"fbdev\" \"%s\"\n"
-                "EndSection\n"
-                "Section \"ServerFlags\"\n"
-                "        Option \"AutoAddDevices\" \"True\"\n"
-                "        Option \"AllowEmptyInput\" \"True\"\n"
-                "        Option \"DontVTSwitch\" \"True\"\n"
-                "EndSection\n"
-                "Section \"InputClass\"\n"
-                "        Identifier \"Force Input Devices to Seat\"\n"
-                "        Option \"GrabDevice\" \"True\"\n"
-                "EndSection\n",
-                device_node);
-
-        fflush(f);
-
-        if (ferror(f)) {
-                log_error("Failed to write configuration file: %m");
-                goto fail;
-        }
-
-        fclose(f);
-        f = NULL;
-
-        new_argv = alloca(sizeof(char*) * (argc + 3 + 1));
-        memcpy(new_argv, argv, sizeof(char*) * (argc + 2 + 1));
-
-        new_argv[0] = (char*) X_SERVER;
-        new_argv[argc+0] = (char*) "-config";
-        new_argv[argc+1] = path;
-        new_argv[argc+2] = (char*) "-sharevts";
-        new_argv[argc+3] = NULL;
-
-        udev_enumerate_unref(enumerator);
-        enumerator = NULL;
-
-        udev_unref(udev);
-        udev = NULL;
-
-        free(device_node);
-        device_node = NULL;
-
-        execv(X_SERVER, new_argv);
-        log_error("Failed to execute real X server: %m");
-
-fail:
-        if (enumerator)
-                udev_enumerate_unref(enumerator);
-
-        if (udev)
-                udev_unref(udev);
-
-        free(path);
-        free(device_node);
-
-        if (f)
-                fclose(f);
-
-        return EXIT_FAILURE;
-}
similarity index 99%
rename from src/login/loginctl.c
rename to src/loginctl.c
index 30e97e3..89762b6 100644 (file)
@@ -349,7 +349,6 @@ typedef struct SessionStatusInfo {
         const char *service;
         pid_t leader;
         const char *type;
-        const char *class;
         bool active;
 } SessionStatusInfo;
 
@@ -394,7 +393,7 @@ static void print_session_status_info(SessionStatusInfo *i) {
 
                 printf("\t  Leader: %u", (unsigned) i->leader);
 
-                get_process_comm(i->leader, &t);
+                get_process_name(i->leader, &t);
                 if (t) {
                         printf(" (%s)", t);
                         free(t);
@@ -432,19 +431,10 @@ static void print_session_status_info(SessionStatusInfo *i) {
                 if (i->type)
                         printf("; type %s", i->type);
 
-                if (i->class)
-                        printf("; class %s", i->class);
-
                 printf("\n");
-        } else if (i->type) {
+        } else if (i->type)
                 printf("\t    Type: %s\n", i->type);
 
-                if (i->class)
-                        printf("; class %s", i->class);
-        } else if (i->class)
-                printf("\t   Class: %s\n", i->class);
-
-
         printf("\t  Active: %s\n", yes_no(i->active));
 
         if (i->control_group) {
@@ -459,7 +449,7 @@ static void print_session_status_info(SessionStatusInfo *i) {
                         else
                                 c = 0;
 
-                        show_cgroup_by_path(i->control_group, "\t\t  ", c, false);
+                        show_cgroup_by_path(i->control_group, "\t\t  ", c);
                 }
         }
 }
@@ -511,7 +501,7 @@ static void print_user_status_info(UserStatusInfo *i) {
                         else
                                 c = 0;
 
-                        show_cgroup_by_path(i->control_group, "\t\t  ", c, false);
+                        show_cgroup_by_path(i->control_group, "\t\t  ", c);
                 }
         }
 }
@@ -581,8 +571,6 @@ static int status_property_session(const char *name, DBusMessageIter *iter, Sess
                                 i->service = s;
                         else if (streq(name, "Type"))
                                 i->type = s;
-                        else if (streq(name, "Class"))
-                                i->class = s;
                 }
                 break;
         }
similarity index 86%
rename from src/login/logind-acl.c
rename to src/logind-acl.c
index eb8a48d..7a06b50 100644 (file)
 
 #include "logind-acl.h"
 #include "util.h"
-#include "acl-util.h"
+
+static int find_acl(acl_t acl, uid_t uid, acl_entry_t *entry) {
+        acl_entry_t i;
+        int found;
+
+        assert(acl);
+        assert(entry);
+
+        for (found = acl_get_entry(acl, ACL_FIRST_ENTRY, &i);
+             found > 0;
+             found = acl_get_entry(acl, ACL_NEXT_ENTRY, &i)) {
+
+                acl_tag_t tag;
+                uid_t *u;
+                bool b;
+
+                if (acl_get_tag_type(i, &tag) < 0)
+                        return -errno;
+
+                if (tag != ACL_USER)
+                        continue;
+
+                u = acl_get_qualifier(i);
+                if (!u)
+                        return -errno;
+
+                b = *u == uid;
+                acl_free(u);
+
+                if (b) {
+                        *entry = i;
+                        return 1;
+                }
+        }
+
+        if (found < 0)
+                return -errno;
+
+        return 0;
+}
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
@@ -86,7 +125,7 @@ int devnode_acl(const char *path,
         } else if (del && old_uid > 0) {
                 acl_entry_t entry;
 
-                r = acl_find_uid(acl, old_uid, &entry);
+                r = find_acl(acl, old_uid, &entry);
                 if (r < 0)
                         goto finish;
 
@@ -105,7 +144,7 @@ int devnode_acl(const char *path,
                 acl_permset_t permset;
                 int rd, wt;
 
-                r = acl_find_uid(acl, new_uid, &entry);
+                r = find_acl(acl, new_uid, &entry);
                 if (r < 0)
                         goto finish;
 
similarity index 100%
rename from src/login/logind-acl.h
rename to src/logind-acl.h
similarity index 85%
rename from src/login/logind-dbus.c
rename to src/logind-dbus.c
index d8f4d89..0550d1b 100644 (file)
         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
         "   <arg name=\"session\" type=\"o\" direction=\"out\"/>\n"     \
         "  </method>\n"                                                 \
-        "  <method name=\"GetSessionByPID\">\n"                         \
-        "   <arg name=\"pid\" type=\"u\" direction=\"in\"/>\n"          \
-        "   <arg name=\"session\" type=\"o\" direction=\"out\"/>\n"     \
-        "  </method>\n"                                                 \
         "  <method name=\"GetUser\">\n"                                 \
         "   <arg name=\"uid\" type=\"u\" direction=\"in\"/>\n"          \
         "   <arg name=\"user\" type=\"o\" direction=\"out\"/>\n"        \
@@ -62,7 +58,6 @@
         "   <arg name=\"leader\" type=\"u\" direction=\"in\"/>\n"       \
         "   <arg name=\"sevice\" type=\"s\" direction=\"in\"/>\n"       \
         "   <arg name=\"type\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"class\" type=\"s\" direction=\"in\"/>\n"        \
         "   <arg name=\"seat\" type=\"s\" direction=\"in\"/>\n"         \
         "   <arg name=\"vtnr\" type=\"u\" direction=\"in\"/>\n"         \
         "   <arg name=\"tty\" type=\"s\" direction=\"in\"/>\n"          \
         "  <method name=\"ActivateSession\">\n"                         \
         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
         "  </method>\n"                                                 \
-        "  <method name=\"ActivateSessionOnSeat\">\n"                   \
-        "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
-        "   <arg name=\"seat\" type=\"s\" direction=\"in\"/>\n"         \
-        "  </method>\n"                                                 \
         "  <method name=\"LockSession\">\n"                             \
         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
         "  </method>\n"                                                 \
         "  </method>\n"                                                 \
         "  <method name=\"KillSession\">\n"                             \
         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
-        "   <arg name=\"who\" type=\"s\" direction=\"in\"/>\n"          \
-        "   <arg name=\"signal\" type=\"s\" direction=\"in\"/>\n"       \
+        "   <arg name=\"who\" type=\"s\"/>\n"                           \
+        "   <arg name=\"signal\" type=\"s\"/>\n"                        \
         "  </method>\n"                                                 \
         "  <method name=\"KillUser\">\n"                                \
         "   <arg name=\"uid\" type=\"u\" direction=\"in\"/>\n"          \
-        "   <arg name=\"signal\" type=\"s\" direction=\"in\"/>\n"       \
+        "   <arg name=\"signal\" type=\"s\"/>\n"                        \
         "  </method>\n"                                                 \
         "  <method name=\"TerminateSession\">\n"                        \
         "   <arg name=\"id\" type=\"s\" direction=\"in\"/>\n"           \
         "  <method name=\"Reboot\">\n"                                  \
         "   <arg name=\"interactive\" type=\"b\" direction=\"in\"/>\n"  \
         "  </method>\n"                                                 \
-        "  <method name=\"CanPowerOff\">\n"                             \
-        "   <arg name=\"result\" type=\"s\" direction=\"out\"/>\n"      \
-        "  </method>\n"                                                 \
-        "  <method name=\"CanReboot\">\n"                               \
-        "   <arg name=\"result\" type=\"s\" direction=\"out\"/>\n"      \
-        "  </method>\n"                                                 \
         "  <signal name=\"SessionNew\">\n"                              \
         "   <arg name=\"id\" type=\"s\"/>\n"                            \
         "   <arg name=\"path\" type=\"o\"/>\n"                          \
@@ -223,12 +208,11 @@ static int bus_manager_append_idle_hint_since(DBusMessageIter *i, const char *pr
 static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMessage **_reply) {
         Session *session = NULL;
         User *user = NULL;
-        const char *type, *class, *seat, *tty, *display, *remote_user, *remote_host, *service;
+        const char *type, *seat, *tty, *display, *remote_user, *remote_host, *service;
         uint32_t uid, leader, audit_id = 0;
         dbus_bool_t remote, kill_processes;
         char **controllers = NULL, **reset_controllers = NULL;
         SessionType t;
-        SessionClass c;
         Seat *s;
         DBusMessageIter iter;
         int r;
@@ -273,17 +257,6 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
             dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
                 return -EINVAL;
 
-        dbus_message_iter_get_basic(&iter, &class);
-        if (isempty(class))
-                c = SESSION_USER;
-        else
-                c = session_class_from_string(class);
-
-        if (c < 0 ||
-            !dbus_message_iter_next(&iter) ||
-            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
-                return -EINVAL;
-
         dbus_message_iter_get_basic(&iter, &seat);
 
         if (isempty(seat))
@@ -328,7 +301,7 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
                 return -EINVAL;
 
         if (s) {
-                if (seat_can_multi_session(s)) {
+                if (seat_is_vtconsole(s)) {
                         if (vtnr <= 0 || vtnr > 63)
                                 return -EINVAL;
                 } else {
@@ -480,7 +453,6 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
         session->leader = leader;
         session->audit_id = audit_id;
         session->type = t;
-        session->class = c;
         session->remote = remote;
         session->controllers = controllers;
         session->reset_controllers = reset_controllers;
@@ -734,51 +706,6 @@ static int flush_devices(Manager *m) {
         return trigger_device(m, NULL);
 }
 
-static int have_multiple_sessions(
-                DBusConnection *connection,
-                Manager *m,
-                DBusMessage *message,
-                DBusError *error) {
-
-        Session *s;
-
-        assert(m);
-
-        if (hashmap_size(m->sessions) > 1)
-                return true;
-
-        /* Hmm, there's only one session, but let's make sure it
-         * actually belongs to the user who is asking. If not, better
-         * be safe than sorry. */
-
-        s = hashmap_first(m->sessions);
-        if (s) {
-                unsigned long ul;
-
-                ul = dbus_bus_get_unix_user(connection, dbus_message_get_sender(message), error);
-                if (ul == (unsigned long) -1)
-                        return -EIO;
-
-                return s->user->uid != ul;
-        }
-
-        return false;
-}
-
-static const BusProperty bus_login_manager_properties[] = {
-        { "ControlGroupHierarchy",  bus_property_append_string,         "s",  offsetof(Manager, cgroup_path),        true },
-        { "Controllers",            bus_property_append_strv,           "as", offsetof(Manager, controllers),        true },
-        { "ResetControllers",       bus_property_append_strv,           "as", offsetof(Manager, reset_controllers),  true },
-        { "NAutoVTs",               bus_property_append_unsigned,       "u",  offsetof(Manager, n_autovts)           },
-        { "KillOnlyUsers",          bus_property_append_strv,           "as", offsetof(Manager, kill_only_users),    true },
-        { "KillExcludeUsers",       bus_property_append_strv,           "as", offsetof(Manager, kill_exclude_users), true },
-        { "KillUserProcesses",      bus_property_append_bool,           "b",  offsetof(Manager, kill_user_processes) },
-        { "IdleHint",               bus_manager_append_idle_hint,       "b",  0 },
-        { "IdleSinceHint",          bus_manager_append_idle_hint_since, "t",  0 },
-        { "IdleSinceHintMonotonic", bus_manager_append_idle_hint_since, "t",  0 },
-        { NULL, }
-};
-
 static DBusHandlerResult manager_message_handler(
                 DBusConnection *connection,
                 DBusMessage *message,
@@ -786,6 +713,20 @@ static DBusHandlerResult manager_message_handler(
 
         Manager *m = userdata;
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.login1.Manager", "ControlGroupHierarchy",  bus_property_append_string,   "s",  m->cgroup_path          },
+                { "org.freedesktop.login1.Manager", "Controllers",            bus_property_append_strv,     "as", m->controllers          },
+                { "org.freedesktop.login1.Manager", "ResetControllers",       bus_property_append_strv,     "as", m->reset_controllers    },
+                { "org.freedesktop.login1.Manager", "NAutoVTs",               bus_property_append_unsigned, "u",  &m->n_autovts           },
+                { "org.freedesktop.login1.Manager", "KillOnlyUsers",          bus_property_append_strv,     "as", m->kill_only_users      },
+                { "org.freedesktop.login1.Manager", "KillExcludeUsers",       bus_property_append_strv,     "as", m->kill_exclude_users   },
+                { "org.freedesktop.login1.Manager", "KillUserProcesses",      bus_property_append_bool,     "b",  &m->kill_user_processes },
+                { "org.freedesktop.login1.Manager", "IdleHint",               bus_manager_append_idle_hint, "b",  m                       },
+                { "org.freedesktop.login1.Manager", "IdleSinceHint",          bus_manager_append_idle_hint_since, "t", m                  },
+                { "org.freedesktop.login1.Manager", "IdleSinceHintMonotonic", bus_manager_append_idle_hint_since, "t", m                  },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusError error;
         DBusMessage *reply = NULL;
         int r;
@@ -830,40 +771,6 @@ static DBusHandlerResult manager_message_handler(
                 if (!b)
                         goto oom;
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "GetSessionByPID")) {
-                uint32_t pid;
-                char *p;
-                Session *session;
-                bool b;
-
-                if (!dbus_message_get_args(
-                                    message,
-                                    &error,
-                                    DBUS_TYPE_UINT32, &pid,
-                                    DBUS_TYPE_INVALID))
-                        return bus_send_error_reply(connection, message, &error, -EINVAL);
-
-                r = manager_get_session_by_pid(m, pid, &session);
-                if (r <= 0)
-                        return bus_send_error_reply(connection, message, NULL, r < 0 ? r : -ENOENT);
-
-                reply = dbus_message_new_method_return(message);
-                if (!reply)
-                        goto oom;
-
-                p = session_bus_path(session);
-                if (!p)
-                        goto oom;
-
-                b = dbus_message_append_args(
-                                reply,
-                                DBUS_TYPE_OBJECT_PATH, &p,
-                                DBUS_TYPE_INVALID);
-                free(p);
-
-                if (!b)
-                        goto oom;
-
         } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "GetUser")) {
                 uint32_t uid;
                 char *p;
@@ -1098,41 +1005,6 @@ static DBusHandlerResult manager_message_handler(
                 if (!reply)
                         goto oom;
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSessionOnSeat")) {
-                const char *session_name, *seat_name;
-                Session *session;
-                Seat *seat;
-
-                /* Same as ActivateSession() but refuses to work if
-                 * the seat doesn't match */
-
-                if (!dbus_message_get_args(
-                                    message,
-                                    &error,
-                                    DBUS_TYPE_STRING, &session_name,
-                                    DBUS_TYPE_STRING, &seat_name,
-                                    DBUS_TYPE_INVALID))
-                        return bus_send_error_reply(connection, message, &error, -EINVAL);
-
-                session = hashmap_get(m->sessions, session_name);
-                if (!session)
-                        return bus_send_error_reply(connection, message, &error, -ENOENT);
-
-                seat = hashmap_get(m->seats, seat_name);
-                if (!seat)
-                        return bus_send_error_reply(connection, message, &error, -ENOENT);
-
-                if (session->seat != seat)
-                        return bus_send_error_reply(connection, message, &error, -EINVAL);
-
-                r = session_activate(session);
-                if (r < 0)
-                        return bus_send_error_reply(connection, message, NULL, r);
-
-                reply = dbus_message_new_method_return(message);
-                if (!reply)
-                        goto oom;
-
         } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "LockSession") ||
                    dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "UnlockSession")) {
                 const char *name;
@@ -1312,12 +1184,10 @@ static DBusHandlerResult manager_message_handler(
                 if (!pw)
                         return bus_send_error_reply(connection, message, NULL, errno ? -errno : -EINVAL);
 
-                r = verify_polkit(connection, message, "org.freedesktop.login1.set-user-linger", interactive, NULL, &error);
+                r = verify_polkit(connection, message, "org.freedesktop.login1.set-user-linger", interactive, &error);
                 if (r < 0)
                         return bus_send_error_reply(connection, message, &error, r);
 
-                mkdir_p("/var/lib/systemd", 0755);
-
                 r = safe_mkdir("/var/lib/systemd/linger", 0755, 0, 0);
                 if (r < 0)
                         return bus_send_error_reply(connection, message, &error, r);
@@ -1372,7 +1242,7 @@ static DBusHandlerResult manager_message_handler(
                 if (!path_startswith(sysfs, "/sys") || !seat_name_is_valid(seat))
                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
 
-                r = verify_polkit(connection, message, "org.freedesktop.login1.attach-device", interactive, NULL, &error);
+                r = verify_polkit(connection, message, "org.freedesktop.login1.attach-device", interactive, &error);
                 if (r < 0)
                         return bus_send_error_reply(connection, message, &error, r);
 
@@ -1395,7 +1265,7 @@ static DBusHandlerResult manager_message_handler(
                                     DBUS_TYPE_INVALID))
                         return bus_send_error_reply(connection, message, &error, -EINVAL);
 
-                r = verify_polkit(connection, message, "org.freedesktop.login1.flush-devices", interactive, NULL, &error);
+                r = verify_polkit(connection, message, "org.freedesktop.login1.flush-devices", interactive, &error);
                 if (r < 0)
                         return bus_send_error_reply(connection, message, &error, r);
 
@@ -1423,11 +1293,27 @@ static DBusHandlerResult manager_message_handler(
                                     DBUS_TYPE_INVALID))
                         return bus_send_error_reply(connection, message, &error, -EINVAL);
 
-                r = have_multiple_sessions(connection, m, message, &error);
-                if (r < 0)
-                        return bus_send_error_reply(connection, message, &error, r);
+                multiple_sessions = hashmap_size(m->sessions) > 1;
+
+                if (!multiple_sessions) {
+                        Session *s;
 
-                multiple_sessions = r > 0;
+                        /* Hmm, there's only one session, but let's
+                         * make sure it actually belongs to the user
+                         * who is asking. If not, better be safe than
+                         * sorry. */
+
+                        s = hashmap_first(m->sessions);
+                        if (s) {
+                                unsigned long ul;
+
+                                ul = dbus_bus_get_unix_user(connection, dbus_message_get_sender(message), &error);
+                                if (ul == (unsigned long) -1)
+                                        return bus_send_error_reply(connection, message, &error, -EIO);
+
+                                multiple_sessions = s->user->uid != ul;
+                        }
+                }
 
                 if (streq(dbus_message_get_member(message), "PowerOff")) {
                         if (multiple_sessions)
@@ -1445,7 +1331,7 @@ static DBusHandlerResult manager_message_handler(
                         name = SPECIAL_REBOOT_TARGET;
                 }
 
-                r = verify_polkit(connection, message, action, interactive, NULL, &error);
+                r = verify_polkit(connection, message, action, interactive, &error);
                 if (r < 0)
                         return bus_send_error_reply(connection, message, &error, r);
 
@@ -1477,50 +1363,6 @@ static DBusHandlerResult manager_message_handler(
                 if (!reply)
                         goto oom;
 
-        } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "CanPowerOff") ||
-                   dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "CanReboot")) {
-
-                bool multiple_sessions, challenge, b;
-                const char *t, *action;
-
-                r = have_multiple_sessions(connection, m, message, &error);
-                if (r < 0)
-                        return bus_send_error_reply(connection, message, &error, r);
-
-                multiple_sessions = r > 0;
-
-                if (streq(dbus_message_get_member(message), "CanPowerOff")) {
-                        if (multiple_sessions)
-                                action = "org.freedesktop.login1.power-off-multiple-sessions";
-                        else
-                                action = "org.freedesktop.login1.power-off";
-
-                } else {
-                        if (multiple_sessions)
-                                action = "org.freedesktop.login1.reboot-multiple-sessions";
-                        else
-                                action = "org.freedesktop.login1.reboot";
-                }
-
-                r = verify_polkit(connection, message, action, false, &challenge, &error);
-                if (r < 0)
-                        return bus_send_error_reply(connection, message, &error, r);
-
-                reply = dbus_message_new_method_return(message);
-                if (!reply)
-                        goto oom;
-
-                t =     r > 0 ?     "yes" :
-                        challenge ? "challenge" :
-                                    "no";
-
-                b = dbus_message_append_args(
-                                reply,
-                                DBUS_TYPE_STRING, &t,
-                                DBUS_TYPE_INVALID);
-                if (!b)
-                        goto oom;
-
         } else if (dbus_message_is_method_call(message, "org.freedesktop.DBus.Introspectable", "Introspect")) {
                 char *introspection = NULL;
                 FILE *f;
@@ -1584,13 +1426,8 @@ static DBusHandlerResult manager_message_handler(
                 }
 
                 free(introspection);
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.login1.Manager", bus_login_manager_properties, m },
-                        { NULL, }
-                };
-                return bus_default_message_handler(connection, message, NULL, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(connection, message, NULL, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(connection, reply, NULL))
similarity index 91%
rename from src/login/logind-seat-dbus.c
rename to src/logind-seat-dbus.c
index 95ef5ff..3a916ee 100644 (file)
@@ -141,7 +141,7 @@ static int bus_seat_append_multi_session(DBusMessageIter *i, const char *propert
         assert(property);
         assert(s);
 
-        b = seat_can_multi_session(s);
+        b = seat_is_vtconsole(s);
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &b))
                 return -ENOMEM;
@@ -207,22 +207,22 @@ static int get_seat_for_path(Manager *m, const char *path, Seat **_s) {
         return 0;
 }
 
-static const BusProperty bus_login_seat_properties[] = {
-        { "Id",                     bus_property_append_string,      "s", offsetof(Seat, id), true },
-        { "ActiveSession",          bus_seat_append_active,       "(so)", 0 },
-        { "CanMultiSession",        bus_seat_append_multi_session,   "b", 0 },
-        { "Sessions",               bus_seat_append_sessions,    "a(so)", 0 },
-        { "IdleHint",               bus_seat_append_idle_hint,       "b", 0 },
-        { "IdleSinceHint",          bus_seat_append_idle_hint_since, "t", 0 },
-        { "IdleSinceHintMonotonic", bus_seat_append_idle_hint_since, "t", 0 },
-        { NULL, }
-};
-
 static DBusHandlerResult seat_message_dispatch(
                 Seat *s,
                 DBusConnection *connection,
                 DBusMessage *message) {
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.login1.Seat", "Id",                     bus_property_append_string,      "s",     s->id },
+                { "org.freedesktop.login1.Seat", "ActiveSession",          bus_seat_append_active,          "(so)",  s     },
+                { "org.freedesktop.login1.Seat", "CanMultiSession",        bus_seat_append_multi_session,   "b",     s     },
+                { "org.freedesktop.login1.Seat", "Sessions",               bus_seat_append_sessions,        "a(so)", s     },
+                { "org.freedesktop.login1.Seat", "IdleHint",               bus_seat_append_idle_hint,       "b",     s     },
+                { "org.freedesktop.login1.Seat", "IdleSinceHint",          bus_seat_append_idle_hint_since, "t",     s     },
+                { "org.freedesktop.login1.Seat", "IdleSinceHintMonotonic", bus_seat_append_idle_hint_since, "t",     s     },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusError error;
         DBusMessage *reply = NULL;
         int r;
@@ -265,13 +265,8 @@ static DBusHandlerResult seat_message_dispatch(
                 reply = dbus_message_new_method_return(message);
                 if (!reply)
                         goto oom;
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.login1.Seat", bus_login_seat_properties, s },
-                        { NULL, }
-                };
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(connection, reply, NULL))
similarity index 92%
rename from src/login/logind-seat.c
rename to src/logind-seat.c
index be37c1c..3cf3958 100644 (file)
@@ -101,10 +101,8 @@ int seat_save(Seat *s) {
 
         fprintf(f,
                 "# This is private data. Do not parse.\n"
-                "IS_VTCONSOLE=%i\n"
-                "CAN_MULTI_SESSION=%i\n",
-                seat_is_vtconsole(s),
-                seat_can_multi_session(s));
+                "IS_VTCONSOLE=%i\n",
+                seat_is_vtconsole(s));
 
         if (s->active) {
                 assert(s->active->user);
@@ -193,7 +191,7 @@ int seat_preallocate_vts(Seat *s) {
         if (s->manager->n_autovts <= 0)
                 return 0;
 
-        if (!seat_can_multi_session(s))
+        if (!seat_is_vtconsole(s))
                 return 0;
 
         for (i = 1; i <= s->manager->n_autovts; i++) {
@@ -268,7 +266,7 @@ int seat_active_vt_changed(Seat *s, int vtnr) {
         assert(s);
         assert(vtnr >= 1);
 
-        if (!seat_can_multi_session(s))
+        if (!seat_is_vtconsole(s))
                 return -EINVAL;
 
         log_debug("VT changed to %i", vtnr);
@@ -292,7 +290,7 @@ int seat_read_active_vt(Seat *s) {
 
         assert(s);
 
-        if (!seat_can_multi_session(s))
+        if (!seat_is_vtconsole(s))
                 return 0;
 
         lseek(s->manager->console_active_fd, SEEK_SET, 0);
@@ -390,19 +388,18 @@ int seat_attach_session(Seat *s, Session *session) {
         assert(session);
         assert(!session->seat);
 
+        if (!seat_is_vtconsole(s) && s->sessions)
+                return -EEXIST;
+
         session->seat = s;
         LIST_PREPEND(Session, sessions_by_seat, s->sessions, session);
 
         seat_send_changed(s, "Sessions\0");
 
-        /* Note that even if a seat is not multi-session capable it
-         * still might have multiple sessions on it since old, dead
-         * sessions might continue to be tracked until all their
-         * processes are gone. The most recently added session
-         * (i.e. the first in s->sessions) is the one that matters. */
-
-        if (!seat_can_multi_session(s))
+        if (!seat_is_vtconsole(s)) {
+                assert(!s->active);
                 seat_set_active(s, session);
+        }
 
         return 0;
 }
@@ -413,18 +410,6 @@ bool seat_is_vtconsole(Seat *s) {
         return s->manager->vtconsole == s;
 }
 
-bool seat_can_multi_session(Seat *s) {
-        assert(s);
-
-        if (!seat_is_vtconsole(s))
-                return false;
-
-        /* If we can't watch which VT is in the foreground, we don't
-         * support VT switching */
-
-        return s->manager->console_active_fd >= 0;
-}
-
 int seat_get_idle_hint(Seat *s, dual_timestamp *t) {
         Session *session;
         bool idle_hint = true;
similarity index 98%
rename from src/login/logind-seat.h
rename to src/logind-seat.h
index 3b2c7f0..5bce143 100644 (file)
@@ -62,7 +62,6 @@ int seat_preallocate_vts(Seat *s);
 int seat_attach_session(Seat *s, Session *session);
 
 bool seat_is_vtconsole(Seat *s);
-bool seat_can_multi_session(Seat *s);
 int seat_get_idle_hint(Seat *s, dual_timestamp *t);
 
 int seat_start(Seat *s);
similarity index 80%
rename from src/login/logind-session-dbus.c
rename to src/logind-session-dbus.c
index 102f8ac..dc0ef5b 100644 (file)
@@ -57,7 +57,6 @@
         "  <property name=\"Leader\" type=\"u\" access=\"read\"/>\n"    \
         "  <property name=\"Audit\" type=\"u\" access=\"read\"/>\n"     \
         "  <property name=\"Type\" type=\"s\" access=\"read\"/>\n"      \
-        "  <property name=\"Class\" type=\"s\" access=\"read\"/>\n"      \
         "  <property name=\"Active\" type=\"b\" access=\"read\"/>\n"    \
         "  <property name=\"Controllers\" type=\"as\" access=\"read\"/>\n" \
         "  <property name=\"ResetControllers\" type=\"as\" access=\"read\"/>\n" \
@@ -120,21 +119,21 @@ static int bus_session_append_seat(DBusMessageIter *i, const char *property, voi
 
 static int bus_session_append_user(DBusMessageIter *i, const char *property, void *data) {
         DBusMessageIter sub;
-        User *u = data;
+        Session *s = data;
         char *p = NULL;
 
         assert(i);
         assert(property);
-        assert(u);
+        assert(s);
 
         if (!dbus_message_iter_open_container(i, DBUS_TYPE_STRUCT, NULL, &sub))
                 return -ENOMEM;
 
-        p = user_bus_path(u);
+        p = user_bus_path(s->user);
         if (!p)
                 return -ENOMEM;
 
-        if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &u->uid) ||
+        if (!dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &s->user->uid) ||
             !dbus_message_iter_append_basic(&sub, DBUS_TYPE_OBJECT_PATH, &p)) {
                 free(p);
                 return -ENOMEM;
@@ -197,7 +196,6 @@ static int bus_session_append_idle_hint_since(DBusMessageIter *i, const char *pr
 }
 
 static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_session_append_type, session_type, SessionType);
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_session_append_class, session_class, SessionClass);
 
 static int get_session_for_path(Manager *m, const char *path, Session **_s) {
         Session *s;
@@ -224,44 +222,39 @@ static int get_session_for_path(Manager *m, const char *path, Session **_s) {
         return 0;
 }
 
-static const BusProperty bus_login_session_properties[] = {
-        { "Id",                     bus_property_append_string,         "s", offsetof(Session, id),                 true },
-        { "Timestamp",              bus_property_append_usec,           "t", offsetof(Session, timestamp.realtime)  },
-        { "TimestampMonotonic",     bus_property_append_usec,           "t", offsetof(Session, timestamp.monotonic) },
-        { "ControlGroupPath",       bus_property_append_string,         "s", offsetof(Session, cgroup_path),        true },
-        { "VTNr",                   bus_property_append_uint32,         "u", offsetof(Session, vtnr)                },
-        { "Seat",                   bus_session_append_seat,         "(so)", 0 },
-        { "TTY",                    bus_property_append_string,         "s", offsetof(Session, tty),                true },
-        { "Display",                bus_property_append_string,         "s", offsetof(Session, display),            true },
-        { "Remote",                 bus_property_append_bool,           "b", offsetof(Session, remote)              },
-        { "RemoteUser",             bus_property_append_string,         "s", offsetof(Session, remote_user),        true },
-        { "RemoteHost",             bus_property_append_string,         "s", offsetof(Session, remote_host),        true },
-        { "Service",                bus_property_append_string,         "s", offsetof(Session, service),            true },
-        { "Leader",                 bus_property_append_pid,            "u", offsetof(Session, leader)              },
-        { "Audit",                  bus_property_append_uint32,         "u", offsetof(Session, audit_id)            },
-        { "Type",                   bus_session_append_type,            "s", offsetof(Session, type)                },
-        { "Class",                  bus_session_append_class,           "s", offsetof(Session, class)               },
-        { "Active",                 bus_session_append_active,          "b", 0 },
-        { "Controllers",            bus_property_append_strv,          "as", offsetof(Session, controllers),        true },
-        { "ResetControllers",       bus_property_append_strv,          "as", offsetof(Session, reset_controllers),  true },
-        { "KillProcesses",          bus_property_append_bool,           "b", offsetof(Session, kill_processes)      },
-        { "IdleHint",               bus_session_append_idle_hint,       "b", 0 },
-        { "IdleSinceHint",          bus_session_append_idle_hint_since, "t", 0 },
-        { "IdleSinceHintMonotonic", bus_session_append_idle_hint_since, "t", 0 },
-        { NULL, }
-};
-
-static const BusProperty bus_login_session_user_properties[] = {
-        { "User",                   bus_session_append_user,         "(uo)", 0 },
-        { "Name",                   bus_property_append_string,         "s", offsetof(User, name),                  true },
-        { NULL, }
-};
-
 static DBusHandlerResult session_message_dispatch(
                 Session *s,
                 DBusConnection *connection,
                 DBusMessage *message) {
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.login1.Session", "Id",                 bus_property_append_string,   "s",    s->id                   },
+                { "org.freedesktop.login1.Session", "User",               bus_session_append_user,      "(uo)", s                       },
+                { "org.freedesktop.login1.Session", "Name",               bus_property_append_string,   "s",    s->user->name           },
+                { "org.freedesktop.login1.Session", "Timestamp",          bus_property_append_usec,     "t",    &s->timestamp.realtime  },
+                { "org.freedesktop.login1.Session", "TimestampMonotonic", bus_property_append_usec,     "t",    &s->timestamp.monotonic },
+                { "org.freedesktop.login1.Session", "ControlGroupPath",   bus_property_append_string,   "s",    s->cgroup_path          },
+                { "org.freedesktop.login1.Session", "VTNr",               bus_property_append_uint32,   "u",    &s->vtnr                },
+                { "org.freedesktop.login1.Session", "Seat",               bus_session_append_seat,      "(so)", s                       },
+                { "org.freedesktop.login1.Session", "TTY",                bus_property_append_string,   "s",    s->tty                  },
+                { "org.freedesktop.login1.Session", "Display",            bus_property_append_string,   "s",    s->display              },
+                { "org.freedesktop.login1.Session", "Remote",             bus_property_append_bool,     "b",    &s->remote              },
+                { "org.freedesktop.login1.Session", "RemoteUser",         bus_property_append_string,   "s",    s->remote_user          },
+                { "org.freedesktop.login1.Session", "RemoteHost",         bus_property_append_string,   "s",    s->remote_host          },
+                { "org.freedesktop.login1.Session", "Service",            bus_property_append_string,   "s",    s->service              },
+                { "org.freedesktop.login1.Session", "Leader",             bus_property_append_pid,      "u",    &s->leader              },
+                { "org.freedesktop.login1.Session", "Audit",              bus_property_append_uint32,   "u",    &s->audit_id            },
+                { "org.freedesktop.login1.Session", "Type",               bus_session_append_type,      "s",    &s->type                },
+                { "org.freedesktop.login1.Session", "Active",             bus_session_append_active,    "b",    s                       },
+                { "org.freedesktop.login1.Session", "Controllers",        bus_property_append_strv,     "as",   s->controllers          },
+                { "org.freedesktop.login1.Session", "ResetControllers",   bus_property_append_strv,     "as",   s->reset_controllers    },
+                { "org.freedesktop.login1.Session", "KillProcesses",      bus_property_append_bool,     "b",    &s->kill_processes      },
+                { "org.freedesktop.login1.Session", "IdleHint",           bus_session_append_idle_hint, "b",    s                       },
+                { "org.freedesktop.login1.Session", "IdleSinceHint",          bus_session_append_idle_hint_since, "t", s                },
+                { "org.freedesktop.login1.Session", "IdleSinceHintMonotonic", bus_session_append_idle_hint_since, "t", s                },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusError error;
         DBusMessage *reply = NULL;
         int r;
@@ -295,7 +288,7 @@ static DBusHandlerResult session_message_dispatch(
         } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Session", "Lock") ||
                    dbus_message_is_method_call(message, "org.freedesktop.login1.Session", "Unlock")) {
 
-                if (session_send_lock(s, streq(dbus_message_get_member(message), "Lock")) < 0)
+                if (session_send_signal(s, streq(dbus_message_get_member(message), "Lock")) < 0)
                         goto oom;
 
                 reply = dbus_message_new_method_return(message);
@@ -358,14 +351,8 @@ static DBusHandlerResult session_message_dispatch(
                 if (!reply)
                         goto oom;
 
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.login1.Session", bus_login_session_properties,      s       },
-                        { "org.freedesktop.login1.Session", bus_login_session_user_properties, s->user },
-                        { NULL, }
-                };
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(connection, reply, NULL))
similarity index 92%
rename from src/login/logind-session.c
rename to src/logind-session.c
index af9c12d..b0a09e3 100644 (file)
@@ -145,11 +145,6 @@ int session_save(Session *s) {
                         "TYPE=%s\n",
                         session_type_to_string(s->type));
 
-        if (s->class >= 0)
-                fprintf(f,
-                        "CLASS=%s\n",
-                        session_class_to_string(s->class));
-
         if (s->cgroup_path)
                 fprintf(f,
                         "CGROUP=%s\n",
@@ -190,7 +185,7 @@ int session_save(Session *s) {
                         "SERVICE=%s\n",
                         s->service);
 
-        if (s->seat && seat_can_multi_session(s->seat))
+        if (s->seat && seat_is_vtconsole(s->seat))
                 fprintf(f,
                         "VTNR=%i\n",
                         s->vtnr);
@@ -230,8 +225,7 @@ int session_load(Session *s) {
                 *vtnr = NULL,
                 *leader = NULL,
                 *audit_id = NULL,
-                *type = NULL,
-                *class = NULL;
+                *type = NULL;
 
         int k, r;
 
@@ -251,7 +245,6 @@ int session_load(Session *s) {
                            "VTNR",           &vtnr,
                            "LEADER",         &leader,
                            "TYPE",           &type,
-                           "CLASS",          &class,
                            NULL);
 
         if (r < 0)
@@ -277,7 +270,7 @@ int session_load(Session *s) {
                         seat_attach_session(o, s);
         }
 
-        if (vtnr && s->seat && seat_can_multi_session(s->seat)) {
+        if (vtnr && s->seat && seat_is_vtconsole(s->seat)) {
                 int v;
 
                 k = safe_atoi(vtnr, &v);
@@ -304,14 +297,6 @@ int session_load(Session *s) {
                         s->type = t;
         }
 
-        if (class) {
-                SessionClass c;
-
-                c = session_class_from_string(class);
-                if (c >= 0)
-                        s->class = c;
-        }
-
         if (s->fifo_path) {
                 int fd;
 
@@ -339,6 +324,7 @@ finish:
 
 int session_activate(Session *s) {
         int r;
+        Session *old_active;
 
         assert(s);
 
@@ -357,7 +343,10 @@ int session_activate(Session *s) {
         if (r < 0)
                 return r;
 
-        return seat_set_active(s->seat, s);
+        old_active = s->seat->active;
+        s->seat->active = s;
+
+        return seat_apply_acls(s->seat, old_active);
 }
 
 static int session_link_x11_socket(Session *s) {
@@ -391,13 +380,15 @@ static int session_link_x11_socket(Session *s) {
                 return -ENOENT;
         }
 
-        t = strappend(s->user->runtime_path, "/X11-display");
+        t = strappend(s->user->runtime_path, "/X11/display");
         if (!t) {
                 log_error("Out of memory");
                 free(f);
                 return -ENOMEM;
         }
 
+        mkdir_parents(t, 0755);
+
         if (link(f, t) < 0) {
                 if (errno == EEXIST) {
                         unlink(t);
@@ -449,7 +440,7 @@ static int session_create_one_group(Session *s, const char *controller, const ch
         if (r < 0)
                 return r;
 
-        r = cg_set_task_access(controller, path, 0644, s->user->uid, s->user->gid, -1);
+        r = cg_set_task_access(controller, path, 0644, s->user->uid, s->user->gid);
         if (r >= 0)
                 r = cg_set_group_access(controller, path, 0755, s->user->uid, s->user->gid);
 
@@ -545,7 +536,7 @@ int session_start(Session *s) {
         if (r < 0)
                 return r;
 
-        log_full(s->type == SESSION_TTY || s->type == SESSION_X11 ? LOG_INFO : LOG_DEBUG,
+        log_full(s->display || s->tty ? LOG_INFO : LOG_DEBUG,
                  "New session %s of user %s.", s->id, s->user->name);
 
         /* Create cgroup */
@@ -616,23 +607,6 @@ static int session_terminate_cgroup(Session *s) {
                         log_error("Failed to kill session cgroup: %s", strerror(-r));
 
         } else {
-                if (s->leader > 0) {
-                        Session *t;
-
-                        /* We still send a HUP to the leader process,
-                         * even if we are not supposed to kill the
-                         * whole cgroup. But let's first check the
-                         * leader still exists and belongs to our
-                         * session... */
-
-                        r = manager_get_session_by_pid(s->manager, s->leader, &t);
-                        if (r > 0 && t == s) {
-                                kill(s->leader, SIGTERM); /* for normal processes */
-                                kill(s->leader, SIGHUP);  /* for shells */
-                                kill(s->leader, SIGCONT); /* in case they are stopped */
-                        }
-                }
-
                 r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, s->cgroup_path, true);
                 if (r < 0)
                         log_error("Failed to check session cgroup: %s", strerror(-r));
@@ -640,7 +614,8 @@ static int session_terminate_cgroup(Session *s) {
                         r = cg_delete(SYSTEMD_CGROUP_CONTROLLER, s->cgroup_path);
                         if (r < 0)
                                 log_error("Failed to delete session cgroup: %s", strerror(-r));
-                }
+                } else
+                        r = -EBUSY;
         }
 
         STRV_FOREACH(k, s->user->manager->controllers)
@@ -651,7 +626,7 @@ static int session_terminate_cgroup(Session *s) {
         free(s->cgroup_path);
         s->cgroup_path = NULL;
 
-        return 0;
+        return r;
 }
 
 static int session_unlink_x11_socket(Session *s) {
@@ -666,7 +641,7 @@ static int session_unlink_x11_socket(Session *s) {
 
         s->user->display = NULL;
 
-        t = strappend(s->user->runtime_path, "/X11-display");
+        t = strappend(s->user->runtime_path, "/X11/display");
         if (!t) {
                 log_error("Out of memory");
                 return -ENOMEM;
@@ -684,7 +659,7 @@ int session_stop(Session *s) {
         assert(s);
 
         if (s->started)
-                log_full(s->type == SESSION_TTY || s->type == SESSION_X11 ? LOG_INFO : LOG_DEBUG,
+                log_full(s->display || s->tty ? LOG_INFO : LOG_DEBUG,
                          "Removed session %s.", s->id);
 
         /* Kill cgroup */
@@ -962,14 +937,6 @@ static const char* const session_type_table[_SESSION_TYPE_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(session_type, SessionType);
 
-static const char* const session_class_table[_SESSION_CLASS_MAX] = {
-        [SESSION_USER] = "user",
-        [SESSION_GREETER] = "greeter",
-        [SESSION_LOCK_SCREEN] = "lock-screen"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(session_class, SessionClass);
-
 static const char* const kill_who_table[_KILL_WHO_MAX] = {
         [KILL_LEADER] = "leader",
         [KILL_ALL] = "all"
similarity index 90%
rename from src/login/logind-session.h
rename to src/logind-session.h
index d0b8c87..8e394ac 100644 (file)
@@ -38,14 +38,6 @@ typedef enum SessionType {
         _SESSION_TYPE_INVALID = -1
 } SessionType;
 
-typedef enum SessionClass {
-        SESSION_USER,
-        SESSION_GREETER,
-        SESSION_LOCK_SCREEN,
-        _SESSION_CLASS_MAX,
-        _SESSION_CLASS_INVALID = -1
-} SessionClass;
-
 typedef enum KillWho {
         KILL_LEADER,
         KILL_ALL,
@@ -58,7 +50,6 @@ struct Session {
 
         char *id;
         SessionType type;
-        SessionClass class;
 
         char *state_file;
 
@@ -127,9 +118,6 @@ int session_send_lock(Session *s, bool lock);
 const char* session_type_to_string(SessionType t);
 SessionType session_type_from_string(const char *s);
 
-const char* session_class_to_string(SessionClass t);
-SessionClass session_class_from_string(const char *s);
-
 const char *kill_who_to_string(KillWho k);
 KillWho kill_who_from_string(const char *s);
 
similarity index 85%
rename from src/login/logind-user-dbus.c
rename to src/logind-user-dbus.c
index a9d680f..3673a28 100644 (file)
@@ -213,29 +213,29 @@ static int get_user_for_path(Manager *m, const char *path, User **_u) {
         return 0;
 }
 
-static const BusProperty bus_login_user_properties[] = {
-        { "UID",                    bus_property_append_uid,         "u", offsetof(User, uid)                 },
-        { "GID",                    bus_property_append_gid,         "u", offsetof(User, gid)                 },
-        { "Name",                   bus_property_append_string,      "s", offsetof(User, name),               true },
-        { "Timestamp",              bus_property_append_usec,        "t", offsetof(User, timestamp.realtime)  },
-        { "TimestampMonotonic",     bus_property_append_usec,        "t", offsetof(User, timestamp.monotonic) },
-        { "RuntimePath",            bus_property_append_string,      "s", offsetof(User, runtime_path),       true },
-        { "ControlGroupPath",       bus_property_append_string,      "s", offsetof(User, cgroup_path),        true },
-        { "Service",                bus_property_append_string,      "s", offsetof(User, service),            true },
-        { "Display",                bus_user_append_display,      "(so)", 0 },
-        { "State",                  bus_user_append_state,           "s", 0 },
-        { "Sessions",               bus_user_append_sessions,    "a(so)", 0 },
-        { "IdleHint",               bus_user_append_idle_hint,       "b", 0 },
-        { "IdleSinceHint",          bus_user_append_idle_hint_since, "t", 0 },
-        { "IdleSinceHintMonotonic", bus_user_append_idle_hint_since, "t", 0 },
-        { NULL, }
-};
-
 static DBusHandlerResult user_message_dispatch(
                 User *u,
                 DBusConnection *connection,
                 DBusMessage *message) {
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.login1.User", "UID",                bus_property_append_uid,    "u",     &u->uid                 },
+                { "org.freedesktop.login1.User", "GID",                bus_property_append_gid,    "u",     &u->gid                 },
+                { "org.freedesktop.login1.User", "Name",               bus_property_append_string, "s",     u->name                 },
+                { "org.freedesktop.login1.User", "Timestamp",          bus_property_append_usec,   "t",     &u->timestamp.realtime  },
+                { "org.freedesktop.login1.User", "TimestampMonotonic", bus_property_append_usec,   "t",     &u->timestamp.monotonic },
+                { "org.freedesktop.login1.User", "RuntimePath",        bus_property_append_string, "s",     u->runtime_path         },
+                { "org.freedesktop.login1.User", "ControlGroupPath",   bus_property_append_string, "s",     u->cgroup_path          },
+                { "org.freedesktop.login1.User", "Service",            bus_property_append_string, "s",     u->service              },
+                { "org.freedesktop.login1.User", "Display",            bus_user_append_display,    "(so)",  u                       },
+                { "org.freedesktop.login1.User", "State",              bus_user_append_state,      "s",     u                       },
+                { "org.freedesktop.login1.User", "Sessions",           bus_user_append_sessions,   "a(so)", u                       },
+                { "org.freedesktop.login1.User", "IdleHint",           bus_user_append_idle_hint,  "b",     u                       },
+                { "org.freedesktop.login1.User", "IdleSinceHint",          bus_user_append_idle_hint_since, "t", u                  },
+                { "org.freedesktop.login1.User", "IdleSinceHintMonotonic", bus_user_append_idle_hint_since, "t", u                  },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusError error;
         DBusMessage *reply = NULL;
         int r;
@@ -274,14 +274,8 @@ static DBusHandlerResult user_message_dispatch(
                 if (!reply)
                         goto oom;
 
-        } else {
-                const BusBoundProperties bps[] = {
-                        { "org.freedesktop.login1.User", bus_login_user_properties, u },
-                        { NULL, }
-                };
-
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
-        }
+        } else
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (reply) {
                 if (!dbus_connection_send(connection, reply, NULL))
similarity index 98%
rename from src/login/logind-user.c
rename to src/logind-user.c
index 717f0e2..56c7de4 100644 (file)
@@ -299,8 +299,6 @@ static int user_create_cgroup(User *u) {
 static int user_start_service(User *u) {
         assert(u);
 
-        /* FIXME: Fill me in later ... */
-
         return 0;
 }
 
@@ -312,7 +310,7 @@ int user_start(User *u) {
         if (u->started)
                 return 0;
 
-        log_debug("New user %s logged in.", u->name);
+        log_info("New user %s logged in.", u->name);
 
         /* Make XDG_RUNTIME_DIR */
         r = user_mkdir_runtime_path(u);
@@ -427,7 +425,7 @@ int user_stop(User *u) {
         assert(u);
 
         if (u->started)
-                log_debug("User %s logged out.", u->name);
+                log_info("User %s logged out.", u->name);
 
         LIST_FOREACH(sessions_by_user, s, u->sessions) {
                 k = session_stop(s);
similarity index 100%
rename from src/login/logind-user.h
rename to src/logind-user.h
similarity index 94%
rename from src/login/logind.c
rename to src/logind.c
index 7fd6515..4633a5e 100644 (file)
@@ -29,8 +29,6 @@
 #include <sys/ioctl.h>
 #include <linux/vt.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "logind.h"
 #include "dbus-common.h"
 #include "dbus-loop.h"
@@ -657,6 +655,7 @@ int manager_dispatch_seat_udev(Manager *m) {
         return r;
 }
 
+
 int manager_dispatch_vcsa_udev(Manager *m) {
         struct udev_device *d;
         int r = 0;
@@ -781,74 +780,34 @@ finish:
         return r;
 }
 
-int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session) {
+void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
         Session *s;
         char *p;
 
         assert(m);
         assert(cgroup);
-        assert(session);
-
-        s = hashmap_get(m->cgroups, cgroup);
-        if (s) {
-                *session = s;
-                return 1;
-        }
 
         p = strdup(cgroup);
         if (!p) {
                 log_error("Out of memory.");
-                return -ENOMEM;
+                return;
         }
 
         for (;;) {
                 char *e;
 
-                e = strrchr(p, '/');
-                if (!e || e == p) {
-                        free(p);
-                        *session = NULL;
-                        return 0;
-                }
-
-                *e = 0;
+                if (isempty(p) || streq(p, "/"))
+                        break;
 
                 s = hashmap_get(m->cgroups, p);
-                if (s) {
-                        free(p);
-                        *session = s;
-                        return 1;
-                }
-        }
-}
+                if (s)
+                        session_add_to_gc_queue(s);
 
-int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session) {
-        char *p;
-        int r;
-
-        assert(m);
-        assert(pid >= 1);
-        assert(session);
-
-        r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, pid, &p);
-        if (r < 0)
-                return r;
+                assert_se(e = strrchr(p, '/'));
+                *e = 0;
+        }
 
-        r = manager_get_session_by_cgroup(m, p, session);
         free(p);
-
-        return r;
-}
-
-void manager_cgroup_notify_empty(Manager *m, const char *cgroup) {
-        Session *s;
-        int r;
-
-        r = manager_get_session_by_cgroup(m, cgroup, &s);
-        if (r <= 0)
-                return;
-
-        session_add_to_gc_queue(s);
 }
 
 static void manager_pipe_notify_eof(Manager *m, int fd) {
@@ -947,12 +906,6 @@ static int manager_connect_console(Manager *m) {
 
         m->console_active_fd = open("/sys/class/tty/tty0/active", O_RDONLY|O_NOCTTY|O_CLOEXEC);
         if (m->console_active_fd < 0) {
-
-                /* On certain architectures (S390 and Xen), /dev/tty0
-                   does not exist, so don't fail if we can't open it.*/
-                if (errno == ENOENT)
-                        return 0;
-
                 log_error("Failed to open /sys/class/tty/tty0/active: %m");
                 return -errno;
         }
@@ -997,8 +950,7 @@ static int manager_connect_udev(Manager *m) {
         ev.events = EPOLLIN;
         ev.data.u32 = FD_SEAT_UDEV;
 
-        /* Don't bother watching VCSA devices, if nobody cares */
-        if (m->n_autovts <= 0 || m->console_active_fd < 0)
+        if (m->n_autovts <= 0)
                 return 0;
 
         if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_seat_fd, &ev) < 0)
@@ -1117,13 +1069,13 @@ int manager_startup(Manager *m) {
         if (m->epoll_fd < 0)
                 return -errno;
 
-        /* Connect to console */
-        r = manager_connect_console(m);
+        /* Connect to udev */
+        r = manager_connect_udev(m);
         if (r < 0)
                 return r;
 
-        /* Connect to udev */
-        r = manager_connect_udev(m);
+        /* Connect to console */
+        r = manager_connect_console(m);
         if (r < 0)
                 return r;
 
@@ -1266,20 +1218,9 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_debug("systemd-logind running as pid %lu", (unsigned long) getpid());
-
-        sd_notify(false,
-                  "READY=1\n"
-                  "STATUS=Processing requests...");
-
         r = manager_run(m);
 
-        log_debug("systemd-logind stopped as pid %lu", (unsigned long) getpid());
-
 finish:
-        sd_notify(false,
-                  "STATUS=Shutting down...");
-
         if (m)
                 manager_free(m);
 
similarity index 95%
rename from src/login/logind.h
rename to src/logind.h
index a4b4602..fd668a2 100644 (file)
@@ -116,9 +116,6 @@ void manager_gc(Manager *m, bool drop_not_started);
 
 int manager_get_idle_hint(Manager *m, dual_timestamp *t);
 
-int manager_get_session_by_cgroup(Manager *m, const char *cgroup, Session **session);
-int manager_get_session_by_pid(Manager *m, pid_t pid, Session **session);
-
 extern const DBusObjectPathVTable bus_manager_vtable;
 
 DBusHandlerResult bus_message_filter(DBusConnection *c, DBusMessage *message, void *userdata);
diff --git a/src/logs-show.c b/src/logs-show.c
deleted file mode 100644 (file)
index f023f0a..0000000
+++ /dev/null
@@ -1,668 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <time.h>
-#include <assert.h>
-#include <errno.h>
-#include <sys/poll.h>
-#include <string.h>
-
-#include "logs-show.h"
-#include "log.h"
-#include "util.h"
-
-#define PRINT_THRESHOLD 128
-
-static bool contains_unprintable(const void *p, size_t l) {
-        const char *j;
-
-        for (j = p; j < (const char *) p + l; j++)
-                if (*j < ' ' || *j >= 127)
-                        return true;
-
-        return false;
-}
-
-static int parse_field(const void *data, size_t length, const char *field, char **target, size_t *target_size) {
-        size_t fl, nl;
-        void *buf;
-
-        assert(data);
-        assert(field);
-        assert(target);
-        assert(target_size);
-
-        fl = strlen(field);
-        if (length < fl)
-                return 0;
-
-        if (memcmp(data, field, fl))
-                return 0;
-
-        nl = length - fl;
-        buf = malloc(nl+1);
-        memcpy(buf, (const char*) data + fl, nl);
-        ((char*)buf)[nl] = 0;
-        if (!buf) {
-                log_error("Out of memory");
-                return -ENOMEM;
-        }
-
-        free(*target);
-        *target = buf;
-        *target_size = nl;
-
-        return 1;
-}
-
-static bool shall_print(bool show_all, char *p, size_t l) {
-        if (show_all)
-                return true;
-
-        if (l > PRINT_THRESHOLD)
-                return false;
-
-        if (contains_unprintable(p, l))
-                return false;
-
-        return true;
-}
-
-static int output_short(sd_journal *j, unsigned line, bool show_all, bool monotonic_mode) {
-        int r;
-        const void *data;
-        size_t length;
-        size_t n = 0;
-        char *hostname = NULL, *identifier = NULL, *comm = NULL, *pid = NULL, *fake_pid = NULL, *message = NULL, *realtime = NULL, *monotonic = NULL;
-        size_t hostname_len = 0, identifier_len = 0, comm_len = 0, pid_len = 0, fake_pid_len = 0, message_len = 0, realtime_len = 0, monotonic_len = 0;
-
-        assert(j);
-
-        SD_JOURNAL_FOREACH_DATA(j, data, length) {
-
-                r = parse_field(data, length, "_HOSTNAME=", &hostname, &hostname_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "SYSLOG_IDENTIFIER=", &identifier, &identifier_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "_COMM=", &comm, &comm_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "_PID=", &pid, &pid_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "SYSLOG_PID=", &fake_pid, &fake_pid_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "_SOURCE_REALTIME_TIMESTAMP=", &realtime, &realtime_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "_SOURCE_MONOTONIC_TIMESTAMP=", &monotonic, &monotonic_len);
-                if (r < 0)
-                        goto finish;
-                else if (r > 0)
-                        continue;
-
-                r = parse_field(data, length, "MESSAGE=", &message, &message_len);
-                if (r < 0)
-                        goto finish;
-        }
-
-        if (!message) {
-                r = 0;
-                goto finish;
-        }
-
-        if (monotonic_mode) {
-                uint64_t t;
-                sd_id128_t boot_id;
-
-                r = -ENOENT;
-
-                if (monotonic)
-                        r = safe_atou64(monotonic, &t);
-
-                if (r < 0)
-                        r = sd_journal_get_monotonic_usec(j, &t, &boot_id);
-
-                if (r < 0) {
-                        log_error("Failed to get monotonic: %s", strerror(-r));
-                        goto finish;
-                }
-
-                printf("[%5llu.%06llu]",
-                       (unsigned long long) (t / USEC_PER_SEC),
-                       (unsigned long long) (t % USEC_PER_SEC));
-
-                n += 1 + 5 + 1 + 6 + 1;
-
-        } else {
-                char buf[64];
-                uint64_t x;
-                time_t t;
-                struct tm tm;
-
-                r = -ENOENT;
-
-                if (realtime)
-                        r = safe_atou64(realtime, &x);
-
-                if (r < 0)
-                        r = sd_journal_get_realtime_usec(j, &x);
-
-                if (r < 0) {
-                        log_error("Failed to get realtime: %s", strerror(-r));
-                        goto finish;
-                }
-
-                t = (time_t) (x / USEC_PER_SEC);
-                if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", localtime_r(&t, &tm)) <= 0) {
-                        log_error("Failed to format time.");
-                        goto finish;
-                }
-
-                fputs(buf, stdout);
-                n += strlen(buf);
-        }
-
-        if (hostname && shall_print(show_all, hostname, hostname_len)) {
-                printf(" %.*s", (int) hostname_len, hostname);
-                n += hostname_len + 1;
-        }
-
-        if (identifier && shall_print(show_all, identifier, identifier_len)) {
-                printf(" %.*s", (int) identifier_len, identifier);
-                n += identifier_len + 1;
-        } else if (comm && shall_print(show_all, comm, comm_len)) {
-                printf(" %.*s", (int) comm_len, comm);
-                n += comm_len + 1;
-        }
-
-        if (pid && shall_print(show_all, pid, pid_len)) {
-                printf("[%.*s]", (int) pid_len, pid);
-                n += pid_len + 2;
-        } else if (fake_pid && shall_print(show_all, fake_pid, fake_pid_len)) {
-                printf("[%.*s]", (int) fake_pid_len, fake_pid);
-                n += fake_pid_len + 2;
-        }
-
-        if (show_all)
-                printf(": %.*s\n", (int) message_len, message);
-        else if (contains_unprintable(message, message_len)) {
-                char bytes[FORMAT_BYTES_MAX];
-                printf(": [%s blob data]\n", format_bytes(bytes, sizeof(bytes), message_len));
-        } else if (message_len + n < columns())
-                printf(": %.*s\n", (int) message_len, message);
-        else if (n < columns()) {
-                char *e;
-
-                e = ellipsize_mem(message, message_len, columns() - n - 2, 90);
-
-                if (!e)
-                        printf(": %.*s\n", (int) message_len, message);
-                else
-                        printf(": %s\n", e);
-
-                free(e);
-        } else
-                fputs("\n", stdout);
-
-        r = 0;
-
-finish:
-        free(hostname);
-        free(identifier);
-        free(comm);
-        free(pid);
-        free(fake_pid);
-        free(message);
-        free(monotonic);
-        free(realtime);
-
-        return r;
-}
-
-static int output_short_realtime(sd_journal *j, unsigned line, bool show_all) {
-        return output_short(j, line, show_all, false);
-}
-
-static int output_short_monotonic(sd_journal *j, unsigned line, bool show_all) {
-        return output_short(j, line, show_all, true);
-}
-
-static int output_verbose(sd_journal *j, unsigned line, bool show_all) {
-        const void *data;
-        size_t length;
-        char *cursor;
-        uint64_t realtime;
-        char ts[FORMAT_TIMESTAMP_MAX];
-        int r;
-
-        assert(j);
-
-        r = sd_journal_get_realtime_usec(j, &realtime);
-        if (r < 0) {
-                log_error("Failed to get realtime timestamp: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_journal_get_cursor(j, &cursor);
-        if (r < 0) {
-                log_error("Failed to get cursor: %s", strerror(-r));
-                return r;
-        }
-
-        printf("%s [%s]\n",
-               format_timestamp(ts, sizeof(ts), realtime),
-               cursor);
-
-        free(cursor);
-
-        SD_JOURNAL_FOREACH_DATA(j, data, length) {
-                if (!show_all && (length > PRINT_THRESHOLD ||
-                                  contains_unprintable(data, length))) {
-                        const char *c;
-                        char bytes[FORMAT_BYTES_MAX];
-
-                        c = memchr(data, '=', length);
-                        if (!c) {
-                                log_error("Invalid field.");
-                                return -EINVAL;
-                        }
-
-                        printf("\t%.*s=[%s blob data]\n",
-                               (int) (c - (const char*) data),
-                               (const char*) data,
-                               format_bytes(bytes, sizeof(bytes), length - (c - (const char *) data) - 1));
-                } else
-                        printf("\t%.*s\n", (int) length, (const char*) data);
-        }
-
-        return 0;
-}
-
-static int output_export(sd_journal *j, unsigned line, bool show_all) {
-        sd_id128_t boot_id;
-        char sid[33];
-        int r;
-        usec_t realtime, monotonic;
-        char *cursor;
-        const void *data;
-        size_t length;
-
-        assert(j);
-
-        r = sd_journal_get_realtime_usec(j, &realtime);
-        if (r < 0) {
-                log_error("Failed to get realtime timestamp: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
-        if (r < 0) {
-                log_error("Failed to get monotonic timestamp: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_journal_get_cursor(j, &cursor);
-        if (r < 0) {
-                log_error("Failed to get cursor: %s", strerror(-r));
-                return r;
-        }
-
-        printf(".cursor=%s\n"
-               ".realtime=%llu\n"
-               ".monotonic=%llu\n"
-               ".boot_id=%s\n",
-               cursor,
-               (unsigned long long) realtime,
-               (unsigned long long) monotonic,
-               sd_id128_to_string(boot_id, sid));
-
-        free(cursor);
-
-        SD_JOURNAL_FOREACH_DATA(j, data, length) {
-
-                if (contains_unprintable(data, length)) {
-                        const char *c;
-                        uint64_t le64;
-
-                        c = memchr(data, '=', length);
-                        if (!c) {
-                                log_error("Invalid field.");
-                                return -EINVAL;
-                        }
-
-                        fwrite(data, c - (const char*) data, 1, stdout);
-                        fputc('\n', stdout);
-                        le64 = htole64(length - (c - (const char*) data) - 1);
-                        fwrite(&le64, sizeof(le64), 1, stdout);
-                        fwrite(c + 1, length - (c - (const char*) data) - 1, 1, stdout);
-                } else
-                        fwrite(data, length, 1, stdout);
-
-                fputc('\n', stdout);
-        }
-
-        fputc('\n', stdout);
-
-        return 0;
-}
-
-static void json_escape(const char* p, size_t l) {
-
-        if (contains_unprintable(p, l)) {
-                bool not_first = false;
-
-                fputs("[ ", stdout);
-
-                while (l > 0) {
-                        if (not_first)
-                                printf(", %u", (uint8_t) *p);
-                        else {
-                                not_first = true;
-                                printf("%u", (uint8_t) *p);
-                        }
-
-                        p++;
-                        l--;
-                }
-
-                fputs(" ]", stdout);
-        } else {
-                fputc('\"', stdout);
-
-                while (l > 0) {
-                        if (*p == '"' || *p == '\\') {
-                                fputc('\\', stdout);
-                                fputc(*p, stdout);
-                        } else
-                                fputc(*p, stdout);
-
-                        p++;
-                        l--;
-                }
-
-                fputc('\"', stdout);
-        }
-}
-
-static int output_json(sd_journal *j, unsigned line, bool show_all) {
-        uint64_t realtime, monotonic;
-        char *cursor;
-        const void *data;
-        size_t length;
-        sd_id128_t boot_id;
-        char sid[33];
-        int r;
-
-        assert(j);
-
-        r = sd_journal_get_realtime_usec(j, &realtime);
-        if (r < 0) {
-                log_error("Failed to get realtime timestamp: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
-        if (r < 0) {
-                log_error("Failed to get monotonic timestamp: %s", strerror(-r));
-                return r;
-        }
-
-        r = sd_journal_get_cursor(j, &cursor);
-        if (r < 0) {
-                log_error("Failed to get cursor: %s", strerror(-r));
-                return r;
-        }
-
-        if (line == 1)
-                fputc('\n', stdout);
-        else
-                fputs(",\n", stdout);
-
-        printf("{\n"
-               "\t\".cursor\" : \"%s\",\n"
-               "\t\".realtime\" : %llu,\n"
-               "\t\".monotonic\" : %llu,\n"
-               "\t\".boot_id\" : \"%s\"",
-               cursor,
-               (unsigned long long) realtime,
-               (unsigned long long) monotonic,
-               sd_id128_to_string(boot_id, sid));
-
-        free(cursor);
-
-        SD_JOURNAL_FOREACH_DATA(j, data, length) {
-                const char *c;
-
-                c = memchr(data, '=', length);
-                if (!c) {
-                        log_error("Invalid field.");
-                        return -EINVAL;
-                }
-
-                fputs(",\n\t", stdout);
-                json_escape(data, c - (const char*) data);
-                fputs(" : ", stdout);
-                json_escape(c + 1, length - (c - (const char*) data) - 1);
-        }
-
-        fputs("\n}", stdout);
-        fflush(stdout);
-
-        return 0;
-}
-
-static int output_cat(sd_journal *j, unsigned line, bool show_all) {
-        const void *data;
-        size_t l;
-        int r;
-
-        assert(j);
-
-        r = sd_journal_get_data(j, "MESSAGE", &data, &l);
-        if (r < 0) {
-                log_error("Failed to get data: %s", strerror(-r));
-                return r;
-        }
-
-        assert(l >= 8);
-
-        fwrite((const char*) data + 8, 1, l - 8, stdout);
-        putchar('\n');
-
-        return 0;
-}
-
-static int (*output_funcs[_OUTPUT_MODE_MAX])(sd_journal*j, unsigned line, bool show_all) = {
-        [OUTPUT_SHORT] = output_short_realtime,
-        [OUTPUT_SHORT_MONOTONIC] = output_short_monotonic,
-        [OUTPUT_VERBOSE] = output_verbose,
-        [OUTPUT_EXPORT] = output_export,
-        [OUTPUT_JSON] = output_json,
-        [OUTPUT_CAT] = output_cat
-};
-
-int output_journal(sd_journal *j, OutputMode mode, unsigned line, bool show_all) {
-        assert(mode >= 0);
-        assert(mode < _OUTPUT_MODE_MAX);
-
-        return output_funcs[mode](j, line, show_all);
-}
-
-int show_journal_by_unit(
-                const char *unit,
-                OutputMode mode,
-                const char *prefix,
-                unsigned n_columns,
-                usec_t not_before,
-                unsigned how_many,
-                bool show_all,
-                bool follow) {
-
-        char *m = NULL;
-        sd_journal *j;
-        int r;
-        int fd;
-        unsigned line = 0;
-        bool need_seek = false;
-
-        assert(mode >= 0);
-        assert(mode < _OUTPUT_MODE_MAX);
-        assert(unit);
-
-        if (!endswith(unit, ".service") &&
-            !endswith(unit, ".socket") &&
-            !endswith(unit, ".mount") &&
-            !endswith(unit, ".swap"))
-                return 0;
-
-        if (how_many <= 0)
-                return 0;
-
-        if (n_columns <= 0)
-                n_columns = columns();
-
-        if (!prefix)
-                prefix = "";
-
-        if (asprintf(&m, "_SYSTEMD_UNIT=%s", unit) < 0) {
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        r = sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY|SD_JOURNAL_SYSTEM_ONLY);
-        if (r < 0)
-                goto finish;
-
-        fd = sd_journal_get_fd(j);
-        if (fd < 0)
-                goto finish;
-
-        r = sd_journal_add_match(j, m, strlen(m));
-        if (r < 0)
-                goto finish;
-
-        r = sd_journal_seek_tail(j);
-        if (r < 0)
-                goto finish;
-
-        r = sd_journal_previous_skip(j, how_many);
-        if (r < 0)
-                goto finish;
-
-        if (mode == OUTPUT_JSON) {
-                fputc('[', stdout);
-                fflush(stdout);
-        }
-
-        for (;;) {
-                for (;;) {
-                        usec_t usec;
-
-                        if (need_seek) {
-                                r = sd_journal_next(j);
-                                if (r < 0)
-                                        goto finish;
-                        }
-
-                        if (r == 0)
-                                break;
-
-                        need_seek = true;
-
-                        if (not_before > 0) {
-                                r = sd_journal_get_monotonic_usec(j, &usec, NULL);
-
-                                /* -ESTALE is returned if the
-                                   timestamp is not from this boot */
-                                if (r == -ESTALE)
-                                        continue;
-                                else if (r < 0)
-                                        goto finish;
-
-                                if (usec < not_before)
-                                        continue;
-                        }
-
-                        line ++;
-
-                        r = output_journal(j, mode, line, show_all);
-                        if (r < 0)
-                                goto finish;
-                }
-
-                if (!follow)
-                        break;
-
-                r = fd_wait_for_event(fd, POLLIN, (usec_t) -1);
-                if (r < 0)
-                        goto finish;
-
-                r = sd_journal_process(j);
-                if (r < 0)
-                        goto finish;
-
-        }
-
-        if (mode == OUTPUT_JSON)
-                fputs("\n]\n", stdout);
-
-finish:
-        if (m)
-                free(m);
-
-        if (j)
-                sd_journal_close(j);
-
-        return r;
-}
-
-static const char *const output_mode_table[_OUTPUT_MODE_MAX] = {
-        [OUTPUT_SHORT] = "short",
-        [OUTPUT_SHORT_MONOTONIC] = "short-monotonic",
-        [OUTPUT_VERBOSE] = "verbose",
-        [OUTPUT_EXPORT] = "export",
-        [OUTPUT_JSON] = "json",
-        [OUTPUT_CAT] = "cat"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(output_mode, OutputMode);
diff --git a/src/logs-show.h b/src/logs-show.h
deleted file mode 100644 (file)
index abb82c8..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foologsshowhfoo
-#define foologsshowhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdbool.h>
-
-#include <systemd/sd-journal.h>
-
-#include "util.h"
-
-typedef enum OutputMode {
-        OUTPUT_SHORT,
-        OUTPUT_SHORT_MONOTONIC,
-        OUTPUT_VERBOSE,
-        OUTPUT_EXPORT,
-        OUTPUT_JSON,
-        OUTPUT_CAT,
-        _OUTPUT_MODE_MAX,
-        _OUTPUT_MODE_INVALID = -1
-} OutputMode;
-
-int output_journal(sd_journal *j, OutputMode mode, unsigned line, bool show_all);
-
-int show_journal_by_unit(
-                const char *unit,
-                OutputMode mode,
-                const char *prefix,
-                unsigned n_columns,
-                usec_t not_before,
-                unsigned how_many,
-                bool show_all,
-                bool follow);
-
-const char* output_mode_to_string(OutputMode m);
-OutputMode output_mode_from_string(const char *s);
-
-#endif
index 531f3b2..519521f 100644 (file)
 #include <fcntl.h>
 #include <sys/mount.h>
 
-#include <systemd/sd-id128.h>
-
 #include "machine-id-setup.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"
 
+static void make_v4_uuid(unsigned char *id) {
+        /* Stolen from generate_random_uuid() of drivers/char/random.c
+         * in the kernel sources */
+
+        /* Set UUID version to 4 --- truly random generation */
+        id[6] = (id[6] & 0x0F) | 0x40;
+
+        /* Set the UUID variant to DCE */
+        id[8] = (id[8] & 0x3F) | 0x80;
+}
+
 static int generate(char id[34]) {
-        int fd, r;
-        unsigned char *p;
-        sd_id128_t buf;
+        int fd;
+        unsigned char buf[16], *p;
         char *q;
         ssize_t k;
 
@@ -60,13 +68,26 @@ static int generate(char id[34]) {
         }
 
         /* If that didn't work, generate a random machine id */
-        r = sd_id128_randomize(&buf);
-        if (r < 0) {
-                log_error("Failed to open /dev/urandom: %s", strerror(-r));
-                return r;
+        fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
+        if (fd < 0) {
+                log_error("Failed to open /dev/urandom: %m");
+                return -errno;
+        }
+
+        k = loop_read(fd, buf, sizeof(buf), false);
+        close_nointr_nofail(fd);
+
+        if (k != sizeof(buf)) {
+                log_error("Failed to read /dev/urandom: %s", strerror(k < 0 ? -k : EIO));
+                return k < 0 ? (int) k : -EIO;
         }
 
-        for (p = buf.bytes, q = id; p < buf.bytes + sizeof(buf); p++, q += 2) {
+        /* Turn this into a valid v4 UUID, to be nice. Note that we
+         * only guarantee this for newly generated UUIDs, not for
+         * pre-existing ones.*/
+        make_v4_uuid(buf);
+
+        for (p = buf, q = id; p < buf + sizeof(buf); p++, q += 2) {
                 q[0] = hexchar(*p >> 4);
                 q[1] = hexchar(*p & 15);
         }
index 58de001..e7a4d2c 100644 (file)
@@ -91,7 +91,9 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
 #define assert_se(expr)                                                 \
         do {                                                            \
                 if (_unlikely_(!(expr)))                                \
-                        log_assert_failed(#expr, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+                        log_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \
+                                   "Assertion '%s' failed at %s:%u, function %s(). Aborting.", \
+                                   #expr , __FILE__, __LINE__, __PRETTY_FUNCTION__); \
         } while (false)                                                 \
 
 /* We override the glibc assert() here. */
@@ -104,7 +106,9 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
 
 #define assert_not_reached(t)                                           \
         do {                                                            \
-                log_assert_failed_unreachable(t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
+                log_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__,     \
+                           "Code should not be reached '%s' at %s:%u, function %s(). Aborting.", \
+                           t, __FILE__, __LINE__, __PRETTY_FUNCTION__); \
         } while (false)
 
 #define assert_cc(expr)                            \
@@ -145,7 +149,7 @@ static inline size_t ALIGN_TO(size_t l, size_t ali) {
                 char *_s = (char *)(s);         \
                 _i->iov_base = _s;              \
                 _i->iov_len = strlen(_s);       \
-        } while(false)
+        } while(false);
 
 static inline size_t IOVEC_TOTAL_SIZE(const struct iovec *i, unsigned n) {
         unsigned j;
index ed317b4..5c28a6c 100644 (file)
@@ -77,7 +77,7 @@ static bool arg_mount_auto = true;
 static bool arg_swap_auto = true;
 static char **arg_default_controllers = NULL;
 static char ***arg_join_controllers = NULL;
-static ExecOutput arg_default_std_output = EXEC_OUTPUT_JOURNAL;
+static ExecOutput arg_default_std_output = EXEC_OUTPUT_SYSLOG;
 static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT;
 
 static FILE* serialization = NULL;
@@ -200,16 +200,12 @@ static int console_setup(bool do_reset) {
         if (!do_reset)
                 return 0;
 
-        tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-        if (tty_fd < 0) {
+        if ((tty_fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0) {
                 log_error("Failed to open /dev/console: %s", strerror(-tty_fd));
                 return -tty_fd;
         }
 
-        /* We don't want to force text mode.
-         * plymouth may be showing pictures already from initrd. */
-        r = reset_terminal_fd(tty_fd, false);
-        if (r < 0)
+        if ((r = reset_terminal_fd(tty_fd)) < 0)
                 log_error("Failed to reset /dev/console: %s", strerror(-r));
 
         close_nointr_nofail(tty_fd);
@@ -274,7 +270,7 @@ static int parse_proc_cmdline_word(const char *word) {
                 int r;
 
                 if ((r = parse_boolean(word + 18)) < 0)
-                        log_warning("Failed to parse dump core switch %s. Ignoring.", word + 18);
+                        log_warning("Failed to parse dump core switch %s, Ignoring.", word + 18);
                 else
                         arg_dump_core = r;
 
@@ -282,7 +278,7 @@ static int parse_proc_cmdline_word(const char *word) {
                 int r;
 
                 if ((r = parse_boolean(word + 20)) < 0)
-                        log_warning("Failed to parse crash shell switch %s. Ignoring.", word + 20);
+                        log_warning("Failed to parse crash shell switch %s, Ignoring.", word + 20);
                 else
                         arg_crash_shell = r;
 
@@ -290,7 +286,7 @@ static int parse_proc_cmdline_word(const char *word) {
                 int r;
 
                 if ((r = parse_boolean(word + 22)) < 0)
-                        log_warning("Failed to parse confirm spawn switch %s. Ignoring.", word + 22);
+                        log_warning("Failed to parse confirm spawn switch %s, Ignoring.", word + 22);
                 else
                         arg_confirm_spawn = r;
 
@@ -298,7 +294,7 @@ static int parse_proc_cmdline_word(const char *word) {
                 int k;
 
                 if (safe_atoi(word + 19, &k) < 0)
-                        log_warning("Failed to parse crash chvt switch %s. Ignoring.", word + 19);
+                        log_warning("Failed to parse crash chvt switch %s, Ignoring.", word + 19);
                 else
                         arg_crash_chvt = k;
 
@@ -306,49 +302,29 @@ static int parse_proc_cmdline_word(const char *word) {
                 int r;
 
                 if ((r = parse_boolean(word + 20)) < 0)
-                        log_warning("Failed to parse show status switch %s. Ignoring.", word + 20);
+                        log_warning("Failed to parse show status switch %s, Ignoring.", word + 20);
                 else
                         arg_show_status = r;
         } else if (startswith(word, "systemd.default_standard_output=")) {
                 int r;
 
                 if ((r = exec_output_from_string(word + 32)) < 0)
-                        log_warning("Failed to parse default standard output switch %s. Ignoring.", word + 32);
+                        log_warning("Failed to parse default standard output switch %s, Ignoring.", word + 32);
                 else
                         arg_default_std_output = r;
         } else if (startswith(word, "systemd.default_standard_error=")) {
                 int r;
 
                 if ((r = exec_output_from_string(word + 31)) < 0)
-                        log_warning("Failed to parse default standard error switch %s. Ignoring.", word + 31);
+                        log_warning("Failed to parse default standard error switch %s, Ignoring.", word + 31);
                 else
                         arg_default_std_error = r;
-        } else if (startswith(word, "systemd.setenv=")) {
-                char *cenv, *eq;
-                int r;
-
-                cenv = strdup(word + 15);
-                if (!cenv)
-                        return -ENOMEM;
-
-                eq = strchr(cenv, '=');
-                if (!eq) {
-                        r = unsetenv(cenv);
-                        if (r < 0)
-                                log_warning("unsetenv failed %s. Ignoring.", strerror(errno));
-                } else {
-                        *eq = 0;
-                        r = setenv(cenv, eq + 1, 1);
-                        if (r < 0)
-                                log_warning("setenv failed %s. Ignoring.", strerror(errno));
-                }
-                free(cenv);
 #ifdef HAVE_SYSV_COMPAT
         } else if (startswith(word, "systemd.sysv_console=")) {
                 int r;
 
                 if ((r = parse_boolean(word + 21)) < 0)
-                        log_warning("Failed to parse SysV console switch %s. Ignoring.", word + 20);
+                        log_warning("Failed to parse SysV console switch %s, Ignoring.", word + 20);
                 else
                         arg_sysv_console = r;
 #endif
@@ -367,14 +343,14 @@ static int parse_proc_cmdline_word(const char *word) {
 #ifdef HAVE_SYSV_COMPAT
                          "systemd.sysv_console=0|1                 Connect output of SysV scripts to console\n"
 #endif
-                         "systemd.log_target=console|kmsg|journal|journal-or-kmsg|syslog|syslog-or-kmsg|null\n"
+                         "systemd.log_target=console|kmsg|syslog|syslog-or-kmsg|null\n"
                          "                                         Log target\n"
                          "systemd.log_level=LEVEL                  Log level\n"
                          "systemd.log_color=0|1                    Highlight important log messages\n"
                          "systemd.log_location=0|1                 Include code location in log messages\n"
-                         "systemd.default_standard_output=null|tty|syslog|syslog+console|kmsg|kmsg+console|journal|journal+console\n"
+                         "systemd.default_standard_output=null|tty|syslog|syslog+console|kmsg|kmsg+console\n"
                          "                                         Set default log output for services\n"
-                         "systemd.default_standard_error=null|tty|syslog|syslog+console|kmsg|kmsg+console|journal|journal+console\n"
+                         "systemd.default_standard_error=null|tty|syslog|syslog+console|kmsg|kmsg+console\n"
                          "                                         Set default log error output for services\n");
 
         } else if (streq(word, "quiet")) {
@@ -1017,7 +993,7 @@ static int help(void) {
 #ifdef HAVE_SYSV_COMPAT
                "     --sysv-console[=0|1]        Connect output of SysV scripts to console\n"
 #endif
-               "     --log-target=TARGET         Set log target (console, journal, syslog, kmsg, journal-or-kmsg, syslog-or-kmsg, null)\n"
+               "     --log-target=TARGET         Set log target (console, syslog, kmsg, syslog-or-kmsg, null)\n"
                "     --log-level=LEVEL           Set log level (debug, info, notice, warning, err, crit, alert, emerg)\n"
                "     --log-color[=0|1]           Highlight important log messages\n"
                "     --log-location[=0|1]        Include code location in log messages\n"
@@ -1158,7 +1134,7 @@ int main(int argc, char *argv[]) {
         bool reexecute = false;
         const char *shutdown_verb = NULL;
         dual_timestamp initrd_timestamp = { 0ULL, 0ULL };
-        static char systemd[] = "systemd";
+        char systemd[] = "systemd";
         bool is_reexec = false;
         int j;
         bool loaded_policy = false;
@@ -1189,9 +1165,9 @@ int main(int argc, char *argv[]) {
            called 'init'. After a subsequent reexecution we are then
            called 'systemd'. That is confusing, hence let's call us
            systemd right-away. */
+
         program_invocation_short_name = systemd;
         prctl(PR_SET_NAME, systemd);
-
         saved_argv = argv;
         saved_argc = argc;
 
@@ -1201,7 +1177,7 @@ int main(int argc, char *argv[]) {
 
         if (getpid() == 1) {
                 arg_running_as = MANAGER_SYSTEM;
-                log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_JOURNAL_OR_KMSG);
+                log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_SYSLOG_OR_KMSG);
 
                 if (!is_reexec)
                         if (selinux_setup(&loaded_policy) < 0)
@@ -1312,11 +1288,7 @@ int main(int argc, char *argv[]) {
 
         /* Set up PATH unless it is already set */
         setenv("PATH",
-#ifdef HAVE_SPLIT_USR
                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-#else
-               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
-#endif
                arg_running_as == MANAGER_SYSTEM);
 
         if (arg_running_as == MANAGER_SYSTEM) {
@@ -1428,7 +1400,6 @@ int main(int argc, char *argv[]) {
         } else {
                 DBusError error;
                 Unit *target = NULL;
-                Job *default_unit_job;
 
                 dbus_error_init(&error);
 
@@ -1437,41 +1408,39 @@ int main(int argc, char *argv[]) {
                 if ((r = manager_load_unit(m, arg_default_unit, NULL, &error, &target)) < 0) {
                         log_error("Failed to load default target: %s", bus_error(&error, r));
                         dbus_error_free(&error);
-                } else if (target->load_state == UNIT_ERROR)
-                        log_error("Failed to load default target: %s", strerror(-target->load_error));
-                else if (target->load_state == UNIT_MASKED)
+                } else if (target->meta.load_state == UNIT_ERROR)
+                        log_error("Failed to load default target: %s", strerror(-target->meta.load_error));
+                else if (target->meta.load_state == UNIT_MASKED)
                         log_error("Default target masked.");
 
-                if (!target || target->load_state != UNIT_LOADED) {
+                if (!target || target->meta.load_state != UNIT_LOADED) {
                         log_info("Trying to load rescue target...");
 
                         if ((r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &error, &target)) < 0) {
                                 log_error("Failed to load rescue target: %s", bus_error(&error, r));
                                 dbus_error_free(&error);
                                 goto finish;
-                        } else if (target->load_state == UNIT_ERROR) {
-                                log_error("Failed to load rescue target: %s", strerror(-target->load_error));
+                        } else if (target->meta.load_state == UNIT_ERROR) {
+                                log_error("Failed to load rescue target: %s", strerror(-target->meta.load_error));
                                 goto finish;
-                        } else if (target->load_state == UNIT_MASKED) {
+                        } else if (target->meta.load_state == UNIT_MASKED) {
                                 log_error("Rescue target masked.");
                                 goto finish;
                         }
                 }
 
-                assert(target->load_state == UNIT_LOADED);
+                assert(target->meta.load_state == UNIT_LOADED);
 
                 if (arg_action == ACTION_TEST) {
                         printf("-> By units:\n");
                         manager_dump_units(m, stdout, "\t");
                 }
 
-                r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &default_unit_job);
-                if (r < 0) {
+                if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, NULL)) < 0) {
                         log_error("Failed to start default target: %s", bus_error(&error, r));
                         dbus_error_free(&error);
                         goto finish;
                 }
-                m->default_unit_job_id = default_unit_job->id;
 
                 after_startup = now(CLOCK_MONOTONIC);
                 log_full(arg_action == ACTION_TEST ? LOG_INFO : LOG_DEBUG,
index 74bd740..e626347 100644 (file)
@@ -41,8 +41,6 @@
 #include <libaudit.h>
 #endif
 
-#include <systemd/sd-daemon.h>
-
 #include "manager.h"
 #include "hashmap.h"
 #include "macro.h"
@@ -60,6 +58,7 @@
 #include "special.h"
 #include "bus-errors.h"
 #include "exit-status.h"
+#include "sd-daemon.h"
 #include "virt.h"
 
 /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
@@ -195,7 +194,6 @@ static int manager_setup_signals(Manager *m) {
                         SIGRTMIN+21, /* systemd: disable status messages */
                         SIGRTMIN+22, /* systemd: set log level to LOG_DEBUG */
                         SIGRTMIN+23, /* systemd: set log level to LOG_INFO */
-                        SIGRTMIN+26, /* systemd: set log target to journal-or-kmsg */
                         SIGRTMIN+27, /* systemd: set log target to console */
                         SIGRTMIN+28, /* systemd: set log target to kmsg */
                         SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg */
@@ -233,7 +231,7 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
         dual_timestamp_get(&m->startup_timestamp);
 
         m->running_as = running_as;
-        m->name_data_slot = m->conn_data_slot = m->subscribed_data_slot = -1;
+        m->name_data_slot = m->subscribed_data_slot = -1;
         m->exit_code = _MANAGER_EXIT_CODE_INVALID;
         m->pin_cgroupfs_fd = -1;
 
@@ -247,11 +245,8 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
         if (!(m->environment = strv_copy(environ)))
                 goto fail;
 
-        if (running_as == MANAGER_SYSTEM) {
-                m->default_controllers = strv_new("cpu", NULL);
-                if (!m->default_controllers)
-                        goto fail;
-        }
+        if (!(m->default_controllers = strv_new("cpu", NULL)))
+                goto fail;
 
         if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
                 goto fail;
@@ -291,10 +286,7 @@ int manager_new(ManagerRunningAs running_as, Manager **_m) {
                 goto fail;
 
 #ifdef HAVE_AUDIT
-        if ((m->audit_fd = audit_open()) < 0 &&
-            /* If the kernel lacks netlink or audit support,
-             * don't worry about it. */
-            errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
+        if ((m->audit_fd = audit_open()) < 0)
                 log_error("Failed to connect to audit log: %m");
 #endif
 
@@ -309,15 +301,15 @@ fail:
 }
 
 static unsigned manager_dispatch_cleanup_queue(Manager *m) {
-        Unit *u;
+        Meta *meta;
         unsigned n = 0;
 
         assert(m);
 
-        while ((u = m->cleanup_queue)) {
-                assert(u->in_cleanup_queue);
+        while ((meta = m->cleanup_queue)) {
+                assert(meta->in_cleanup_queue);
 
-                unit_free(u);
+                unit_free((Unit*) meta);
                 n++;
         }
 
@@ -339,28 +331,28 @@ static void unit_gc_sweep(Unit *u, unsigned gc_marker) {
 
         assert(u);
 
-        if (u->gc_marker == gc_marker + GC_OFFSET_GOOD ||
-            u->gc_marker == gc_marker + GC_OFFSET_BAD ||
-            u->gc_marker == gc_marker + GC_OFFSET_IN_PATH)
+        if (u->meta.gc_marker == gc_marker + GC_OFFSET_GOOD ||
+            u->meta.gc_marker == gc_marker + GC_OFFSET_BAD ||
+            u->meta.gc_marker == gc_marker + GC_OFFSET_IN_PATH)
                 return;
 
-        if (u->in_cleanup_queue)
+        if (u->meta.in_cleanup_queue)
                 goto bad;
 
         if (unit_check_gc(u))
                 goto good;
 
-        u->gc_marker = gc_marker + GC_OFFSET_IN_PATH;
+        u->meta.gc_marker = gc_marker + GC_OFFSET_IN_PATH;
 
         is_bad = true;
 
-        SET_FOREACH(other, u->dependencies[UNIT_REFERENCED_BY], i) {
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REFERENCED_BY], i) {
                 unit_gc_sweep(other, gc_marker);
 
-                if (other->gc_marker == gc_marker + GC_OFFSET_GOOD)
+                if (other->meta.gc_marker == gc_marker + GC_OFFSET_GOOD)
                         goto good;
 
-                if (other->gc_marker != gc_marker + GC_OFFSET_BAD)
+                if (other->meta.gc_marker != gc_marker + GC_OFFSET_BAD)
                         is_bad = false;
         }
 
@@ -369,23 +361,23 @@ static void unit_gc_sweep(Unit *u, unsigned gc_marker) {
 
         /* We were unable to find anything out about this entry, so
          * let's investigate it later */
-        u->gc_marker = gc_marker + GC_OFFSET_UNSURE;
+        u->meta.gc_marker = gc_marker + GC_OFFSET_UNSURE;
         unit_add_to_gc_queue(u);
         return;
 
 bad:
         /* We definitely know that this one is not useful anymore, so
          * let's mark it for deletion */
-        u->gc_marker = gc_marker + GC_OFFSET_BAD;
+        u->meta.gc_marker = gc_marker + GC_OFFSET_BAD;
         unit_add_to_cleanup_queue(u);
         return;
 
 good:
-        u->gc_marker = gc_marker + GC_OFFSET_GOOD;
+        u->meta.gc_marker = gc_marker + GC_OFFSET_GOOD;
 }
 
 static unsigned manager_dispatch_gc_queue(Manager *m) {
-        Unit *u;
+        Meta *meta;
         unsigned n = 0;
         unsigned gc_marker;
 
@@ -404,21 +396,21 @@ static unsigned manager_dispatch_gc_queue(Manager *m) {
 
         gc_marker = m->gc_marker;
 
-        while ((u = m->gc_queue)) {
-                assert(u->in_gc_queue);
+        while ((meta = m->gc_queue)) {
+                assert(meta->in_gc_queue);
 
-                unit_gc_sweep(u, gc_marker);
+                unit_gc_sweep((Unit*) meta, gc_marker);
 
-                LIST_REMOVE(Unit, gc_queue, m->gc_queue, u);
-                u->in_gc_queue = false;
+                LIST_REMOVE(Meta, gc_queue, m->gc_queue, meta);
+                meta->in_gc_queue = false;
 
                 n++;
 
-                if (u->gc_marker == gc_marker + GC_OFFSET_BAD ||
-                    u->gc_marker == gc_marker + GC_OFFSET_UNSURE) {
-                        log_debug("Collecting %s", u->id);
-                        u->gc_marker = gc_marker + GC_OFFSET_BAD;
-                        unit_add_to_cleanup_queue(u);
+                if (meta->gc_marker == gc_marker + GC_OFFSET_BAD ||
+                    meta->gc_marker == gc_marker + GC_OFFSET_UNSURE) {
+                        log_debug("Collecting %s", meta->id);
+                        meta->gc_marker = gc_marker + GC_OFFSET_BAD;
+                        unit_add_to_cleanup_queue((Unit*) meta);
                 }
         }
 
@@ -533,7 +525,7 @@ int manager_coldplug(Manager *m) {
         HASHMAP_FOREACH_KEY(u, k, m->units, i) {
 
                 /* ignore aliases */
-                if (u->id != k)
+                if (u->meta.id != k)
                         continue;
 
                 if ((q = unit_coldplug(u)) < 0)
@@ -826,8 +818,8 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) {
                                  * another unit in which case we
                                  * rather remove the start. */
 
-                                log_debug("Looking at job %s/%s conflicted_by=%s", j->unit->id, job_type_to_string(j->type), yes_no(j->type == JOB_STOP && job_is_conflicted_by(j)));
-                                log_debug("Looking at job %s/%s conflicted_by=%s", k->unit->id, job_type_to_string(k->type), yes_no(k->type == JOB_STOP && job_is_conflicted_by(k)));
+                                log_debug("Looking at job %s/%s conflicted_by=%s", j->unit->meta.id, job_type_to_string(j->type), yes_no(j->type == JOB_STOP && job_is_conflicted_by(j)));
+                                log_debug("Looking at job %s/%s conflicted_by=%s", k->unit->meta.id, job_type_to_string(k->type), yes_no(k->type == JOB_STOP && job_is_conflicted_by(k)));
 
                                 if (j->type == JOB_STOP) {
 
@@ -853,7 +845,7 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) {
                                 return -ENOEXEC;
 
                         /* Ok, we can drop one, so let's do so. */
-                        log_debug("Fixing conflicting jobs by deleting job %s/%s", d->unit->id, job_type_to_string(d->type));
+                        log_debug("Fixing conflicting jobs by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type));
                         transaction_delete_job(m, d, true);
                         return 0;
                 }
@@ -891,7 +883,7 @@ static int transaction_merge_jobs(Manager *m, DBusError *e) {
 
                         /* We couldn't merge anything. Failure */
                         dbus_set_error(e, BUS_ERROR_TRANSACTION_JOBS_CONFLICTING, "Transaction contains conflicting jobs '%s' and '%s' for %s. Probably contradicting requirement dependencies configured.",
-                                       job_type_to_string(t), job_type_to_string(k->type), k->unit->id);
+                                       job_type_to_string(t), job_type_to_string(k->type), k->unit->meta.id);
                         return r;
                 }
         }
@@ -906,8 +898,8 @@ static int transaction_merge_jobs(Manager *m, DBusError *e) {
                         assert_se(job_type_merge(&t, k->type) == 0);
 
                 /* If an active job is mergeable, merge it too */
-                if (j->unit->job)
-                        job_type_merge(&t, j->unit->job->type); /* Might fail. Which is OK */
+                if (j->unit->meta.job)
+                        job_type_merge(&t, j->unit->meta.job->type); /* Might fail. Which is OK */
 
                 while ((k = j->transaction_next)) {
                         if (j->installed) {
@@ -917,8 +909,8 @@ static int transaction_merge_jobs(Manager *m, DBusError *e) {
                                 transaction_merge_and_delete_job(m, j, k, t);
                 }
 
-                if (j->unit->job && !j->installed)
-                        transaction_merge_and_delete_job(m, j, j->unit->job, t);
+                if (j->unit->meta.job && !j->installed)
+                        transaction_merge_and_delete_job(m, j, j->unit->meta.job, t);
 
                 assert(!j->transaction_next);
                 assert(!j->transaction_prev);
@@ -949,7 +941,7 @@ static void transaction_drop_redundant(Manager *m) {
 
                                 if (!job_is_anchor(k) &&
                                     (k->installed || job_type_is_redundant(k->type, unit_active_state(k->unit))) &&
-                                    (!k->unit->job || !job_type_is_conflicting(k->type, k->unit->job->type)))
+                                    (!k->unit->meta.job || !job_type_is_conflicting(k->type, k->unit->meta.job->type)))
                                         continue;
 
                                 changes_something = true;
@@ -959,7 +951,7 @@ static void transaction_drop_redundant(Manager *m) {
                         if (changes_something)
                                 continue;
 
-                        /* log_debug("Found redundant job %s/%s, dropping.", j->unit->id, job_type_to_string(j->type)); */
+                        /* log_debug("Found redundant job %s/%s, dropping.", j->unit->meta.id, job_type_to_string(j->type)); */
                         transaction_delete_job(m, j, false);
                         again = true;
                         break;
@@ -1010,12 +1002,12 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned
                  * job to remove. We use the marker to find our way
                  * back, since smart how we are we stored our way back
                  * in there. */
-                log_warning("Found ordering cycle on %s/%s", j->unit->id, job_type_to_string(j->type));
+                log_warning("Found ordering cycle on %s/%s", j->unit->meta.id, job_type_to_string(j->type));
 
                 delete = NULL;
                 for (k = from; k; k = ((k->generation == generation && k->marker != k) ? k->marker : NULL)) {
 
-                        log_info("Walked on cycle path to %s/%s", k->unit->id, job_type_to_string(k->type));
+                        log_info("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type));
 
                         if (!delete &&
                             !k->installed &&
@@ -1033,7 +1025,7 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned
 
 
                 if (delete) {
-                        log_warning("Breaking ordering cycle by deleting job %s/%s", delete->unit->id, job_type_to_string(delete->type));
+                        log_warning("Breaking ordering cycle by deleting job %s/%s", delete->unit->meta.id, job_type_to_string(delete->type));
                         transaction_delete_unit(m, delete->unit);
                         return -EAGAIN;
                 }
@@ -1053,7 +1045,7 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned
 
         /* We assume that the the dependencies are bidirectional, and
          * hence can ignore UNIT_AFTER */
-        SET_FOREACH(u, j->unit->dependencies[UNIT_BEFORE], i) {
+        SET_FOREACH(u, j->unit->meta.dependencies[UNIT_BEFORE], i) {
                 Job *o;
 
                 /* Is there a job for this unit? */
@@ -1062,7 +1054,7 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned
                         /* Ok, there is no job for this in the
                          * transaction, but maybe there is already one
                          * running? */
-                        if (!(o = u->job))
+                        if (!(o = u->meta.job))
                                 continue;
 
                 if ((r = transaction_verify_order_one(m, o, j, generation, e)) < 0)
@@ -1113,13 +1105,13 @@ static void transaction_collect_garbage(Manager *m) {
                 HASHMAP_FOREACH(j, m->transaction_jobs, i) {
                         if (j->object_list) {
                                 /* log_debug("Keeping job %s/%s because of %s/%s", */
-                                /*           j->unit->id, job_type_to_string(j->type), */
-                                /*           j->object_list->subject ? j->object_list->subject->unit->id : "root", */
+                                /*           j->unit->meta.id, job_type_to_string(j->type), */
+                                /*           j->object_list->subject ? j->object_list->subject->unit->meta.id : "root", */
                                 /*           j->object_list->subject ? job_type_to_string(j->object_list->subject->type) : "root"); */
                                 continue;
                         }
 
-                        /* log_debug("Garbage collecting job %s/%s", j->unit->id, job_type_to_string(j->type)); */
+                        /* log_debug("Garbage collecting job %s/%s", j->unit->meta.id, job_type_to_string(j->type)); */
                         transaction_delete_job(m, j, true);
                         again = true;
                         break;
@@ -1143,9 +1135,9 @@ static int transaction_is_destructive(Manager *m, DBusError *e) {
                 assert(!j->transaction_prev);
                 assert(!j->transaction_next);
 
-                if (j->unit->job &&
-                    j->unit->job != j &&
-                    !job_type_is_superset(j->type, j->unit->job->type)) {
+                if (j->unit->meta.job &&
+                    j->unit->meta.job != j &&
+                    !job_type_is_superset(j->type, j->unit->meta.job->type)) {
 
                         dbus_set_error(e, BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE, "Transaction is destructive.");
                         return -EEXIST;
@@ -1184,20 +1176,20 @@ static void transaction_minimize_impact(Manager *m) {
                                         j->type == JOB_STOP && UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(j->unit));
 
                                 changes_existing_job =
-                                        j->unit->job &&
-                                        job_type_is_conflicting(j->type, j->unit->job->type);
+                                        j->unit->meta.job &&
+                                        job_type_is_conflicting(j->type, j->unit->meta.job->type);
 
                                 if (!stops_running_service && !changes_existing_job)
                                         continue;
 
                                 if (stops_running_service)
-                                        log_debug("%s/%s would stop a running service.", j->unit->id, job_type_to_string(j->type));
+                                        log_debug("%s/%s would stop a running service.", j->unit->meta.id, job_type_to_string(j->type));
 
                                 if (changes_existing_job)
-                                        log_debug("%s/%s would change existing job.", j->unit->id, job_type_to_string(j->type));
+                                        log_debug("%s/%s would change existing job.", j->unit->meta.id, job_type_to_string(j->type));
 
                                 /* Ok, let's get rid of this */
-                                log_debug("Deleting %s/%s to minimize impact.", j->unit->id, job_type_to_string(j->type));
+                                log_debug("Deleting %s/%s to minimize impact.", j->unit->meta.id, job_type_to_string(j->type));
 
                                 transaction_delete_job(m, j, true);
                                 again = true;
@@ -1222,18 +1214,13 @@ static int transaction_apply(Manager *m, JobMode mode) {
 
                 /* When isolating first kill all installed jobs which
                  * aren't part of the new transaction */
-        rescan:
                 HASHMAP_FOREACH(j, m->jobs, i) {
                         assert(j->installed);
 
                         if (hashmap_get(m->transaction_jobs, j->unit))
                                 continue;
 
-                        /* 'j' itself is safe to remove, but if other jobs
-                           are invalidated recursively, our iterator may become
-                           invalid and we need to start over. */
-                        if (job_finish_and_invalidate(j, JOB_CANCELED) > 0)
-                                goto rescan;
+                        job_finish_and_invalidate(j, JOB_CANCELED);
                 }
         }
 
@@ -1251,14 +1238,14 @@ static int transaction_apply(Manager *m, JobMode mode) {
 
         while ((j = hashmap_steal_first(m->transaction_jobs))) {
                 if (j->installed) {
-                        /* log_debug("Skipping already installed job %s/%s as %u", j->unit->id, job_type_to_string(j->type), (unsigned) j->id); */
+                        /* log_debug("Skipping already installed job %s/%s as %u", j->unit->meta.id, job_type_to_string(j->type), (unsigned) j->id); */
                         continue;
                 }
 
-                if (j->unit->job)
-                        job_free(j->unit->job);
+                if (j->unit->meta.job)
+                        job_free(j->unit->meta.job);
 
-                j->unit->job = j;
+                j->unit->meta.job = j;
                 j->installed = true;
                 m->n_installed_jobs ++;
 
@@ -1272,7 +1259,7 @@ static int transaction_apply(Manager *m, JobMode mode) {
                 job_add_to_dbus_queue(j);
                 job_start_timer(j);
 
-                log_debug("Installed new job %s/%s as %u", j->unit->id, job_type_to_string(j->type), (unsigned) j->id);
+                log_debug("Installed new job %s/%s as %u", j->unit->meta.id, job_type_to_string(j->type), (unsigned) j->id);
         }
 
         /* As last step, kill all remaining job dependencies. */
@@ -1402,8 +1389,8 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool o
                 }
         }
 
-        if (unit->job && unit->job->type == type)
-                j = unit->job;
+        if (unit->meta.job && unit->meta.job->type == type)
+                j = unit->meta.job;
         else if (!(j = job_new(m, type, unit)))
                 return NULL;
 
@@ -1422,7 +1409,7 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool o
         if (is_new)
                 *is_new = true;
 
-        /* log_debug("Added job %s/%s to transaction.", unit->id, job_type_to_string(type)); */
+        /* log_debug("Added job %s/%s to transaction.", unit->meta.id, job_type_to_string(type)); */
 
         return j;
 }
@@ -1453,8 +1440,8 @@ void manager_transaction_unlink_job(Manager *m, Job *j, bool delete_dependencies
 
                 if (other && delete_dependencies) {
                         log_debug("Deleting job %s/%s as dependency of job %s/%s",
-                                  other->unit->id, job_type_to_string(other->type),
-                                  j->unit->id, job_type_to_string(j->type));
+                                  other->unit->meta.id, job_type_to_string(other->type),
+                                  j->unit->meta.id, job_type_to_string(j->type));
                         transaction_delete_job(m, other, delete_dependencies);
                 }
         }
@@ -1483,34 +1470,34 @@ static int transaction_add_job_and_dependencies(
         assert(unit);
 
         /* log_debug("Pulling in %s/%s from %s/%s", */
-        /*           unit->id, job_type_to_string(type), */
-        /*           by ? by->unit->id : "NA", */
+        /*           unit->meta.id, job_type_to_string(type), */
+        /*           by ? by->unit->meta.id : "NA", */
         /*           by ? job_type_to_string(by->type) : "NA"); */
 
-        if (unit->load_state != UNIT_LOADED &&
-            unit->load_state != UNIT_ERROR &&
-            unit->load_state != UNIT_MASKED) {
-                dbus_set_error(e, BUS_ERROR_LOAD_FAILED, "Unit %s is not loaded properly.", unit->id);
+        if (unit->meta.load_state != UNIT_LOADED &&
+            unit->meta.load_state != UNIT_ERROR &&
+            unit->meta.load_state != UNIT_MASKED) {
+                dbus_set_error(e, BUS_ERROR_LOAD_FAILED, "Unit %s is not loaded properly.", unit->meta.id);
                 return -EINVAL;
         }
 
-        if (type != JOB_STOP && unit->load_state == UNIT_ERROR) {
+        if (type != JOB_STOP && unit->meta.load_state == UNIT_ERROR) {
                 dbus_set_error(e, BUS_ERROR_LOAD_FAILED,
                                "Unit %s failed to load: %s. "
                                "See system logs and 'systemctl status %s' for details.",
-                               unit->id,
-                               strerror(-unit->load_error),
-                               unit->id);
+                               unit->meta.id,
+                               strerror(-unit->meta.load_error),
+                               unit->meta.id);
                 return -EINVAL;
         }
 
-        if (type != JOB_STOP && unit->load_state == UNIT_MASKED) {
-                dbus_set_error(e, BUS_ERROR_MASKED, "Unit %s is masked.", unit->id);
+        if (type != JOB_STOP && unit->meta.load_state == UNIT_MASKED) {
+                dbus_set_error(e, BUS_ERROR_MASKED, "Unit %s is masked.", unit->meta.id);
                 return -EINVAL;
         }
 
         if (!unit_job_is_applicable(unit, type)) {
-                dbus_set_error(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, "Job type %s is not applicable for unit %s.", job_type_to_string(type), unit->id);
+                dbus_set_error(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, "Job type %s is not applicable for unit %s.", job_type_to_string(type), unit->meta.id);
                 return -EBADR;
         }
 
@@ -1532,7 +1519,7 @@ static int transaction_add_job_and_dependencies(
                 if (unit_following_set(ret->unit, &following) > 0) {
                         SET_FOREACH(dep, following, i)
                                 if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, false, override, false, false, ignore_order, e, NULL)) < 0) {
-                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r));
+                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, bus_error(e, r));
 
                                         if (e)
                                                 dbus_error_free(e);
@@ -1543,7 +1530,7 @@ static int transaction_add_job_and_dependencies(
 
                 /* Finally, recursively add in all dependencies. */
                 if (type == JOB_START || type == JOB_RELOAD_OR_START) {
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUIRES], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRES], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, override, false, false, ignore_order, e, NULL)) < 0) {
                                         if (r != -EBADR)
                                                 goto fail;
@@ -1552,7 +1539,7 @@ static int transaction_add_job_and_dependencies(
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_BIND_TO], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_BIND_TO], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, override, false, false, ignore_order, e, NULL)) < 0) {
 
                                         if (r != -EBADR)
@@ -1562,23 +1549,23 @@ static int transaction_add_job_and_dependencies(
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !override, override, false, false, ignore_order, e, NULL)) < 0) {
-                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r));
+                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, bus_error(e, r));
 
                                         if (e)
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_WANTS], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_WANTS], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, false, false, false, ignore_order, e, NULL)) < 0) {
-                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r));
+                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, bus_error(e, r));
 
                                         if (e)
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUISITE], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, override, false, false, ignore_order, e, NULL)) < 0) {
 
                                         if (r != -EBADR)
@@ -1588,15 +1575,15 @@ static int transaction_add_job_and_dependencies(
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUISITE_OVERRIDABLE], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE_OVERRIDABLE], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, !override, override, false, false, ignore_order, e, NULL)) < 0) {
-                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r));
+                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, bus_error(e, r));
 
                                         if (e)
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_CONFLICTS], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_CONFLICTS], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, override, true, false, ignore_order, e, NULL)) < 0) {
 
                                         if (r != -EBADR)
@@ -1606,19 +1593,17 @@ static int transaction_add_job_and_dependencies(
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_CONFLICTED_BY], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_CONFLICTED_BY], i)
                                 if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, false, override, false, false, ignore_order, e, NULL)) < 0) {
-                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->id, bus_error(e, r));
+                                        log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, bus_error(e, r));
 
                                         if (e)
                                                 dbus_error_free(e);
                                 }
 
-                }
-
-                if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) {
+                } else if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) {
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_REQUIRED_BY], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRED_BY], i)
                                 if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, override, false, false, ignore_order, e, NULL)) < 0) {
 
                                         if (r != -EBADR)
@@ -1628,7 +1613,7 @@ static int transaction_add_job_and_dependencies(
                                                 dbus_error_free(e);
                                 }
 
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_BOUND_BY], i)
+                        SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_BOUND_BY], i)
                                 if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, override, false, false, ignore_order, e, NULL)) < 0) {
 
                                         if (r != -EBADR)
@@ -1639,20 +1624,6 @@ static int transaction_add_job_and_dependencies(
                                 }
                 }
 
-                if (type == JOB_RELOAD || type == JOB_RELOAD_OR_START) {
-
-                        SET_FOREACH(dep, ret->unit->dependencies[UNIT_PROPAGATE_RELOAD_TO], i) {
-                                r = transaction_add_job_and_dependencies(m, JOB_RELOAD, dep, ret, false, override, false, false, ignore_order, e, NULL);
-
-                                if (r < 0) {
-                                        log_warning("Cannot add dependency reload job for unit %s, ignoring: %s", dep->id, bus_error(e, r));
-
-                                        if (e)
-                                                dbus_error_free(e);
-                                }
-                        }
-                }
-
                 /* JOB_VERIFY_STARTED, JOB_RELOAD require no dependency handling */
         }
 
@@ -1676,14 +1647,14 @@ static int transaction_add_isolate_jobs(Manager *m) {
         HASHMAP_FOREACH_KEY(u, k, m->units, i) {
 
                 /* ignore aliases */
-                if (u->id != k)
+                if (u->meta.id != k)
                         continue;
 
-                if (u->ignore_on_isolate)
+                if (u->meta.ignore_on_isolate)
                         continue;
 
                 /* No need to stop inactive jobs */
-                if (UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(u)) && !u->job)
+                if (UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(u)) && !u->meta.job)
                         continue;
 
                 /* Is there already something listed for this? */
@@ -1691,7 +1662,7 @@ static int transaction_add_isolate_jobs(Manager *m) {
                         continue;
 
                 if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, u, NULL, true, false, false, false, false, NULL, NULL)) < 0)
-                        log_warning("Cannot add isolate job for unit %s, ignoring: %s", u->id, strerror(-r));
+                        log_warning("Cannot add isolate job for unit %s, ignoring: %s", u->meta.id, strerror(-r));
         }
 
         return 0;
@@ -1711,12 +1682,12 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
                 return -EINVAL;
         }
 
-        if (mode == JOB_ISOLATE && !unit->allow_isolate) {
+        if (mode == JOB_ISOLATE && !unit->meta.allow_isolate) {
                 dbus_set_error(e, BUS_ERROR_NO_ISOLATION, "Operation refused, unit may not be isolated.");
                 return -EPERM;
         }
 
-        log_debug("Trying to enqueue job %s/%s/%s", unit->id, job_type_to_string(type), job_mode_to_string(mode));
+        log_debug("Trying to enqueue job %s/%s/%s", unit->meta.id, job_type_to_string(type), job_mode_to_string(mode));
 
         if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, override, false,
                                                       mode == JOB_IGNORE_DEPENDENCIES || mode == JOB_IGNORE_REQUIREMENTS,
@@ -1734,7 +1705,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
         if ((r = transaction_activate(m, mode, e)) < 0)
                 return r;
 
-        log_debug("Enqueued job %s/%s as %u", unit->id, job_type_to_string(type), (unsigned) ret->id);
+        log_debug("Enqueued job %s/%s as %u", unit->meta.id, job_type_to_string(type), (unsigned) ret->id);
 
         if (_ret)
                 *_ret = ret;
@@ -1771,7 +1742,7 @@ Unit *manager_get_unit(Manager *m, const char *name) {
 }
 
 unsigned manager_dispatch_load_queue(Manager *m) {
-        Unit *u;
+        Meta *meta;
         unsigned n = 0;
 
         assert(m);
@@ -1785,10 +1756,10 @@ unsigned manager_dispatch_load_queue(Manager *m) {
         /* Dispatches the load queue. Takes a unit from the queue and
          * tries to load its data until the queue is empty */
 
-        while ((u = m->load_queue)) {
-                assert(u->in_load_queue);
+        while ((meta = m->load_queue)) {
+                assert(meta->in_load_queue);
 
-                unit_load(u);
+                unit_load((Unit*) meta);
                 n++;
         }
 
@@ -1798,7 +1769,6 @@ unsigned manager_dispatch_load_queue(Manager *m) {
 
 int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret) {
         Unit *ret;
-        UnitType t;
         int r;
 
         assert(m);
@@ -1815,30 +1785,24 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DB
         if (!name)
                 name = file_name_from_path(path);
 
-        t = unit_name_to_type(name);
-
-        if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid_no_type(name, false)) {
+        if (!unit_name_is_valid(name, false)) {
                 dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name);
                 return -EINVAL;
         }
 
-        ret = manager_get_unit(m, name);
-        if (ret) {
+        if ((ret = manager_get_unit(m, name))) {
                 *_ret = ret;
                 return 1;
         }
 
-        ret = unit_new(m, unit_vtable[t]->object_size);
-        if (!ret)
+        if (!(ret = unit_new(m)))
                 return -ENOMEM;
 
-        if (path) {
-                ret->fragment_path = strdup(path);
-                if (!ret->fragment_path) {
+        if (path)
+                if (!(ret->meta.fragment_path = strdup(path))) {
                         unit_free(ret);
                         return -ENOMEM;
                 }
-        }
 
         if ((r = unit_add_name(ret, name)) < 0) {
                 unit_free(ret);
@@ -1894,7 +1858,7 @@ void manager_dump_units(Manager *s, FILE *f, const char *prefix) {
         assert(f);
 
         HASHMAP_FOREACH_KEY(u, t, s->units, i)
-                if (u->id == t)
+                if (u->meta.id == t)
                         unit_dump(u, f, prefix);
 }
 
@@ -1932,7 +1896,7 @@ unsigned manager_dispatch_run_queue(Manager *m) {
 
 unsigned manager_dispatch_dbus_queue(Manager *m) {
         Job *j;
-        Unit *u;
+        Meta *meta;
         unsigned n = 0;
 
         assert(m);
@@ -1942,10 +1906,10 @@ unsigned manager_dispatch_dbus_queue(Manager *m) {
 
         m->dispatching_dbus_queue = true;
 
-        while ((u = m->dbus_unit_queue)) {
-                assert(u->in_dbus_queue);
+        while ((meta = m->dbus_unit_queue)) {
+                assert(meta->in_dbus_queue);
 
-                bus_unit_send_change_signal(u);
+                bus_unit_send_change_signal((Unit*) meta);
                 n++;
         }
 
@@ -2019,7 +1983,7 @@ static int manager_process_notify_fd(Manager *m) {
                 if (!(tags = strv_split(buf, "\n\r")))
                         return -ENOMEM;
 
-                log_debug("Got notification message for unit %s", u->id);
+                log_debug("Got notification message for unit %s", u->meta.id);
 
                 if (UNIT_VTABLE(u)->notify_message)
                         UNIT_VTABLE(u)->notify_message(u, ucred->pid, tags);
@@ -2060,7 +2024,7 @@ static int manager_dispatch_sigchld(Manager *m) {
                 if (si.si_code == CLD_EXITED || si.si_code == CLD_KILLED || si.si_code == CLD_DUMPED) {
                         char *name = NULL;
 
-                        get_process_comm(si.si_pid, &name);
+                        get_process_name(si.si_pid, &name);
                         log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
                         free(name);
                 }
@@ -2098,7 +2062,7 @@ static int manager_dispatch_sigchld(Manager *m) {
                 if (!u)
                         continue;
 
-                log_debug("Child %lu belongs to %s", (long unsigned) si.si_pid, u->id);
+                log_debug("Child %lu belongs to %s", (long unsigned) si.si_pid, u->meta.id);
 
                 hashmap_remove(m->watch_pids, LONG_TO_PTR(si.si_pid));
                 UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status);
@@ -2145,7 +2109,7 @@ static int manager_process_signal_fd(Manager *m) {
                 if (sfsi.ssi_pid > 0) {
                         char *p = NULL;
 
-                        get_process_comm(sfsi.ssi_pid, &p);
+                        get_process_name(sfsi.ssi_pid, &p);
 
                         log_debug("Received SIG%s from PID %lu (%s).",
                                   signal_to_string(sfsi.ssi_signo),
@@ -2304,11 +2268,6 @@ static int manager_process_signal_fd(Manager *m) {
                                 log_notice("Setting log level to info.");
                                 break;
 
-                        case 26:
-                                log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
-                                log_notice("Setting log target to journal-or-kmsg.");
-                                break;
-
                         case 27:
                                 log_set_target(LOG_TARGET_CONSOLE);
                                 log_notice("Setting log target to console.");
@@ -2562,10 +2521,10 @@ void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success) {
         if (m->running_as != MANAGER_SYSTEM)
                 return;
 
-        if (u->type != UNIT_SERVICE)
+        if (u->meta.type != UNIT_SERVICE)
                 return;
 
-        if (!(p = unit_name_to_prefix_and_instance(u->id))) {
+        if (!(p = unit_name_to_prefix_and_instance(u->meta.id))) {
                 log_error("Failed to allocate unit name for audit message: %s", strerror(ENOMEM));
                 return;
         }
@@ -2603,9 +2562,9 @@ void manager_send_unit_plymouth(Manager *m, Unit *u) {
         if (m->running_as != MANAGER_SYSTEM)
                 return;
 
-        if (u->type != UNIT_SERVICE &&
-            u->type != UNIT_MOUNT &&
-            u->type != UNIT_SWAP)
+        if (u->meta.type != UNIT_SERVICE &&
+            u->meta.type != UNIT_MOUNT &&
+            u->meta.type != UNIT_SWAP)
                 return;
 
         /* We set SOCK_NONBLOCK here so that we rather drop the
@@ -2631,7 +2590,7 @@ void manager_send_unit_plymouth(Manager *m, Unit *u) {
                 goto finish;
         }
 
-        if (asprintf(&message, "U\002%c%s%n", (int) (strlen(u->id) + 1), u->id, &n) < 0) {
+        if (asprintf(&message, "U\002%c%s%n", (int) (strlen(u->meta.id) + 1), u->meta.id, &n) < 0) {
                 log_error("Out of memory");
                 goto finish;
         }
@@ -2751,14 +2710,14 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds) {
         fputc('\n', f);
 
         HASHMAP_FOREACH_KEY(u, t, m->units, i) {
-                if (u->id != t)
+                if (u->meta.id != t)
                         continue;
 
                 if (!unit_can_serialize(u))
                         continue;
 
                 /* Start marker */
-                fputs(u->id, f);
+                fputs(u->meta.id, f);
                 fputc('\n', f);
 
                 if ((r = unit_serialize(u, f, fds)) < 0) {
@@ -2943,13 +2902,13 @@ bool manager_is_booting_or_shutting_down(Manager *m) {
         assert(m);
 
         /* Is the initial job still around? */
-        if (manager_get_job(m, m->default_unit_job_id))
+        if (manager_get_job(m, 1))
                 return true;
 
         /* Is there a job for the shutdown target? */
         u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET);
         if (u)
-                return !!u->job;
+                return !!u->meta.job;
 
         return false;
 }
@@ -3137,7 +3096,7 @@ int manager_set_default_controllers(Manager *m, char **controllers) {
         return 0;
 }
 
-void manager_recheck_journal(Manager *m) {
+void manager_recheck_syslog(Manager *m) {
         Unit *u;
 
         assert(m);
@@ -3145,20 +3104,36 @@ void manager_recheck_journal(Manager *m) {
         if (m->running_as != MANAGER_SYSTEM)
                 return;
 
-        u = manager_get_unit(m, SPECIAL_JOURNALD_SOCKET);
-        if (u && SOCKET(u)->state != SOCKET_RUNNING) {
-                log_close_journal();
-                return;
-        }
+        if ((u = manager_get_unit(m, SPECIAL_SYSLOG_SOCKET))) {
+                SocketState state;
 
-        u = manager_get_unit(m, SPECIAL_JOURNALD_SERVICE);
-        if (u && SERVICE(u)->state != SERVICE_RUNNING) {
-                log_close_journal();
-                return;
+                state = SOCKET(u)->state;
+
+                if (state != SOCKET_DEAD &&
+                    state != SOCKET_FAILED &&
+                    state != SOCKET_RUNNING) {
+
+                        /* Hmm, the socket is not set up, or is still
+                         * listening, let's better not try to use
+                         * it. Note that we have no problem if the
+                         * socket is completely down, since there
+                         * might be a foreign /dev/log socket around
+                         * and we want to make use of that.
+                         */
+
+                        log_close_syslog();
+                        return;
+                }
         }
 
-        /* Hmm, OK, so the socket is fully up and the service is up
-         * too, then let's make use of the thing. */
+        if ((u = manager_get_unit(m, SPECIAL_SYSLOG_TARGET)))
+                if (TARGET(u)->state != TARGET_ACTIVE) {
+                        log_close_syslog();
+                        return;
+                }
+
+        /* Hmm, OK, so the socket is either fully up, or fully down,
+         * and the target is up, then let's make use of the socket */
         log_open();
 }
 
index a9d08f0..5deb569 100644 (file)
@@ -74,7 +74,7 @@ struct Watch {
         int fd;
         WatchType type;
         union {
-                struct Unit *unit;
+                union Unit *unit;
                 struct Job *job;
                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;
@@ -102,10 +102,10 @@ struct Manager {
 
         /* To make it easy to iterate through the units of a specific
          * type we maintain a per type linked list */
-        LIST_HEAD(Unit, units_by_type[_UNIT_TYPE_MAX]);
+        LIST_HEAD(Meta, units_by_type[_UNIT_TYPE_MAX]);
 
         /* Units that need to be loaded */
-        LIST_HEAD(Unit, load_queue); /* this is actually more a stack than a queue, but uh. */
+        LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
 
         /* Jobs that need to be run */
         LIST_HEAD(Job, run_queue);   /* more a stack than a queue, too */
@@ -114,14 +114,14 @@ struct Manager {
          * D-Bus. When something about a job changes it is added here
          * if it is not in there yet. This allows easy coalescing of
          * D-Bus change signals. */
-        LIST_HEAD(Unit, dbus_unit_queue);
+        LIST_HEAD(Meta, dbus_unit_queue);
         LIST_HEAD(Job, dbus_job_queue);
 
         /* Units to remove */
-        LIST_HEAD(Unit, cleanup_queue);
+        LIST_HEAD(Meta, cleanup_queue);
 
         /* Units to check when doing GC */
-        LIST_HEAD(Unit, gc_queue);
+        LIST_HEAD(Meta, gc_queue);
 
         /* Jobs to be added */
         Hashmap *transaction_jobs;      /* Unit object => Job object list 1:1 */
@@ -179,11 +179,9 @@ struct Manager {
 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_data_slot;
-        int32_t conn_data_slot;
         int32_t subscribed_data_slot;
 
         uint32_t current_job_id;
-        uint32_t default_unit_job_id;
 
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
@@ -290,7 +288,7 @@ void manager_check_finished(Manager *m);
 void manager_run_generators(Manager *m);
 void manager_undo_generators(Manager *m);
 
-void manager_recheck_journal(Manager *m);
+void manager_recheck_syslog(Manager *m);
 
 void manager_set_show_status(Manager *m, bool b);
 bool manager_get_show_status(Manager *m);
index 043e909..8dd98f7 100644 (file)
 #include <sys/stat.h>
 #include <limits.h>
 #include <dirent.h>
-#include <libkmod.h>
 
 #include "log.h"
 #include "util.h"
 #include "strv.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-static void systemd_kmod_log(void *data, int priority, const char *file, int line,
-                             const char *fn, const char *format, va_list args)
-{
-        log_meta(priority, file, line, fn, format, args);
-}
-#pragma GCC diagnostic pop
-
 int main(int argc, char *argv[]) {
         int r = EXIT_FAILURE;
+        char **arguments = NULL;
+        unsigned n_arguments = 0, n_allocated = 0;
         char **files, **fn;
-        struct kmod_ctx *ctx;
-        const int probe_flags = KMOD_PROBE_APPLY_BLACKLIST|KMOD_PROBE_IGNORE_LOADED;
 
         if (argc > 1) {
                 log_error("This program takes no argument.");
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
         umask(0022);
 
-        if (!(ctx = kmod_new(NULL, NULL))) {
-                log_error("Failed to allocate memory for kmod.");
+        if (!(arguments = strv_new("/sbin/modprobe", "-sab", "--", NULL))) {
+                log_error("Failed to allocate string array");
                 goto finish;
         }
 
-        kmod_load_resources(ctx);
-
-        kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
+        n_arguments = n_allocated = 3;
 
         if (conf_files_list(&files, ".conf",
                             "/run/modules-load.d",
@@ -95,9 +83,7 @@ int main(int argc, char *argv[]) {
 
                 log_debug("apply: %s\n", *fn);
                 for (;;) {
-                        char line[LINE_MAX], *l;
-                        struct kmod_list *itr, *modlist = NULL;
-                        int err;
+                        char line[LINE_MAX], *l, *t;
 
                         if (!(fgets(line, sizeof(line), f)))
                                 break;
@@ -106,45 +92,52 @@ int main(int argc, char *argv[]) {
                         if (*l == '#' || *l == 0)
                                 continue;
 
-                        err = kmod_module_new_from_lookup(ctx, l, &modlist);
-                        if (err < 0) {
-                                log_error("Failed to lookup alias '%s'", l);
-                                r = EXIT_FAILURE;
+                        if (!(t = strdup(l))) {
+                                log_error("Failed to allocate module name.");
                                 continue;
                         }
 
-                        kmod_list_foreach(itr, modlist) {
-                                struct kmod_module *mod = kmod_module_get_module(itr);
-                                err = kmod_module_probe_insert_module(mod, probe_flags,
-                                                                      NULL, NULL, NULL, NULL);
-
-                                if (err == 0)
-                                        log_info("Inserted module '%s'", kmod_module_get_name(mod));
-                                else if (err == KMOD_PROBE_APPLY_BLACKLIST)
-                                        log_info("Module '%s' is blacklisted", kmod_module_get_name(mod));
-                                else {
-                                        log_error("Failed to insert '%s': %s", kmod_module_get_name(mod),
-                                                        strerror(-err));
+                        if (n_arguments >= n_allocated) {
+                                char **a;
+                                unsigned m;
+
+                                m = MAX(16U, n_arguments*2);
+
+                                if (!(a = realloc(arguments, sizeof(char*) * (m+1)))) {
+                                        log_error("Failed to increase module array size.");
+                                        free(t);
                                         r = EXIT_FAILURE;
+                                        continue;
                                 }
 
-                                kmod_module_unref(mod);
+                                arguments = a;
+                                n_allocated = m;
                         }
 
-                        kmod_module_unref_list(modlist);
+                        arguments[n_arguments++] = t;
                 }
 
                 if (ferror(f)) {
-                        log_error("Failed to read from file: %m");
                         r = EXIT_FAILURE;
+                        log_error("Failed to read from file: %m");
                 }
 
                 fclose(f);
         }
 
-finish:
         strv_free(files);
-        kmod_unref(ctx);
+finish:
+
+        if (n_arguments > 3) {
+                arguments[n_arguments] = NULL;
+                strv_uniq(arguments);
+                execv("/sbin/modprobe", arguments);
+
+                log_error("Failed to execute /sbin/modprobe: %m");
+                r = EXIT_FAILURE;
+        }
+
+        strv_free(arguments);
 
         return r;
 }
index 0ae964b..ef953f0 100644 (file)
@@ -59,7 +59,7 @@ static void mount_init(Unit *u) {
         Mount *m = MOUNT(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         m->timeout_usec = DEFAULT_TIMEOUT_USEC;
         m->directory_mode = 0755;
@@ -68,10 +68,8 @@ static void mount_init(Unit *u) {
 
         /* The stdio/kmsg bridge socket is on /, in order to avoid a
          * dep loop, don't use kmsg logging for -.mount */
-        if (!unit_has_name(u, "-.mount")) {
-                m->exec_context.std_output = u->manager->default_std_output;
-                m->exec_context.std_error = u->manager->default_std_error;
-        }
+        if (!unit_has_name(u, "-.mount"))
+                m->exec_context.std_output = EXEC_OUTPUT_KMSG;
 
         /* We need to make sure that /bin/mount is always called in
          * the same process group as us, so that the autofs kernel
@@ -83,7 +81,7 @@ static void mount_init(Unit *u) {
 
         m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
 
-        UNIT(m)->ignore_on_isolate = true;
+        m->meta.ignore_on_isolate = true;
 }
 
 static void mount_unwatch_control_pid(Mount *m) {
@@ -108,12 +106,21 @@ static void mount_parameters_done(MountParameters *p) {
 
 static void mount_done(Unit *u) {
         Mount *m = MOUNT(u);
+        Meta *other;
 
         assert(m);
 
         free(m->where);
         m->where = NULL;
 
+        /* Try to detach us from the automount unit if there is any */
+        LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_AUTOMOUNT]) {
+                Automount *a = (Automount*) other;
+
+                if (a->mount == m)
+                        a->mount = NULL;
+        }
+
         mount_parameters_done(&m->parameters_etc_fstab);
         mount_parameters_done(&m->parameters_proc_self_mountinfo);
         mount_parameters_done(&m->parameters_fragment);
@@ -148,7 +155,7 @@ static MountParameters* get_mount_parameters(Mount *m) {
 }
 
 static int mount_add_mount_links(Mount *m) {
-        Unit *other;
+        Meta *other;
         int r;
         MountParameters *pm;
 
@@ -159,14 +166,14 @@ static int mount_add_mount_links(Mount *m) {
         /* Adds in links to other mount points that might lie below or
          * above us in the hierarchy */
 
-        LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_MOUNT]) {
-                Mount *n = MOUNT(other);
+        LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_MOUNT]) {
+                Mount *n = (Mount*) other;
                 MountParameters *pn;
 
                 if (n == m)
                         continue;
 
-                if (UNIT(n)->load_state != UNIT_LOADED)
+                if (n->meta.load_state != UNIT_LOADED)
                         continue;
 
                 pn = get_mount_parameters_configured(n);
@@ -211,52 +218,52 @@ static int mount_add_mount_links(Mount *m) {
 }
 
 static int mount_add_swap_links(Mount *m) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(m);
 
-        LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_SWAP])
-                if ((r = swap_add_one_mount_link(SWAP(other), m)) < 0)
+        LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_SWAP])
+                if ((r = swap_add_one_mount_link((Swap*) other, m)) < 0)
                         return r;
 
         return 0;
 }
 
 static int mount_add_path_links(Mount *m) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(m);
 
-        LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_PATH])
-                if ((r = path_add_one_mount_link(PATH(other), m)) < 0)
+        LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_PATH])
+                if ((r = path_add_one_mount_link((Path*) other, m)) < 0)
                         return r;
 
         return 0;
 }
 
 static int mount_add_automount_links(Mount *m) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(m);
 
-        LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_AUTOMOUNT])
-                if ((r = automount_add_one_mount_link(AUTOMOUNT(other), m)) < 0)
+        LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_AUTOMOUNT])
+                if ((r = automount_add_one_mount_link((Automount*) other, m)) < 0)
                         return r;
 
         return 0;
 }
 
 static int mount_add_socket_links(Mount *m) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(m);
 
-        LIST_FOREACH(units_by_type, other, UNIT(m)->manager->units_by_type[UNIT_SOCKET])
-                if ((r = socket_add_one_mount_link(SOCKET(other), m)) < 0)
+        LIST_FOREACH(units_by_type, other, m->meta.manager->units_by_type[UNIT_SOCKET])
+                if ((r = socket_add_one_mount_link((Socket*) other, m)) < 0)
                         return r;
 
         return 0;
@@ -320,7 +327,7 @@ static bool needs_quota(MountParameters *p) {
 }
 
 static int mount_add_fstab_links(Mount *m) {
-        const char *target, *after, *tu_wants = NULL;
+        const char *target, *after = NULL;
         MountParameters *p;
         Unit *tu;
         int r;
@@ -328,7 +335,7 @@ static int mount_add_fstab_links(Mount *m) {
 
         assert(m);
 
-        if (UNIT(m)->manager->running_as != MANAGER_SYSTEM)
+        if (m->meta.manager->running_as != MANAGER_SYSTEM)
                 return 0;
 
         if (!(p = get_mount_parameters_configured(m)))
@@ -346,31 +353,26 @@ static int mount_add_fstab_links(Mount *m) {
                 automount ||
                 mount_test_option(p->options, "comment=systemd.mount") ||
                 mount_test_option(p->options, "x-systemd-mount") ||
-                UNIT(m)->manager->mount_auto;
+                m->meta.manager->mount_auto;
 
         if (mount_is_network(p)) {
                 target = SPECIAL_REMOTE_FS_TARGET;
-                after = tu_wants = SPECIAL_REMOTE_FS_PRE_TARGET;
+                after = SPECIAL_REMOTE_FS_PRE_TARGET;
         } else {
                 target = SPECIAL_LOCAL_FS_TARGET;
                 after = SPECIAL_LOCAL_FS_PRE_TARGET;
         }
 
-        r = manager_load_unit(UNIT(m)->manager, target, NULL, NULL, &tu);
-        if (r < 0)
-                return r;
-
-        if (tu_wants) {
-                r = unit_add_dependency_by_name(tu, UNIT_WANTS, tu_wants, NULL, true);
-                if (r < 0)
+        if (!path_equal(m->where, "/"))
+                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
                         return r;
-        }
 
-        if (after) {
-                r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true);
-                if (r < 0)
+        if ((r = manager_load_unit(m->meta.manager, target, NULL, NULL, &tu)) < 0)
+                return r;
+
+        if (after)
+                if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
                         return r;
-        }
 
         if (automount) {
                 Unit *am;
@@ -386,9 +388,9 @@ static int mount_add_fstab_links(Mount *m) {
 
                 /* Install automount unit */
                 if (!nofail) /* automount + fail */
-                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, am, true);
+                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, UNIT(am), true);
                 else /* automount + nofail */
-                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, am, true);
+                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true);
 
         } else if (handle && !noauto) {
 
@@ -426,13 +428,13 @@ static int mount_add_device_links(Mount *m) {
 
                 if ((r = unit_add_node_link(UNIT(m), p->what,
                                             !noauto && nofail &&
-                                            UNIT(m)->manager->running_as == MANAGER_SYSTEM)) < 0)
+                                            UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM)) < 0)
                         return r;
         }
 
         if (p->passno > 0 &&
             !mount_is_bind(p) &&
-            UNIT(m)->manager->running_as == MANAGER_SYSTEM &&
+            UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM &&
             !path_equal(m->where, "/")) {
                 char *name;
                 Unit *fsck;
@@ -442,7 +444,7 @@ static int mount_add_device_links(Mount *m) {
                 if (!(name = unit_name_from_path_instance("fsck", p->what, ".service")))
                         return -ENOMEM;
 
-                if ((r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck)) < 0) {
+                if ((r = manager_load_unit_prepare(m->meta.manager, name, NULL, NULL, &fsck)) < 0) {
                         log_warning("Failed to prepare unit %s: %s", name, strerror(-r));
                         free(name);
                         return r;
@@ -461,23 +463,24 @@ static int mount_add_device_links(Mount *m) {
 
 static int mount_add_default_dependencies(Mount *m) {
         int r;
-        MountParameters *p;
 
         assert(m);
 
-        if (UNIT(m)->manager->running_as != MANAGER_SYSTEM)
-                return 0;
+        if (m->meta.manager->running_as == MANAGER_SYSTEM &&
+            !path_equal(m->where, "/")) {
+                MountParameters *p;
 
-        p = get_mount_parameters_configured(m);
-        if (p && needs_quota(p)) {
-                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 ||
-                    (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0)
-                        return r;
-        }
+                p = get_mount_parameters_configured(m);
+
+                if (p && needs_quota(p)) {
+                        if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0 ||
+                            (r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_WANTS, SPECIAL_QUOTAON_SERVICE, NULL, true)) < 0)
+                                return r;
+                }
 
-        if (!path_equal(m->where, "/"))
                 if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
                         return r;
+        }
 
         return 0;
 }
@@ -520,11 +523,11 @@ static int mount_fix_timeouts(Mount *m) {
                 return r;
         }
 
-        SET_FOREACH(other, UNIT(m)->dependencies[UNIT_AFTER], i) {
-                if (other->type != UNIT_DEVICE)
+        SET_FOREACH(other, m->meta.dependencies[UNIT_AFTER], i) {
+                if (other->meta.type != UNIT_DEVICE)
                         continue;
 
-                other->job_timeout = u;
+                other->meta.job_timeout = u;
         }
 
         return 0;
@@ -535,7 +538,7 @@ static int mount_verify(Mount *m) {
         char *e;
         assert(m);
 
-        if (UNIT(m)->load_state != UNIT_LOADED)
+        if (m->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!m->from_etc_fstab && !m->from_fragment && !m->from_proc_self_mountinfo)
@@ -548,7 +551,7 @@ static int mount_verify(Mount *m) {
         free(e);
 
         if (!b) {
-                log_error("%s's Where setting doesn't match unit name. Refusing.", UNIT(m)->id);
+                log_error("%s's Where setting doesn't match unit name. Refusing.", m->meta.id);
                 return -EINVAL;
         }
 
@@ -557,13 +560,13 @@ static int mount_verify(Mount *m) {
                 return -EINVAL;
         }
 
-        if (UNIT(m)->fragment_path && !m->parameters_fragment.what) {
-                log_error("%s's What setting is missing. Refusing.", UNIT(m)->id);
+        if (m->meta.fragment_path && !m->parameters_fragment.what) {
+                log_error("%s's What setting is missing. Refusing.", m->meta.id);
                 return -EBADMSG;
         }
 
         if (m->exec_context.pam_name && m->exec_context.kill_mode != KILL_CONTROL_GROUP) {
-                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(m)->id);
+                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", m->meta.id);
                 return -EINVAL;
         }
 
@@ -575,31 +578,28 @@ static int mount_load(Unit *u) {
         int r;
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
                 return r;
 
         /* This is a new unit? Then let's add in some extras */
-        if (u->load_state == UNIT_LOADED) {
+        if (u->meta.load_state == UNIT_LOADED) {
                 if ((r = unit_add_exec_dependencies(u, &m->exec_context)) < 0)
                         return r;
 
-                if (UNIT(m)->fragment_path)
+                if (m->meta.fragment_path)
                         m->from_fragment = true;
                 else if (m->from_etc_fstab)
-                        /* We always add several default dependencies to fstab mounts,
-                         * but we do not want the implicit complementing of Wants= with After=
-                         * in the target unit that this mount unit will be hooked into. */
-                        UNIT(m)->default_dependencies = false;
+                        m->meta.default_dependencies = false;
 
                 if (!m->where)
-                        if (!(m->where = unit_name_to_path(u->id)))
+                        if (!(m->where = unit_name_to_path(u->meta.id)))
                                 return -ENOMEM;
 
                 path_kill_slashes(m->where);
 
-                if (!UNIT(m)->description)
+                if (!m->meta.description)
                         if ((r = unit_set_description(u, m->where)) < 0)
                                 return r;
 
@@ -624,7 +624,7 @@ static int mount_load(Unit *u) {
                 if ((r = mount_add_fstab_links(m)) < 0)
                         return r;
 
-                if (UNIT(m)->default_dependencies || m->from_etc_fstab)
+                if (m->meta.default_dependencies)
                         if ((r = mount_add_default_dependencies(m)) < 0)
                                 return r;
 
@@ -640,18 +640,13 @@ static int mount_load(Unit *u) {
 static int mount_notify_automount(Mount *m, int status) {
         Unit *p;
         int r;
-        Iterator i;
 
         assert(m);
 
-        SET_FOREACH(p, UNIT(m)->dependencies[UNIT_TRIGGERED_BY], i)
-                if (p->type == UNIT_AUTOMOUNT) {
-                         r = automount_send_ready(AUTOMOUNT(p), status);
-                         if (r < 0)
-                                 return r;
-                }
+        if ((r = unit_get_related_unit(UNIT(m), ".automount", &p)) < 0)
+                return r == -ENOENT ? 0 : r;
 
-        return 0;
+        return automount_send_ready(AUTOMOUNT(p), status);
 }
 
 static void mount_set_state(Mount *m, MountState state) {
@@ -693,12 +688,12 @@ static void mount_set_state(Mount *m, MountState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(m)->id,
+                          m->meta.id,
                           mount_state_to_string(old_state),
                           mount_state_to_string(state));
 
-        unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state], m->reload_result == MOUNT_SUCCESS);
-        m->reload_result = MOUNT_SUCCESS;
+        unit_notify(UNIT(m), state_translation_table[old_state], state_translation_table[state], !m->reload_failure);
+        m->reload_failure = false;
 }
 
 static int mount_coldplug(Unit *u) {
@@ -754,7 +749,6 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sMount State: %s\n"
-                "%sResult: %s\n"
                 "%sWhere: %s\n"
                 "%sWhat: %s\n"
                 "%sFile System Type: %s\n"
@@ -764,7 +758,6 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sFrom fragment: %s\n"
                 "%sDirectoryMode: %04o\n",
                 prefix, mount_state_to_string(m->state),
-                prefix, mount_result_to_string(m->result),
                 prefix, m->where,
                 prefix, strna(p->what),
                 prefix, strna(p->fstype),
@@ -797,13 +790,13 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
                             NULL,
                             &m->exec_context,
                             NULL, 0,
-                            UNIT(m)->manager->environment,
+                            m->meta.manager->environment,
                             true,
                             true,
                             true,
-                            UNIT(m)->manager->confirm_spawn,
-                            UNIT(m)->cgroup_bondings,
-                            UNIT(m)->cgroup_attributes,
+                            m->meta.manager->confirm_spawn,
+                            m->meta.cgroup_bondings,
+                            m->meta.cgroup_attributes,
                             &pid)) < 0)
                 goto fail;
 
@@ -821,33 +814,33 @@ fail:
         return r;
 }
 
-static void mount_enter_dead(Mount *m, MountResult f) {
+static void mount_enter_dead(Mount *m, bool success) {
         assert(m);
 
-        if (f != MOUNT_SUCCESS)
-                m->result = f;
+        if (!success)
+                m->failure = true;
 
-        mount_set_state(m, m->result != MOUNT_SUCCESS ? MOUNT_FAILED : MOUNT_DEAD);
+        mount_set_state(m, m->failure ? MOUNT_FAILED : MOUNT_DEAD);
 }
 
-static void mount_enter_mounted(Mount *m, MountResult f) {
+static void mount_enter_mounted(Mount *m, bool success) {
         assert(m);
 
-        if (f != MOUNT_SUCCESS)
-                m->result = f;
+        if (!success)
+                m->failure = true;
 
         mount_set_state(m, MOUNT_MOUNTED);
 }
 
-static void mount_enter_signal(Mount *m, MountState state, MountResult f) {
+static void mount_enter_signal(Mount *m, MountState state, bool success) {
         int r;
         Set *pid_set = NULL;
         bool wait_for_exit = false;
 
         assert(m);
 
-        if (f != MOUNT_SUCCESS)
-                m->result = f;
+        if (!success)
+                m->failure = true;
 
         if (m->exec_context.kill_mode != KILL_NONE) {
                 int sig = (state == MOUNT_MOUNTING_SIGTERM ||
@@ -874,7 +867,7 @@ static void mount_enter_signal(Mount *m, MountState state, MountResult f) {
                                 if ((r = set_put(pid_set, LONG_TO_PTR(m->control_pid))) < 0)
                                         goto fail;
 
-                        if ((r = cgroup_bonding_kill_list(UNIT(m)->cgroup_bondings, sig, true, pid_set)) < 0) {
+                        if ((r = cgroup_bonding_kill_list(m->meta.cgroup_bondings, sig, true, pid_set)) < 0) {
                                 if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
                                         log_warning("Failed to kill control group: %s", strerror(-r));
                         } else if (r > 0)
@@ -891,29 +884,32 @@ static void mount_enter_signal(Mount *m, MountState state, MountResult f) {
 
                 mount_set_state(m, state);
         } else if (state == MOUNT_REMOUNTING_SIGTERM || state == MOUNT_REMOUNTING_SIGKILL)
-                mount_enter_mounted(m, MOUNT_SUCCESS);
+                mount_enter_mounted(m, true);
         else
-                mount_enter_dead(m, MOUNT_SUCCESS);
+                mount_enter_dead(m, true);
 
         return;
 
 fail:
-        log_warning("%s failed to kill processes: %s", UNIT(m)->id, strerror(-r));
+        log_warning("%s failed to kill processes: %s", m->meta.id, strerror(-r));
 
         if (state == MOUNT_REMOUNTING_SIGTERM || state == MOUNT_REMOUNTING_SIGKILL)
-                mount_enter_mounted(m, MOUNT_FAILURE_RESOURCES);
+                mount_enter_mounted(m, false);
         else
-                mount_enter_dead(m, MOUNT_FAILURE_RESOURCES);
+                mount_enter_dead(m, false);
 
         if (pid_set)
                 set_free(pid_set);
 }
 
-static void mount_enter_unmounting(Mount *m) {
+static void mount_enter_unmounting(Mount *m, bool success) {
         int r;
 
         assert(m);
 
+        if (!success)
+                m->failure = true;
+
         m->control_command_id = MOUNT_EXEC_UNMOUNT;
         m->control_command = m->exec_command + MOUNT_EXEC_UNMOUNT;
 
@@ -934,8 +930,8 @@ static void mount_enter_unmounting(Mount *m) {
         return;
 
 fail:
-        log_warning("%s failed to run 'umount' task: %s", UNIT(m)->id, strerror(-r));
-        mount_enter_mounted(m, MOUNT_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'umount' task: %s", m->meta.id, strerror(-r));
+        mount_enter_mounted(m, false);
 }
 
 static void mount_enter_mounting(Mount *m) {
@@ -985,8 +981,8 @@ static void mount_enter_mounting(Mount *m) {
         return;
 
 fail:
-        log_warning("%s failed to run 'mount' task: %s", UNIT(m)->id, strerror(-r));
-        mount_enter_dead(m, MOUNT_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'mount' task: %s", m->meta.id, strerror(-r));
+        mount_enter_dead(m, false);
 }
 
 static void mount_enter_mounting_done(Mount *m) {
@@ -995,11 +991,14 @@ static void mount_enter_mounting_done(Mount *m) {
         mount_set_state(m, MOUNT_MOUNTING_DONE);
 }
 
-static void mount_enter_remounting(Mount *m) {
+static void mount_enter_remounting(Mount *m, bool success) {
         int r;
 
         assert(m);
 
+        if (!success)
+                m->failure = true;
+
         m->control_command_id = MOUNT_EXEC_REMOUNT;
         m->control_command = m->exec_command + MOUNT_EXEC_REMOUNT;
 
@@ -1050,9 +1049,9 @@ static void mount_enter_remounting(Mount *m) {
         return;
 
 fail:
-        log_warning("%s failed to run 'remount' task: %s", UNIT(m)->id, strerror(-r));
-        m->reload_result = MOUNT_FAILURE_RESOURCES;
-        mount_enter_mounted(m, MOUNT_SUCCESS);
+        log_warning("%s failed to run 'remount' task: %s", m->meta.id, strerror(-r));
+        m->reload_failure = true;
+        mount_enter_mounted(m, true);
 }
 
 static int mount_start(Unit *u) {
@@ -1075,9 +1074,7 @@ static int mount_start(Unit *u) {
 
         assert(m->state == MOUNT_DEAD || m->state == MOUNT_FAILED);
 
-        m->result = MOUNT_SUCCESS;
-        m->reload_result = MOUNT_SUCCESS;
-
+        m->failure = false;
         mount_enter_mounting(m);
         return 0;
 }
@@ -1102,7 +1099,7 @@ static int mount_stop(Unit *u) {
                m->state == MOUNT_REMOUNTING_SIGTERM ||
                m->state == MOUNT_REMOUNTING_SIGKILL);
 
-        mount_enter_unmounting(m);
+        mount_enter_unmounting(m, true);
         return 0;
 }
 
@@ -1116,7 +1113,7 @@ static int mount_reload(Unit *u) {
 
         assert(m->state == MOUNT_MOUNTED);
 
-        mount_enter_remounting(m);
+        mount_enter_remounting(m, true);
         return 0;
 }
 
@@ -1128,8 +1125,7 @@ static int mount_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", mount_state_to_string(m->state));
-        unit_serialize_item(u, f, "result", mount_result_to_string(m->result));
-        unit_serialize_item(u, f, "reload-result", mount_result_to_string(m->reload_result));
+        unit_serialize_item(u, f, "failure", yes_no(m->failure));
 
         if (m->control_pid > 0)
                 unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) m->control_pid);
@@ -1155,23 +1151,13 @@ static int mount_deserialize_item(Unit *u, const char *key, const char *value, F
                         log_debug("Failed to parse state value %s", value);
                 else
                         m->deserialized_state = state;
-        } else if (streq(key, "result")) {
-                MountResult f;
-
-                f = mount_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != MOUNT_SUCCESS)
-                        m->result = f;
-
-        } else if (streq(key, "reload-result")) {
-                MountResult f;
+        } else if (streq(key, "failure")) {
+                int b;
 
-                f = mount_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse reload result value %s", value);
-                else if (f != MOUNT_SUCCESS)
-                        m->reload_result = f;
+                if ((b = parse_boolean(value)) < 0)
+                        log_debug("Failed to parse failure value %s", value);
+                else
+                        m->failure = b || m->failure;
 
         } else if (streq(key, "control-pid")) {
                 pid_t pid;
@@ -1218,7 +1204,7 @@ static bool mount_check_gc(Unit *u) {
 
 static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         Mount *m = MOUNT(u);
-        MountResult f;
+        bool success;
 
         assert(m);
         assert(pid >= 0);
@@ -1228,29 +1214,17 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
         m->control_pid = 0;
 
-        if (is_clean_exit(code, status))
-                f = MOUNT_SUCCESS;
-        else if (code == CLD_EXITED)
-                f = MOUNT_FAILURE_EXIT_CODE;
-        else if (code == CLD_KILLED)
-                f = MOUNT_FAILURE_SIGNAL;
-        else if (code == CLD_DUMPED)
-                f = MOUNT_FAILURE_CORE_DUMP;
-        else
-                assert_not_reached("Unknown code");
-
-        if (f != MOUNT_SUCCESS)
-                m->result = f;
+        success = is_clean_exit(code, status);
+        m->failure = m->failure || !success;
 
         if (m->control_command) {
                 exec_status_exit(&m->control_command->exec_status, &m->exec_context, pid, code, status);
-
                 m->control_command = NULL;
                 m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
         }
 
-        log_full(f == MOUNT_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
-                 "%s mount process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status);
+        log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                 "%s mount process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
 
         /* Note that mount(8) returning and the kernel sending us a
          * mount table change event might happen out-of-order. If an
@@ -1266,23 +1240,23 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         case MOUNT_MOUNTING_SIGKILL:
         case MOUNT_MOUNTING_SIGTERM:
 
-                if (f == MOUNT_SUCCESS)
-                        mount_enter_mounted(m, f);
+                if (success)
+                        mount_enter_mounted(m, true);
                 else if (m->from_proc_self_mountinfo)
-                        mount_enter_mounted(m, f);
+                        mount_enter_mounted(m, false);
                 else
-                        mount_enter_dead(m, f);
+                        mount_enter_dead(m, false);
                 break;
 
         case MOUNT_REMOUNTING:
         case MOUNT_REMOUNTING_SIGKILL:
         case MOUNT_REMOUNTING_SIGTERM:
 
-                m->reload_result = f;
+                m->reload_failure = !success;
                 if (m->from_proc_self_mountinfo)
-                        mount_enter_mounted(m, MOUNT_SUCCESS);
+                        mount_enter_mounted(m, true);
                 else
-                        mount_enter_dead(m, MOUNT_SUCCESS);
+                        mount_enter_dead(m, true);
 
                 break;
 
@@ -1290,12 +1264,12 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         case MOUNT_UNMOUNTING_SIGKILL:
         case MOUNT_UNMOUNTING_SIGTERM:
 
-                if (f == MOUNT_SUCCESS)
-                        mount_enter_dead(m, f);
+                if (success)
+                        mount_enter_dead(m, true);
                 else if (m->from_proc_self_mountinfo)
-                        mount_enter_mounted(m, f);
+                        mount_enter_mounted(m, false);
                 else
-                        mount_enter_dead(m, f);
+                        mount_enter_dead(m, false);
                 break;
 
         default:
@@ -1317,72 +1291,72 @@ static void mount_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
 
         case MOUNT_MOUNTING:
         case MOUNT_MOUNTING_DONE:
-                log_warning("%s mounting timed out. Stopping.", u->id);
-                mount_enter_signal(m, MOUNT_MOUNTING_SIGTERM, MOUNT_FAILURE_TIMEOUT);
+                log_warning("%s mounting timed out. Stopping.", u->meta.id);
+                mount_enter_signal(m, MOUNT_MOUNTING_SIGTERM, false);
                 break;
 
         case MOUNT_REMOUNTING:
-                log_warning("%s remounting timed out. Stopping.", u->id);
-                m->reload_result = MOUNT_FAILURE_TIMEOUT;
-                mount_enter_mounted(m, MOUNT_SUCCESS);
+                log_warning("%s remounting timed out. Stopping.", u->meta.id);
+                m->reload_failure = true;
+                mount_enter_mounted(m, true);
                 break;
 
         case MOUNT_UNMOUNTING:
-                log_warning("%s unmounting timed out. Stopping.", u->id);
-                mount_enter_signal(m, MOUNT_UNMOUNTING_SIGTERM, MOUNT_FAILURE_TIMEOUT);
+                log_warning("%s unmounting timed out. Stopping.", u->meta.id);
+                mount_enter_signal(m, MOUNT_UNMOUNTING_SIGTERM, false);
                 break;
 
         case MOUNT_MOUNTING_SIGTERM:
                 if (m->exec_context.send_sigkill) {
-                        log_warning("%s mounting timed out. Killing.", u->id);
-                        mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, MOUNT_FAILURE_TIMEOUT);
+                        log_warning("%s mounting timed out. Killing.", u->meta.id);
+                        mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, false);
                 } else {
-                        log_warning("%s mounting timed out. Skipping SIGKILL. Ignoring.", u->id);
+                        log_warning("%s mounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id);
 
                         if (m->from_proc_self_mountinfo)
-                                mount_enter_mounted(m, MOUNT_FAILURE_TIMEOUT);
+                                mount_enter_mounted(m, false);
                         else
-                                mount_enter_dead(m, MOUNT_FAILURE_TIMEOUT);
+                                mount_enter_dead(m, false);
                 }
                 break;
 
         case MOUNT_REMOUNTING_SIGTERM:
                 if (m->exec_context.send_sigkill) {
-                        log_warning("%s remounting timed out. Killing.", u->id);
-                        mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, MOUNT_FAILURE_TIMEOUT);
+                        log_warning("%s remounting timed out. Killing.", u->meta.id);
+                        mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, false);
                 } else {
-                        log_warning("%s remounting timed out. Skipping SIGKILL. Ignoring.", u->id);
+                        log_warning("%s remounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id);
 
                         if (m->from_proc_self_mountinfo)
-                                mount_enter_mounted(m, MOUNT_FAILURE_TIMEOUT);
+                                mount_enter_mounted(m, false);
                         else
-                                mount_enter_dead(m, MOUNT_FAILURE_TIMEOUT);
+                                mount_enter_dead(m, false);
                 }
                 break;
 
         case MOUNT_UNMOUNTING_SIGTERM:
                 if (m->exec_context.send_sigkill) {
-                        log_warning("%s unmounting timed out. Killing.", u->id);
-                        mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, MOUNT_FAILURE_TIMEOUT);
+                        log_warning("%s unmounting timed out. Killing.", u->meta.id);
+                        mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, false);
                 } else {
-                        log_warning("%s unmounting timed out. Skipping SIGKILL. Ignoring.", u->id);
+                        log_warning("%s unmounting timed out. Skipping SIGKILL. Ignoring.", u->meta.id);
 
                         if (m->from_proc_self_mountinfo)
-                                mount_enter_mounted(m, MOUNT_FAILURE_TIMEOUT);
+                                mount_enter_mounted(m, false);
                         else
-                                mount_enter_dead(m, MOUNT_FAILURE_TIMEOUT);
+                                mount_enter_dead(m, false);
                 }
                 break;
 
         case MOUNT_MOUNTING_SIGKILL:
         case MOUNT_REMOUNTING_SIGKILL:
         case MOUNT_UNMOUNTING_SIGKILL:
-                log_warning("%s mount process still around after SIGKILL. Ignoring.", u->id);
+                log_warning("%s mount process still around after SIGKILL. Ignoring.", u->meta.id);
 
                 if (m->from_proc_self_mountinfo)
-                        mount_enter_mounted(m, MOUNT_FAILURE_TIMEOUT);
+                        mount_enter_mounted(m, false);
                 else
-                        mount_enter_dead(m, MOUNT_FAILURE_TIMEOUT);
+                        mount_enter_dead(m, false);
                 break;
 
         default:
@@ -1425,16 +1399,13 @@ static int mount_add_one(
         if (!is_path(where))
                 return 0;
 
-        e = unit_name_from_path(where, ".mount");
-        if (!e)
+        if (!(e = unit_name_from_path(where, ".mount")))
                 return -ENOMEM;
 
-        u = manager_get_unit(m, e);
-        if (!u) {
+        if (!(u = manager_get_unit(m, e))) {
                 delete = true;
 
-                u = unit_new(m, sizeof(Mount));
-                if (!u) {
+                if (!(u = unit_new(m))) {
                         free(e);
                         return -ENOMEM;
                 }
@@ -1445,8 +1416,7 @@ static int mount_add_one(
                 if (r < 0)
                         goto fail;
 
-                MOUNT(u)->where = strdup(where);
-                if (!MOUNT(u)->where) {
+                if (!(MOUNT(u)->where = strdup(where))) {
                         r = -ENOMEM;
                         goto fail;
                 }
@@ -1709,7 +1679,7 @@ fail:
 }
 
 void mount_fd_event(Manager *m, int events) {
-        Unit *u;
+        Meta *meta;
         int r;
 
         assert(m);
@@ -1723,8 +1693,8 @@ void mount_fd_event(Manager *m, int events) {
                 log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r));
 
                 /* Reset flags, just in case, for later calls */
-                LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {
-                        Mount *mount = MOUNT(u);
+                LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_MOUNT]) {
+                        Mount *mount = (Mount*) meta;
 
                         mount->is_mounted = mount->just_mounted = mount->just_changed = false;
                 }
@@ -1734,8 +1704,8 @@ void mount_fd_event(Manager *m, int events) {
 
         manager_dispatch_load_queue(m);
 
-        LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {
-                Mount *mount = MOUNT(u);
+        LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_MOUNT]) {
+                Mount *mount = (Mount*) meta;
 
                 if (!mount->is_mounted) {
                         /* This has just been unmounted. */
@@ -1745,7 +1715,7 @@ void mount_fd_event(Manager *m, int events) {
                         switch (mount->state) {
 
                         case MOUNT_MOUNTED:
-                                mount_enter_dead(mount, MOUNT_SUCCESS);
+                                mount_enter_dead(mount, true);
                                 break;
 
                         default:
@@ -1762,7 +1732,7 @@ void mount_fd_event(Manager *m, int events) {
 
                         case MOUNT_DEAD:
                         case MOUNT_FAILED:
-                                mount_enter_mounted(mount, MOUNT_SUCCESS);
+                                mount_enter_mounted(mount, true);
                                 break;
 
                         case MOUNT_MOUNTING:
@@ -1793,8 +1763,7 @@ static void mount_reset_failed(Unit *u) {
         if (m->state == MOUNT_FAILED)
                 mount_set_state(m, MOUNT_DEAD);
 
-        m->result = MOUNT_SUCCESS;
-        m->reload_result = MOUNT_SUCCESS;
+        m->failure = false;
 }
 
 static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
@@ -1832,7 +1801,7 @@ static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
                                 goto finish;
                         }
 
-                if ((q = cgroup_bonding_kill_list(UNIT(m)->cgroup_bondings, signo, false, pid_set)) < 0)
+                if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
                                 r = q;
         }
@@ -1870,20 +1839,8 @@ static const char* const mount_exec_command_table[_MOUNT_EXEC_COMMAND_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(mount_exec_command, MountExecCommand);
 
-static const char* const mount_result_table[_MOUNT_RESULT_MAX] = {
-        [MOUNT_SUCCESS] = "success",
-        [MOUNT_FAILURE_RESOURCES] = "resources",
-        [MOUNT_FAILURE_TIMEOUT] = "timeout",
-        [MOUNT_FAILURE_EXIT_CODE] = "exit-code",
-        [MOUNT_FAILURE_SIGNAL] = "signal",
-        [MOUNT_FAILURE_CORE_DUMP] = "core-dump"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(mount_result, MountResult);
-
 const UnitVTable mount_vtable = {
         .suffix = ".mount",
-        .object_size = sizeof(Mount),
         .sections =
                 "Unit\0"
                 "Mount\0"
index 9318444..7c5d9d1 100644 (file)
@@ -59,19 +59,8 @@ typedef struct MountParameters {
         int passno;
 } MountParameters;
 
-typedef enum MountResult {
-        MOUNT_SUCCESS,
-        MOUNT_FAILURE_RESOURCES,
-        MOUNT_FAILURE_TIMEOUT,
-        MOUNT_FAILURE_EXIT_CODE,
-        MOUNT_FAILURE_SIGNAL,
-        MOUNT_FAILURE_CORE_DUMP,
-        _MOUNT_RESULT_MAX,
-        _MOUNT_RESULT_INVALID = -1
-} MountResult;
-
 struct Mount {
-        Unit meta;
+        Meta meta;
 
         char *where;
 
@@ -89,8 +78,8 @@ struct Mount {
         bool just_mounted:1;
         bool just_changed:1;
 
-        MountResult result;
-        MountResult reload_result;
+        bool failure:1;
+        bool reload_failure:1;
 
         mode_t directory_mode;
 
@@ -118,7 +107,4 @@ MountState mount_state_from_string(const char *s);
 const char* mount_exec_command_to_string(MountExecCommand i);
 MountExecCommand mount_exec_command_from_string(const char *s);
 
-const char* mount_result_to_string(MountResult i);
-MountResult mount_result_from_string(const char *s);
-
 #endif
index 09bc829..54b22f4 100644 (file)
@@ -253,19 +253,11 @@ int setup_namespace(
         }
 
         if (need_private) {
-                mode_t u;
-
                 memcpy(private_dir, tmp_dir, sizeof(tmp_dir)-1);
-
-                u = umask(0000);
                 if (mkdir(private_dir, 0777 + S_ISVTX) < 0) {
-                        umask(u);
-
                         r = -errno;
                         goto fail;
                 }
-
-                umask(u);
                 remove_private = true;
         }
 
@@ -274,12 +266,8 @@ int setup_namespace(
                 goto fail;
         }
 
-        /* Remount / as SLAVE so that nothing mounted in the namespace
-           shows up in the parent */
-        if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) < 0) {
-                r = -errno;
-                goto fail;
-        }
+        /* We assume that by default mount events from us won't be
+         * propagated to the root namespace. */
 
         for (p = paths; p < paths + n; p++)
                 if ((r = apply_mount(p, root_dir, inaccessible_dir, private_dir, flags)) < 0)
index 9d52bdf..a9bc51e 100644 (file)
 #include <stdlib.h>
 #include <string.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "strv.h"
 #include "util.h"
 #include "log.h"
+#include "sd-daemon.h"
 #include "sd-readahead.h"
 
 static bool arg_ready = false;
index b8b379d..8441c05 100644 (file)
 #include <grp.h>
 #include <linux/fs.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "log.h"
 #include "util.h"
 #include "missing.h"
 #include "cgroup-util.h"
+#include "sd-daemon.h"
 #include "strv.h"
 #include "loopback-setup.h"
 
@@ -362,7 +361,7 @@ static int drop_capabilities(void) {
 
         unsigned long l;
 
-        for (l = 0; l <= cap_last_cap(); l++) {
+        for (l = 0; l <= MAX(63LU, (unsigned long) CAP_LAST_CAP); l++) {
                 unsigned i;
 
                 for (i = 0; i < ELEMENTSOF(retain); i++)
@@ -373,6 +372,12 @@ static int drop_capabilities(void) {
                         continue;
 
                 if (prctl(PR_CAPBSET_DROP, l) < 0) {
+
+                        /* If this capability is not known, EINVAL
+                         * will be returned, let's ignore this. */
+                        if (errno == EINVAL)
+                                break;
+
                         log_error("PR_CAPBSET_DROP failed: %m");
                         return -errno;
                 }
@@ -395,9 +400,11 @@ static int is_os_tree(const char *path) {
         return r < 0 ? 0 : 1;
 }
 
+#define BUFFER_SIZE 1024
+
 static int process_pty(int master, sigset_t *mask) {
 
-        char in_buffer[LINE_MAX], out_buffer[LINE_MAX];
+        char in_buffer[BUFFER_SIZE], out_buffer[BUFFER_SIZE];
         size_t in_buffer_full = 0, out_buffer_full = 0;
         struct epoll_event stdin_ev, stdout_ev, master_ev, signal_ev;
         bool stdin_readable = false, stdout_writable = false, master_readable = false, master_writable = false;
@@ -518,9 +525,9 @@ static int process_pty(int master, sigset_t *mask) {
                        (master_readable && out_buffer_full <= 0) ||
                        (stdout_writable && out_buffer_full > 0)) {
 
-                        if (stdin_readable && in_buffer_full < LINE_MAX) {
+                        if (stdin_readable && in_buffer_full < BUFFER_SIZE) {
 
-                                if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full, LINE_MAX - in_buffer_full)) < 0) {
+                                if ((k = read(STDIN_FILENO, in_buffer + in_buffer_full, BUFFER_SIZE - in_buffer_full)) < 0) {
 
                                         if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
                                                 stdin_readable = false;
@@ -552,9 +559,9 @@ static int process_pty(int master, sigset_t *mask) {
                                 }
                         }
 
-                        if (master_readable && out_buffer_full < LINE_MAX) {
+                        if (master_readable && out_buffer_full < BUFFER_SIZE) {
 
-                                if ((k = read(master, out_buffer + out_buffer_full, LINE_MAX - out_buffer_full)) < 0) {
+                                if ((k = read(master, out_buffer + out_buffer_full, BUFFER_SIZE - out_buffer_full)) < 0) {
 
                                         if (errno == EAGAIN || errno == EPIPE || errno == ECONNRESET || errno == EIO)
                                                 master_readable = false;
similarity index 70%
rename from src/login/org.freedesktop.login1.conf
rename to src/org.freedesktop.login1.conf
index 9ef852b..c423ef5 100644 (file)
 
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
-                       send_member="GetSessionByPID"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
                        send_member="GetUser"/>
 
                 <allow send_destination="org.freedesktop.login1"
                        send_member="ActivateSession"/>
 
                 <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="ActivateSessionOnSeat"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="PowerOff"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="Reboot"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanPowerOff"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="CanReboot"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="AttachDevice"/>
-
-                <allow send_destination="org.freedesktop.login1"
-                       send_interface="org.freedesktop.login1.Manager"
-                       send_member="FlushDevices"/>
-
-                <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="ActivateSession"/>
 
similarity index 90%
rename from src/login/pam-module.c
rename to src/pam-module.c
index 8544413..dd05f93 100644 (file)
 #include <security/pam_ext.h>
 #include <security/pam_misc.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "util.h"
 #include "macro.h"
+#include "sd-daemon.h"
 #include "strv.h"
 #include "dbus-common.h"
 #include "def.h"
@@ -164,24 +163,42 @@ static int get_user_data(
 
         const char *username = NULL;
         struct passwd *pw = NULL;
-        uid_t uid;
         int r;
+        bool have_loginuid = false;
+        char *s;
 
         assert(handle);
         assert(ret_username);
         assert(ret_pw);
 
-        r = audit_loginuid_from_pid(0, &uid);
-        if (r >= 0)
-                pw = pam_modutil_getpwuid(handle, uid);
-        else {
-                r = pam_get_user(handle, &username, NULL);
-                if (r != PAM_SUCCESS) {
+        if (have_effective_cap(CAP_AUDIT_CONTROL) > 0) {
+                /* Only use audit login uid if we are executed with
+                 * sufficient capabilities so that pam_loginuid could
+                 * do its job. If we are lacking the CAP_AUDIT_CONTROL
+                 * capabality we most likely are being run in a
+                 * container and /proc/self/loginuid is useless since
+                 * it probably contains a uid of the host system. */
+
+                if (read_one_line_file("/proc/self/loginuid", &s) >= 0) {
+                        uid_t uid;
+
+                        r = parse_uid(s, &uid);
+                        free(s);
+
+                        if (r >= 0 && uid != (uint32_t) -1) {
+                                have_loginuid = true;
+                                pw = pam_modutil_getpwuid(handle, uid);
+                        }
+                }
+        }
+
+        if (!have_loginuid) {
+                if ((r = pam_get_user(handle, &username, NULL)) != PAM_SUCCESS) {
                         pam_syslog(handle, LOG_ERR, "Failed to get user name.");
                         return r;
                 }
 
-                if (isempty(username)) {
+                if (!username || !*username) {
                         pam_syslog(handle, LOG_ERR, "User name not valid.");
                         return PAM_AUTH_ERR;
                 }
@@ -260,6 +277,7 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_
         int v;
 
         assert(display);
+        assert(seat);
         assert(vtnr);
 
         /* We deduce the X11 socket from the display name, then use
@@ -307,8 +325,7 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_
         else if (v == 0)
                 return -ENOENT;
 
-        if (seat)
-                *seat = "seat0";
+        *seat = "seat0";
         *vtnr = (uint32_t) v;
 
         return 0;
@@ -321,7 +338,7 @@ _public_ PAM_EXTERN int pam_sm_open_session(
 
         struct passwd *pw;
         bool kill_processes = false, debug = false;
-        const char *username, *id, *object_path, *runtime_path, *service = NULL, *tty = NULL, *display = NULL, *remote_user = NULL, *remote_host = NULL, *seat = NULL, *type, *class, *cvtnr = NULL;
+        const char *username, *id, *object_path, *runtime_path, *service = NULL, *tty = NULL, *display = NULL, *remote_user = NULL, *remote_host = NULL, *seat = NULL, *type, *cvtnr = NULL;
         char **controllers = NULL, **reset_controllers = NULL, **kill_only_users = NULL, **kill_exclude_users = NULL;
         DBusError error;
         uint32_t uid, pid;
@@ -446,39 +463,24 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                 if (isempty(display))
                         display = tty;
                 tty = "";
-        } else if (streq(tty, "cron")) {
-                /* cron has been setting PAM_TTY to "cron" for a very long time
-                 * and it cannot stop doing that for compatibility reasons. */
-                tty = "";
         }
 
         if (!isempty(cvtnr))
                 safe_atou32(cvtnr, &vtnr);
 
-        if (!isempty(display) && vtnr <= 0) {
-                if (isempty(seat))
-                        get_seat_from_display(display, &seat, &vtnr);
-                else if (streq(seat, "seat0"))
-                        get_seat_from_display(display, NULL, &vtnr);
-        }
+        if (!isempty(display) && isempty(seat) && vtnr <= 0)
+                get_seat_from_display(display, &seat, &vtnr);
 
         type = !isempty(display) ? "x11" :
-                   !isempty(tty) ? "tty" : "unspecified";
-
-        class = pam_getenv(handle, "XDG_SESSION_CLASS");
-        if (isempty(class))
-                class = "user";
+                   !isempty(tty) ? "tty" : "other";
 
-        remote = !isempty(remote_host) &&
-                !streq(remote_host, "localhost") &&
-                !streq(remote_host, "localhost.localdomain");
+        remote = !isempty(remote_host) && !streq(remote_host, "localhost") && !streq(remote_host, "localhost.localdomain");
 
         if (!dbus_message_append_args(m,
                                       DBUS_TYPE_UINT32, &uid,
                                       DBUS_TYPE_UINT32, &pid,
                                       DBUS_TYPE_STRING, &service,
                                       DBUS_TYPE_STRING, &type,
-                                      DBUS_TYPE_STRING, &class,
                                       DBUS_TYPE_STRING, &seat,
                                       DBUS_TYPE_UINT32, &vtnr,
                                       DBUS_TYPE_STRING, &tty,
@@ -515,11 +517,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                 goto finish;
         }
 
-        if (debug)
-                pam_syslog(handle, LOG_DEBUG, "Asking logind to create session: "
-                           "uid=%u pid=%u service=%s type=%s seat=%s vtnr=%u tty=%s display=%s remote=%s remote_user=%s remote_host=%s",
-                           uid, pid, service, type, seat, vtnr, tty, display, yes_no(remote), remote_user, remote_host);
-
         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
         if (!reply) {
                 pam_syslog(handle, LOG_ERR, "Failed to create session: %s", bus_error_message(&error));
@@ -540,11 +537,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
                 goto finish;
         }
 
-        if (debug)
-                pam_syslog(handle, LOG_DEBUG, "Reply from logind: "
-                           "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u",
-                           id, object_path, runtime_path, session_fd, seat, vtnr);
-
         r = pam_misc_setenv(handle, "XDG_SESSION_ID", id, 0);
         if (r != PAM_SUCCESS) {
                 pam_syslog(handle, LOG_ERR, "Failed to set session id.");
index 93fdf63..5f5ad8c 100644 (file)
@@ -230,9 +230,7 @@ int lookup_paths_init(LookupPaths *p, ManagerRunningAs running_as, bool personal
                                               "/usr/local/lib/systemd/system",
                                               "/usr/lib/systemd/system",
                                               SYSTEM_DATA_UNIT_PATH,
-#ifdef HAVE_SPLIT_USR
                                               "/lib/systemd/system",
-#endif
                                               NULL)))
                                 return -ENOMEM;
         }
index e97cd09..f15c921 100644 (file)
@@ -39,220 +39,36 @@ static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_FAILED] = UNIT_FAILED
 };
 
-int path_spec_watch(PathSpec *s, Unit *u) {
-
-        static const int flags_table[_PATH_TYPE_MAX] = {
-                [PATH_EXISTS] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB,
-                [PATH_EXISTS_GLOB] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB,
-                [PATH_CHANGED] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_MOVED_FROM|IN_MOVED_TO,
-                [PATH_MODIFIED] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_MOVED_FROM|IN_MOVED_TO|IN_MODIFY,
-                [PATH_DIRECTORY_NOT_EMPTY] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CREATE|IN_MOVED_TO
-        };
-
-        bool exists = false;
-        char *k, *slash;
-        int r;
+static void path_init(Unit *u) {
+        Path *p = PATH(u);
 
         assert(u);
-        assert(s);
-
-        path_spec_unwatch(s, u);
-
-        if (!(k = strdup(s->path)))
-                return -ENOMEM;
-
-        if ((s->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC)) < 0) {
-                r = -errno;
-                goto fail;
-        }
-
-        if (unit_watch_fd(u, s->inotify_fd, EPOLLIN, &s->watch) < 0) {
-                r = -errno;
-                goto fail;
-        }
-
-        if ((s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type])) >= 0)
-                exists = true;
-
-        do {
-                int flags;
+        assert(u->meta.load_state == UNIT_STUB);
 
-                /* This assumes the path was passed through path_kill_slashes()! */
-                if (!(slash = strrchr(k, '/')))
-                        break;
-
-                /* Trim the path at the last slash. Keep the slash if it's the root dir. */
-                slash[slash == k] = 0;
-
-                flags = IN_MOVE_SELF;
-                if (!exists)
-                        flags |= IN_DELETE_SELF | IN_ATTRIB | IN_CREATE | IN_MOVED_TO;
-
-                if (inotify_add_watch(s->inotify_fd, k, flags) >= 0)
-                        exists = true;
-        } while (slash != k);
-
-        return 0;
-
-fail:
-        free(k);
-
-        path_spec_unwatch(s, u);
-        return r;
+        p->directory_mode = 0755;
 }
 
-void path_spec_unwatch(PathSpec *s, Unit *u) {
+static void path_unwatch_one(Path *p, PathSpec *s) {
 
         if (s->inotify_fd < 0)
                 return;
 
-        unit_unwatch_fd(u, &s->watch);
+        unit_unwatch_fd(UNIT(p), &s->watch);
 
         close_nointr_nofail(s->inotify_fd);
         s->inotify_fd = -1;
 }
 
-int path_spec_fd_event(PathSpec *s, uint32_t events) {
-        uint8_t *buf = NULL;
-        struct inotify_event *e;
-        ssize_t k;
-        int l;
-        int r = 0;
-
-        if (events != EPOLLIN) {
-                log_error("Got Invalid poll event on inotify.");
-                r = -EINVAL;
-                goto out;
-        }
-
-        if (ioctl(s->inotify_fd, FIONREAD, &l) < 0) {
-                log_error("FIONREAD failed: %m");
-                r = -errno;
-                goto out;
-        }
-
-        assert(l > 0);
-
-        if (!(buf = malloc(l))) {
-                log_error("Failed to allocate buffer: %m");
-                r = -errno;
-                goto out;
-        }
-
-        if ((k = read(s->inotify_fd, buf, l)) < 0) {
-                log_error("Failed to read inotify event: %m");
-                r = -errno;
-                goto out;
-        }
-
-        e = (struct inotify_event*) buf;
-
-        while (k > 0) {
-                size_t step;
-
-                if ((s->type == PATH_CHANGED || s->type == PATH_MODIFIED) &&
-                    s->primary_wd == e->wd)
-                        r = 1;
-
-                step = sizeof(struct inotify_event) + e->len;
-                assert(step <= (size_t) k);
-
-                e = (struct inotify_event*) ((uint8_t*) e + step);
-                k -= step;
-        }
-out:
-        free(buf);
-        return r;
-}
-
-static bool path_spec_check_good(PathSpec *s, bool initial) {
-        bool good = false;
-
-        switch (s->type) {
-
-        case PATH_EXISTS:
-                good = access(s->path, F_OK) >= 0;
-                break;
-
-        case PATH_EXISTS_GLOB:
-                good = glob_exists(s->path) > 0;
-                break;
-
-        case PATH_DIRECTORY_NOT_EMPTY: {
-                int k;
-
-                k = dir_is_empty(s->path);
-                good = !(k == -ENOENT || k > 0);
-                break;
-        }
-
-        case PATH_CHANGED:
-        case PATH_MODIFIED: {
-                bool b;
-
-                b = access(s->path, F_OK) >= 0;
-                good = !initial && b != s->previous_exists;
-                s->previous_exists = b;
-                break;
-        }
-
-        default:
-                ;
-        }
-
-        return good;
-}
-
-static bool path_spec_startswith(PathSpec *s, const char *what) {
-        return path_startswith(s->path, what);
-}
-
-static void path_spec_mkdir(PathSpec *s, mode_t mode) {
-        int r;
-
-        if (s->type == PATH_EXISTS || s->type == PATH_EXISTS_GLOB)
-                return;
-
-        if ((r = mkdir_p(s->path, mode)) < 0)
-                log_warning("mkdir(%s) failed: %s", s->path, strerror(-r));
-}
-
-static void path_spec_dump(PathSpec *s, FILE *f, const char *prefix) {
-        fprintf(f,
-                "%s%s: %s\n",
-                prefix,
-                path_type_to_string(s->type),
-                s->path);
-}
-
-void path_spec_done(PathSpec *s) {
-        assert(s);
-        assert(s->inotify_fd == -1);
-
-        free(s->path);
-}
-
-static void path_init(Unit *u) {
-        Path *p = PATH(u);
-
-        assert(u);
-        assert(u->load_state == UNIT_STUB);
-
-        p->directory_mode = 0755;
-}
-
 static void path_done(Unit *u) {
         Path *p = PATH(u);
         PathSpec *s;
 
         assert(p);
 
-        unit_ref_unset(&p->unit);
-
         while ((s = p->specs)) {
-                path_spec_unwatch(s, u);
+                path_unwatch_one(p, s);
                 LIST_REMOVE(PathSpec, spec, p->specs, s);
-                path_spec_done(s);
+                free(s->path);
                 free(s);
         }
 }
@@ -264,13 +80,13 @@ int path_add_one_mount_link(Path *p, Mount *m) {
         assert(p);
         assert(m);
 
-        if (UNIT(p)->load_state != UNIT_LOADED ||
-            UNIT(m)->load_state != UNIT_LOADED)
+        if (p->meta.load_state != UNIT_LOADED ||
+            m->meta.load_state != UNIT_LOADED)
                 return 0;
 
         LIST_FOREACH(spec, s, p->specs) {
 
-                if (!path_spec_startswith(s, m->where))
+                if (!path_startswith(s->path, m->where))
                         continue;
 
                 if ((r = unit_add_two_dependencies(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0)
@@ -281,13 +97,13 @@ int path_add_one_mount_link(Path *p, Mount *m) {
 }
 
 static int path_add_mount_links(Path *p) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(p);
 
-        LIST_FOREACH(units_by_type, other, UNIT(p)->manager->units_by_type[UNIT_MOUNT])
-                if ((r = path_add_one_mount_link(p, MOUNT(other))) < 0)
+        LIST_FOREACH(units_by_type, other, p->meta.manager->units_by_type[UNIT_MOUNT])
+                if ((r = path_add_one_mount_link(p, (Mount*) other)) < 0)
                         return r;
 
         return 0;
@@ -296,11 +112,11 @@ static int path_add_mount_links(Path *p) {
 static int path_verify(Path *p) {
         assert(p);
 
-        if (UNIT(p)->load_state != UNIT_LOADED)
+        if (p->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!p->specs) {
-                log_error("%s lacks path setting. Refusing.", UNIT(p)->id);
+                log_error("%s lacks path setting. Refusing.", p->meta.id);
                 return -EINVAL;
         }
 
@@ -312,7 +128,7 @@ static int path_add_default_dependencies(Path *p) {
 
         assert(p);
 
-        if (UNIT(p)->manager->running_as == MANAGER_SYSTEM) {
+        if (p->meta.manager->running_as == MANAGER_SYSTEM) {
                 if ((r = unit_add_dependency_by_name(UNIT(p), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
                         return r;
 
@@ -328,31 +144,24 @@ static int path_load(Unit *u) {
         int r;
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         if ((r = unit_load_fragment_and_dropin(u)) < 0)
                 return r;
 
-        if (u->load_state == UNIT_LOADED) {
+        if (u->meta.load_state == UNIT_LOADED) {
 
-                if (!UNIT_DEREF(p->unit)) {
-                        Unit *x;
-
-                        r = unit_load_related_unit(u, ".service", &x);
-                        if (r < 0)
+                if (!p->unit)
+                        if ((r = unit_load_related_unit(u, ".service", &p->unit)))
                                 return r;
 
-                        unit_ref_set(&p->unit, x);
-                }
-
-                r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(p->unit), true);
-                if (r < 0)
+                if ((r = unit_add_dependency(u, UNIT_BEFORE, p->unit, true)) < 0)
                         return r;
 
                 if ((r = path_add_mount_links(p)) < 0)
                         return r;
 
-                if (UNIT(p)->default_dependencies)
+                if (p->meta.default_dependencies)
                         if ((r = path_add_default_dependencies(p)) < 0)
                                 return r;
         }
@@ -369,18 +178,80 @@ static void path_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sPath State: %s\n"
-                "%sResult: %s\n"
                 "%sUnit: %s\n"
                 "%sMakeDirectory: %s\n"
                 "%sDirectoryMode: %04o\n",
                 prefix, path_state_to_string(p->state),
-                prefix, path_result_to_string(p->result),
-                prefix, UNIT_DEREF(p->unit)->id,
+                prefix, p->unit->meta.id,
                 prefix, yes_no(p->make_directory),
                 prefix, p->directory_mode);
 
         LIST_FOREACH(spec, s, p->specs)
-                path_spec_dump(s, f, prefix);
+                fprintf(f,
+                        "%s%s: %s\n",
+                        prefix,
+                        path_type_to_string(s->type),
+                        s->path);
+}
+
+static int path_watch_one(Path *p, PathSpec *s) {
+        static const int flags_table[_PATH_TYPE_MAX] = {
+                [PATH_EXISTS] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB,
+                [PATH_EXISTS_GLOB] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB,
+                [PATH_CHANGED] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CLOSE_WRITE|IN_CREATE|IN_DELETE|IN_MOVED_FROM|IN_MOVED_TO,
+                [PATH_DIRECTORY_NOT_EMPTY] = IN_DELETE_SELF|IN_MOVE_SELF|IN_ATTRIB|IN_CREATE|IN_MOVED_TO
+        };
+
+        bool exists = false;
+        char *k, *slash;
+        int r;
+
+        assert(p);
+        assert(s);
+
+        path_unwatch_one(p, s);
+
+        if (!(k = strdup(s->path)))
+                return -ENOMEM;
+
+        if ((s->inotify_fd = inotify_init1(IN_NONBLOCK|IN_CLOEXEC)) < 0) {
+                r = -errno;
+                goto fail;
+        }
+
+        if (unit_watch_fd(UNIT(p), s->inotify_fd, EPOLLIN, &s->watch) < 0) {
+                r = -errno;
+                goto fail;
+        }
+
+        if ((s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type])) >= 0)
+                exists = true;
+
+        do {
+                int flags;
+
+                /* This assumes the path was passed through path_kill_slashes()! */
+                if (!(slash = strrchr(k, '/')))
+                        break;
+
+                /* Trim the path at the last slash. Keep the slash if it's the root dir. */
+                slash[slash == k] = 0;
+
+                flags = IN_MOVE_SELF;
+                if (!exists)
+                        flags |= IN_DELETE_SELF | IN_ATTRIB | IN_CREATE | IN_MOVED_TO;
+
+                if (inotify_add_watch(s->inotify_fd, k, flags) >= 0)
+                        exists = true;
+        } while (slash != k);
+
+        return 0;
+
+fail:
+        free(k);
+
+        path_unwatch_one(p, s);
+        return r;
 }
 
 static void path_unwatch(Path *p) {
@@ -389,7 +260,7 @@ static void path_unwatch(Path *p) {
         assert(p);
 
         LIST_FOREACH(spec, s, p->specs)
-                path_spec_unwatch(s, UNIT(p));
+                path_unwatch_one(p, s);
 }
 
 static int path_watch(Path *p) {
@@ -399,7 +270,7 @@ static int path_watch(Path *p) {
         assert(p);
 
         LIST_FOREACH(spec, s, p->specs)
-                if ((r = path_spec_watch(s, UNIT(p))) < 0)
+                if ((r = path_watch_one(p, s)) < 0)
                         return r;
 
         return 0;
@@ -418,7 +289,7 @@ static void path_set_state(Path *p, PathState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(p)->id,
+                          p->meta.id,
                           path_state_to_string(old_state),
                           path_state_to_string(state));
 
@@ -445,13 +316,13 @@ static int path_coldplug(Unit *u) {
         return 0;
 }
 
-static void path_enter_dead(Path *p, PathResult f) {
+static void path_enter_dead(Path *p, bool success) {
         assert(p);
 
-        if (f != PATH_SUCCESS)
-                p->result = f;
+        if (!success)
+                p->failure = true;
 
-        path_set_state(p, p->result != PATH_SUCCESS ? PATH_FAILED : PATH_DEAD);
+        path_set_state(p, p->failure ? PATH_FAILED : PATH_DEAD);
 }
 
 static void path_enter_running(Path *p) {
@@ -462,10 +333,10 @@ static void path_enter_running(Path *p) {
         dbus_error_init(&error);
 
         /* Don't start job if we are supposed to go down */
-        if (UNIT(p)->job && UNIT(p)->job->type == JOB_STOP)
+        if (p->meta.job && p->meta.job->type == JOB_STOP)
                 return;
 
-        if ((r = manager_add_job(UNIT(p)->manager, JOB_START, UNIT_DEREF(p->unit), JOB_REPLACE, true, &error, NULL)) < 0)
+        if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0)
                 goto fail;
 
         p->inotify_triggered = false;
@@ -477,8 +348,8 @@ static void path_enter_running(Path *p) {
         return;
 
 fail:
-        log_warning("%s failed to queue unit startup job: %s", UNIT(p)->id, bus_error(&error, r));
-        path_enter_dead(p, PATH_FAILURE_RESOURCES);
+        log_warning("%s failed to queue unit startup job: %s", p->meta.id, bus_error(&error, r));
+        path_enter_dead(p, false);
 
         dbus_error_free(&error);
 }
@@ -490,7 +361,37 @@ static bool path_check_good(Path *p, bool initial) {
         assert(p);
 
         LIST_FOREACH(spec, s, p->specs) {
-                good = path_spec_check_good(s, initial);
+
+                switch (s->type) {
+
+                case PATH_EXISTS:
+                        good = access(s->path, F_OK) >= 0;
+                        break;
+
+                case PATH_EXISTS_GLOB:
+                        good = glob_exists(s->path) > 0;
+                        break;
+
+                case PATH_DIRECTORY_NOT_EMPTY: {
+                        int k;
+
+                        k = dir_is_empty(s->path);
+                        good = !(k == -ENOENT || k > 0);
+                        break;
+                }
+
+                case PATH_CHANGED: {
+                        bool b;
+
+                        b = access(s->path, F_OK) >= 0;
+                        good = !initial && b != s->previous_exists;
+                        s->previous_exists = b;
+                        break;
+                }
+
+                default:
+                        ;
+                }
 
                 if (good)
                         break;
@@ -504,7 +405,7 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) {
 
         if (recheck)
                 if (path_check_good(p, initial)) {
-                        log_debug("%s got triggered.", UNIT(p)->id);
+                        log_debug("%s got triggered.", p->meta.id);
                         path_enter_running(p);
                         return;
                 }
@@ -518,7 +419,7 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) {
 
         if (recheck)
                 if (path_check_good(p, false)) {
-                        log_debug("%s got triggered.", UNIT(p)->id);
+                        log_debug("%s got triggered.", p->meta.id);
                         path_enter_running(p);
                         return;
                 }
@@ -527,8 +428,8 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) {
         return;
 
 fail:
-        log_warning("%s failed to enter waiting state: %s", UNIT(p)->id, strerror(-r));
-        path_enter_dead(p, PATH_FAILURE_RESOURCES);
+        log_warning("%s failed to enter waiting state: %s", p->meta.id, strerror(-r));
+        path_enter_dead(p, false);
 }
 
 static void path_mkdir(Path *p) {
@@ -539,8 +440,15 @@ static void path_mkdir(Path *p) {
         if (!p->make_directory)
                 return;
 
-        LIST_FOREACH(spec, s, p->specs)
-                path_spec_mkdir(s, p->directory_mode);
+        LIST_FOREACH(spec, s, p->specs) {
+                int r;
+
+                if (s->type == PATH_EXISTS || s->type == PATH_EXISTS_GLOB)
+                        continue;
+
+                if ((r = mkdir_p(s->path, p->directory_mode)) < 0)
+                        log_warning("mkdir(%s) failed: %s", s->path, strerror(-r));
+        }
 }
 
 static int path_start(Unit *u) {
@@ -549,12 +457,12 @@ static int path_start(Unit *u) {
         assert(p);
         assert(p->state == PATH_DEAD || p->state == PATH_FAILED);
 
-        if (UNIT_DEREF(p->unit)->load_state != UNIT_LOADED)
+        if (p->unit->meta.load_state != UNIT_LOADED)
                 return -ENOENT;
 
         path_mkdir(p);
 
-        p->result = PATH_SUCCESS;
+        p->failure = false;
         path_enter_waiting(p, true, true);
 
         return 0;
@@ -566,7 +474,7 @@ static int path_stop(Unit *u) {
         assert(p);
         assert(p->state == PATH_WAITING || p->state == PATH_RUNNING);
 
-        path_enter_dead(p, PATH_SUCCESS);
+        path_enter_dead(p, true);
         return 0;
 }
 
@@ -578,7 +486,6 @@ static int path_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", path_state_to_string(p->state));
-        unit_serialize_item(u, f, "result", path_result_to_string(p->result));
 
         return 0;
 }
@@ -598,16 +505,6 @@ static int path_deserialize_item(Unit *u, const char *key, const char *value, FD
                         log_debug("Failed to parse state value %s", value);
                 else
                         p->deserialized_state = state;
-
-        } else if (streq(key, "result")) {
-                PathResult f;
-
-                f = path_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != PATH_SUCCESS)
-                        p->result = f;
-
         } else
                 log_debug("Unknown serialization key '%s'", key);
 
@@ -628,8 +525,12 @@ static const char *path_sub_state_to_string(Unit *u) {
 
 static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         Path *p = PATH(u);
+        int l;
+        ssize_t k;
+        uint8_t *buf = NULL;
+        struct inotify_event *e;
         PathSpec *s;
-        int changed;
+        bool changed;
 
         assert(p);
         assert(fd >= 0);
@@ -638,10 +539,15 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
             p->state != PATH_RUNNING)
                 return;
 
-        /* log_debug("inotify wakeup on %s.", u->id); */
+        /* log_debug("inotify wakeup on %s.", u->meta.id); */
+
+        if (events != EPOLLIN) {
+                log_error("Got Invalid poll event on inotify.");
+                goto fail;
+        }
 
         LIST_FOREACH(spec, s, p->specs)
-                if (path_spec_owns_inotify_fd(s, fd))
+                if (s->inotify_fd == fd)
                         break;
 
         if (!s) {
@@ -649,46 +555,92 @@ static void path_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
                 goto fail;
         }
 
-        changed = path_spec_fd_event(s, events);
-        if (changed < 0)
+        if (ioctl(fd, FIONREAD, &l) < 0) {
+                log_error("FIONREAD failed: %s", strerror(errno));
+                goto fail;
+        }
+
+        assert(l > 0);
+
+        if (!(buf = malloc(l))) {
+                log_error("Failed to allocate buffer: %s", strerror(ENOMEM));
                 goto fail;
+        }
+
+        if ((k = read(fd, buf, l)) < 0) {
+                log_error("Failed to read inotify event: %s", strerror(-errno));
+                goto fail;
+        }
 
         /* If we are already running, then remember that one event was
          * dispatched so that we restart the service only if something
          * actually changed on disk */
         p->inotify_triggered = true;
 
+        e = (struct inotify_event*) buf;
+
+        changed = false;
+        while (k > 0) {
+                size_t step;
+
+                if (s->type == PATH_CHANGED && s->primary_wd == e->wd)
+                        changed = true;
+
+                step = sizeof(struct inotify_event) + e->len;
+                assert(step <= (size_t) k);
+
+                e = (struct inotify_event*) ((uint8_t*) e + step);
+                k -= step;
+        }
+
         if (changed)
                 path_enter_running(p);
         else
                 path_enter_waiting(p, false, true);
 
+        free(buf);
+
         return;
 
 fail:
-        path_enter_dead(p, PATH_FAILURE_RESOURCES);
+        free(buf);
+        path_enter_dead(p, false);
 }
 
 void path_unit_notify(Unit *u, UnitActiveState new_state) {
+        char *n;
+        int r;
         Iterator i;
-        Unit *k;
 
-        if (u->type == UNIT_PATH)
+        if (u->meta.type == UNIT_PATH)
                 return;
 
-        SET_FOREACH(k, u->dependencies[UNIT_TRIGGERED_BY], i) {
+        SET_FOREACH(n, u->meta.names, i) {
+                char *k;
+                Unit *t;
                 Path *p;
 
-                if (k->type != UNIT_PATH)
+                if (!(k = unit_name_change_suffix(n, ".path"))) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                t = manager_get_unit(u->meta.manager, k);
+                free(k);
+
+                if (!t)
                         continue;
 
-                if (k->load_state != UNIT_LOADED)
+                if (t->meta.load_state != UNIT_LOADED)
                         continue;
 
-                p = PATH(k);
+                p = PATH(t);
+
+                if (p->unit != u)
+                        continue;
 
                 if (p->state == PATH_RUNNING && new_state == UNIT_INACTIVE) {
-                        log_debug("%s got notified about unit deactivation.", UNIT(p)->id);
+                        log_debug("%s got notified about unit deactivation.", p->meta.id);
 
                         /* Hmm, so inotify was triggered since the
                          * last activation, so I guess we need to
@@ -696,6 +648,11 @@ void path_unit_notify(Unit *u, UnitActiveState new_state) {
                         path_enter_waiting(p, false, p->inotify_triggered);
                 }
         }
+
+        return;
+
+fail:
+        log_error("Failed find path unit: %s", strerror(-r));
 }
 
 static void path_reset_failed(Unit *u) {
@@ -706,7 +663,7 @@ static void path_reset_failed(Unit *u) {
         if (p->state == PATH_FAILED)
                 path_set_state(p, PATH_DEAD);
 
-        p->result = PATH_SUCCESS;
+        p->failure = false;
 }
 
 static const char* const path_state_table[_PATH_STATE_MAX] = {
@@ -722,22 +679,13 @@ static const char* const path_type_table[_PATH_TYPE_MAX] = {
         [PATH_EXISTS] = "PathExists",
         [PATH_EXISTS_GLOB] = "PathExistsGlob",
         [PATH_CHANGED] = "PathChanged",
-        [PATH_MODIFIED] = "PathModified",
         [PATH_DIRECTORY_NOT_EMPTY] = "DirectoryNotEmpty"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(path_type, PathType);
 
-static const char* const path_result_table[_PATH_RESULT_MAX] = {
-        [PATH_SUCCESS] = "success",
-        [PATH_FAILURE_RESOURCES] = "resources"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(path_result, PathResult);
-
 const UnitVTable path_vtable = {
         .suffix = ".path",
-        .object_size = sizeof(Path),
         .sections =
                 "Unit\0"
                 "Path\0"
@@ -765,6 +713,5 @@ const UnitVTable path_vtable = {
         .reset_failed = path_reset_failed,
 
         .bus_interface = "org.freedesktop.systemd1.Path",
-        .bus_message_handler = bus_path_message_handler,
-        .bus_invalidating_properties = bus_path_invalidating_properties
+        .bus_message_handler = bus_path_message_handler
 };
index efb6b5e..116fc63 100644 (file)
@@ -41,7 +41,6 @@ typedef enum PathType {
         PATH_EXISTS_GLOB,
         PATH_DIRECTORY_NOT_EMPTY,
         PATH_CHANGED,
-        PATH_MODIFIED,
         _PATH_TYPE_MAX,
         _PATH_TYPE_INVALID = -1
 } PathType;
@@ -58,39 +57,23 @@ typedef struct PathSpec {
         int primary_wd;
 
         bool previous_exists;
-} PathSpec;
-
-int path_spec_watch(PathSpec *s, Unit *u);
-void path_spec_unwatch(PathSpec *s, Unit *u);
-int path_spec_fd_event(PathSpec *s, uint32_t events);
-void path_spec_done(PathSpec *s);
-
-static inline bool path_spec_owns_inotify_fd(PathSpec *s, int fd) {
-        return s->inotify_fd == fd;
-}
 
-typedef enum PathResult {
-        PATH_SUCCESS,
-        PATH_FAILURE_RESOURCES,
-        _PATH_RESULT_MAX,
-        _PATH_RESULT_INVALID = -1
-} PathResult;
+} PathSpec;
 
 struct Path {
-        Unit meta;
+        Meta meta;
 
         LIST_HEAD(PathSpec, specs);
 
-        UnitRef unit;
+        Unit *unit;
 
         PathState state, deserialized_state;
 
+        bool failure;
         bool inotify_triggered;
 
         bool make_directory;
         mode_t directory_mode;
-
-        PathResult result;
 };
 
 void path_unit_notify(Unit *u, UnitActiveState new_state);
@@ -107,7 +90,4 @@ PathState path_state_from_string(const char *s);
 const char* path_type_to_string(PathType i);
 PathType path_type_from_string(const char *s);
 
-const char* path_result_to_string(PathResult i);
-PathResult path_result_from_string(const char *s);
-
 #endif
index 3acbdc6..5b67480 100644 (file)
@@ -82,7 +82,6 @@ int verify_polkit(
                 DBusMessage *request,
                 const char *action,
                 bool interactive,
-                bool *_challenge,
                 DBusError *error) {
 
         DBusMessage *m = NULL, *reply = NULL;
@@ -95,7 +94,7 @@ int verify_polkit(
         uint64_t starttime_u64;
         DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant;
         int r;
-        dbus_bool_t authorized = FALSE, challenge = FALSE;
+        dbus_bool_t authorized = FALSE;
 
         assert(c);
         assert(request);
@@ -177,21 +176,7 @@ int verify_polkit(
 
         dbus_message_iter_get_basic(&iter_struct, &authorized);
 
-        if (!dbus_message_iter_next(&iter_struct) ||
-            dbus_message_iter_get_arg_type(&iter_struct) != DBUS_TYPE_BOOLEAN) {
-                r = -EIO;
-                goto finish;
-        }
-
-        dbus_message_iter_get_basic(&iter_struct, &challenge);
-
-        if (authorized)
-                r = 1;
-        else if (_challenge) {
-                *_challenge = !!challenge;
-                r = 0;
-        } else
-                r = -EPERM;
+        r = authorized ? 0 : -EPERM;
 
 finish:
 
index 0d08194..fc4e771 100644 (file)
@@ -30,7 +30,6 @@ int verify_polkit(
                 DBusMessage *request,
                 const char *action,
                 bool interactive,
-                bool *challenge,
                 DBusError *error);
 
 #endif
index b6648b8..98b59a0 100644 (file)
@@ -54,7 +54,7 @@ static int parse_proc_cmdline(void) {
                         arg_skip = true;
                 else if (startswith(w, "quotacheck.mode"))
                         log_warning("Invalid quotacheck.mode= parameter. Ignoring.");
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)
                 else if (strneq(w, "forcequotacheck", l))
                         arg_force = true;
 #endif
@@ -65,8 +65,8 @@ static int parse_proc_cmdline(void) {
 }
 
 static void test_files(void) {
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-        /* This exists only on Fedora, Mandriva or Mageia */
+#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)
+        /* This exists only on Fedora or Mandriva */
         if (access("/forcequotacheck", F_OK) >= 0)
                 arg_force = true;
 #endif
@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
index 8b43bac..ee5cae3 100644 (file)
@@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
@@ -51,11 +51,7 @@ int main(int argc, char *argv[]) {
 
         /* Read pool size, if possible */
         if ((f = fopen("/proc/sys/kernel/random/poolsize", "re"))) {
-                if (fscanf(f, "%zu", &buf_size) > 0) {
-                        /* poolsize is in bits on 2.6, but we want bytes */
-                        buf_size /= 8;
-                }
-
+                fscanf(f, "%zu", &buf_size);
                 fclose(f);
         }
 
index 93157c7..1ddc831 100644 (file)
 bool ratelimit_test(RateLimit *r) {
         usec_t ts;
 
-        assert(r);
-
-        if (r->interval <= 0 || r->burst <= 0)
-                return true;
-
         ts = now(CLOCK_MONOTONIC);
 
+        assert(r);
+        assert(r->interval > 0);
+        assert(r->burst > 0);
+
         if (r->begin <= 0 ||
             r->begin + r->interval < ts) {
                 r->begin = ts;
index a6443e7..a44ef70 100644 (file)
@@ -46,7 +46,7 @@ typedef struct RateLimit {
                 _r->burst = (_burst);                    \
                 _r->num = 0;                             \
                 _r->begin = 0;                           \
-        } while (false)
+        } while (false);
 
 bool ratelimit_test(RateLimit *r);
 
diff --git a/src/rc-local-generator.c b/src/rc-local-generator.c
deleted file mode 100644 (file)
index 56785cf..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-  Copyright 2011 Michal Schmidt
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "log.h"
-#include "util.h"
-
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-#define SCRIPT_PATH "/etc/rc.d/rc.local"
-#elif defined(TARGET_SUSE)
-#define SCRIPT_PATH "/etc/init.d/boot.local"
-#endif
-
-const char *arg_dest = "/tmp";
-
-static int add_symlink(const char *service) {
-        char *from = NULL, *to = NULL;
-        int r;
-
-        assert(service);
-
-        asprintf(&from, SYSTEM_DATA_UNIT_PATH "/%s", service);
-        asprintf(&to, "%s/multi-user.target.wants/%s", arg_dest, service);
-
-        if (!from || !to) {
-                log_error("Out of memory");
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        mkdir_parents(to, 0755);
-
-        r = symlink(from, to);
-        if (r < 0) {
-                if (errno == EEXIST)
-                        r = 0;
-                else {
-                        log_error("Failed to create symlink from %s to %s: %m", from, to);
-                        r = -errno;
-                }
-        }
-
-finish:
-
-        free(from);
-        free(to);
-
-        return r;
-}
-
-static bool file_is_executable(const char *f) {
-        struct stat st;
-
-        if (stat(f, &st) < 0)
-                return false;
-
-        return S_ISREG(st.st_mode) && (st.st_mode & 0111);
-}
-
-int main(int argc, char *argv[]) {
-
-        int r = EXIT_SUCCESS;
-
-        if (argc > 2) {
-                log_error("This program takes one or no arguments.");
-                return EXIT_FAILURE;
-        }
-
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
-
-        if (argc > 1)
-                arg_dest = argv[1];
-
-        if (file_is_executable(SCRIPT_PATH)) {
-                log_debug("Automatically adding rc-local.service.");
-
-                if (add_symlink("rc-local.service") < 0)
-                        r = EXIT_FAILURE;
-
-        }
-
-        return r;
-}
similarity index 99%
rename from src/readahead/readahead-collect.c
rename to src/readahead-collect.c
index 7e6c243..eac11e7 100644 (file)
 #include <getopt.h>
 #include <sys/inotify.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "missing.h"
 #include "util.h"
 #include "set.h"
+#include "sd-daemon.h"
 #include "ioprio.h"
 #include "readahead-common.h"
 #include "virt.h"
@@ -654,7 +653,7 @@ int main(int argc, char *argv[]) {
         int r;
         const char *root;
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
similarity index 95%
rename from src/readahead/readahead-replay.c
rename to src/readahead-replay.c
index 0c739c8..65011ac 100644 (file)
 #include <getopt.h>
 #include <sys/inotify.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "missing.h"
 #include "util.h"
 #include "set.h"
+#include "sd-daemon.h"
 #include "ioprio.h"
 #include "readahead-common.h"
 #include "virt.h"
@@ -186,13 +185,7 @@ static int replay(const char *root) {
         if (on_ssd)
                 prio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0);
         else
-                /* We are not using RT here, since we'd starve IO that
-                we didn't record (which is for example blkid, since
-                its disk accesses go directly to the block device and
-                are thus not visible in fallocate) to death. However,
-                we do ask for an IO prio that is slightly higher than
-                the default (which is BE. 4) */
-                prio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 2);
+                prio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_RT, 7);
 
         if (ioprio_set(IOPRIO_WHO_PROCESS, getpid(), prio) < 0)
                 log_warning("Failed to set IDLE IO priority class: %m");
@@ -344,7 +337,7 @@ int main(int argc, char*argv[]) {
         int r;
         const char *root;
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
index 3e146eb..8bbc021 100644 (file)
@@ -48,20 +48,18 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
         umask(0022);
 
-        f = setmntent("/etc/fstab", "r");
-        if (!f) {
+        if (!(f = setmntent("/etc/fstab", "r"))) {
                 log_error("Failed to open /etc/fstab: %m");
                 goto finish;
         }
 
-        pids = hashmap_new(trivial_hash_func, trivial_compare_func);
-        if (!pids) {
+        if (!(pids = hashmap_new(trivial_hash_func, trivial_compare_func))) {
                 log_error("Failed to allocate set");
                 goto finish;
         }
@@ -78,10 +76,9 @@ int main(int argc, char *argv[]) {
 
                 log_debug("Remounting %s", me->mnt_dir);
 
-                pid = fork();
-                if (pid < 0) {
+                if ((pid = fork()) < 0) {
                         log_error("Failed to fork: %m");
-                        ret = EXIT_FAILURE;
+                        ret = 1;
                         continue;
                 }
 
@@ -104,15 +101,8 @@ int main(int argc, char *argv[]) {
                 /* Parent */
 
                 s = strdup(me->mnt_dir);
-                if (!s) {
-                        log_error("Out of memory.");
-                        ret = EXIT_FAILURE;
-                        continue;
-                }
-
 
-                k = hashmap_put(pids, UINT_TO_PTR(pid), s);
-                if (k < 0) {
+                if ((k = hashmap_put(pids, UINT_TO_PTR(pid), s)) < 0) {
                         log_error("Failed to add PID to set: %s", strerror(-k));
                         ret = EXIT_FAILURE;
                         continue;
@@ -134,8 +124,7 @@ int main(int argc, char *argv[]) {
                         break;
                 }
 
-                s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid));
-                if (s) {
+                if ((s = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)))) {
                         if (!is_clean_exit(si.si_code, si.si_status)) {
                                 if (si.si_code == CLD_EXITED)
                                         log_error("/bin/mount for %s exited with exit status %i.", s, si.si_status);
index 3a96049..bd55e65 100644 (file)
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
         char packet[LINE_MAX];
         size_t length;
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
index 763e079..e68b708 100644 (file)
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#ifdef __BIONIC__
-#include <linux/fcntl.h>
-#else
 #include <sys/fcntl.h>
-#endif
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <errno.h>
similarity index 96%
rename from src/systemd/sd-daemon.h
rename to src/sd-daemon.h
index fe51159..46dc7fd 100644 (file)
@@ -58,8 +58,8 @@ extern "C" {
 
   You may find an up-to-date version of these source files online:
 
-  http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h
-  http://cgit.freedesktop.org/systemd/systemd/plain/src/sd-daemon.c
+  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
+  http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
 
   This should compile on non-Linux systems, too, but with the
   exception of the sd_is_xxx() calls all functions will become NOPs.
@@ -217,11 +217,6 @@ int sd_is_mq(int fd, const char *path);
      MAINPID=...  The main pid of a daemon, in case systemd did not
                   fork off the process itself. Example: "MAINPID=4711"
 
-     WATCHDOG=1   Tells systemd to update the watchdog timestamp.
-                  Services using this feature should do this in
-                  regular intervals. A watchdog framework can use the
-                  timestamps to detect failed services.
-
   Daemons can choose to send additional variables. However, it is
   recommended to prefix variable names not listed above with X_.
 
diff --git a/src/sd-id128.c b/src/sd-id128.c
deleted file mode 100644 (file)
index b4184e1..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#include "sd-id128.h"
-
-#include "util.h"
-#include "macro.h"
-
-_public_ char *sd_id128_to_string(sd_id128_t id, char s[33]) {
-        unsigned n;
-
-        if (!s)
-                return NULL;
-
-        for (n = 0; n < 16; n++) {
-                s[n*2] = hexchar(id.bytes[n] >> 4);
-                s[n*2+1] = hexchar(id.bytes[n] & 0xF);
-        }
-
-        s[32] = 0;
-
-        return s;
-}
-
-_public_ int sd_id128_from_string(const char s[33], sd_id128_t *ret) {
-        unsigned n;
-        sd_id128_t t;
-
-        if (!s)
-                return -EINVAL;
-        if (!ret)
-                return -EINVAL;
-
-        for (n = 0; n < 16; n++) {
-                int a, b;
-
-                a = unhexchar(s[n*2]);
-                if (a < 0)
-                        return -EINVAL;
-
-                b = unhexchar(s[n*2+1]);
-                if (b < 0)
-                        return -EINVAL;
-
-                t.bytes[n] = (a << 4) | b;
-        }
-
-        if (s[32] != 0)
-                return -EINVAL;
-
-        *ret = t;
-        return 0;
-}
-
-static sd_id128_t make_v4_uuid(sd_id128_t id) {
-        /* Stolen from generate_random_uuid() of drivers/char/random.c
-         * in the kernel sources */
-
-        /* Set UUID version to 4 --- truly random generation */
-        id.bytes[6] = (id.bytes[6] & 0x0F) | 0x40;
-
-        /* Set the UUID variant to DCE */
-        id.bytes[8] = (id.bytes[8] & 0x3F) | 0x80;
-
-        return id;
-}
-
-_public_ int sd_id128_get_machine(sd_id128_t *ret) {
-        static __thread sd_id128_t saved_machine_id;
-        static __thread bool saved_machine_id_valid = false;
-        int fd;
-        char buf[32];
-        ssize_t k;
-        unsigned j;
-        sd_id128_t t;
-
-        if (!ret)
-                return -EINVAL;
-
-        if (saved_machine_id_valid) {
-                *ret = saved_machine_id;
-                return 0;
-        }
-
-        fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-        if (fd < 0)
-                return -errno;
-
-        k = loop_read(fd, buf, 32, false);
-        close_nointr_nofail(fd);
-
-        if (k < 0)
-                return (int) k;
-
-        if (k < 32)
-                return -EIO;
-
-        for (j = 0; j < 16; j++) {
-                int a, b;
-
-                a = unhexchar(buf[j*2]);
-                b = unhexchar(buf[j*2+1]);
-
-                if (a < 0 || b < 0)
-                        return -EIO;
-
-                t.bytes[j] = a << 4 | b;
-        }
-
-        saved_machine_id = t;
-        saved_machine_id_valid = true;
-
-        *ret = t;
-        return 0;
-}
-
-_public_ int sd_id128_get_boot(sd_id128_t *ret) {
-        static __thread sd_id128_t saved_boot_id;
-        static __thread bool saved_boot_id_valid = false;
-        int fd;
-        char buf[36];
-        ssize_t k;
-        unsigned j;
-        sd_id128_t t;
-        char *p;
-
-        if (!ret)
-                return -EINVAL;
-
-        if (saved_boot_id_valid) {
-                *ret = saved_boot_id;
-                return 0;
-        }
-
-        fd = open("/proc/sys/kernel/random/boot_id", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-        if (fd < 0)
-                return -errno;
-
-        k = loop_read(fd, buf, 36, false);
-        close_nointr_nofail(fd);
-
-        if (k < 0)
-                return (int) k;
-
-        if (k < 36)
-                return -EIO;
-
-        for (j = 0, p = buf; j < 16; j++) {
-                int a, b;
-
-                if (*p == '-')
-                        p++;
-
-                a = unhexchar(p[0]);
-                b = unhexchar(p[1]);
-
-                if (a < 0 || b < 0)
-                        return -EIO;
-
-                t.bytes[j] = a << 4 | b;
-
-                p += 2;
-        }
-
-        saved_boot_id = t;
-        saved_boot_id_valid = true;
-
-        *ret = t;
-        return 0;
-}
-
-_public_ int sd_id128_randomize(sd_id128_t *ret) {
-        int fd;
-        ssize_t k;
-        sd_id128_t t;
-
-        if (!ret)
-                return -EINVAL;
-
-        fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC|O_NOCTTY);
-        if (fd < 0)
-                return -errno;
-
-        k = loop_read(fd, &t, 16, false);
-        close_nointr_nofail(fd);
-
-        if (k < 0)
-                return (int) k;
-
-        if (k < 16)
-                return -EIO;
-
-        /* Turn this into a valid v4 UUID, to be nice. Note that we
-         * only guarantee this for newly generated UUIDs, not for
-         * pre-existing ones.*/
-
-        *ret = make_v4_uuid(t);
-        return 0;
-}
similarity index 82%
rename from src/login/sd-login.c
rename to src/sd-login.c
index 887c421..a0a56c4 100644 (file)
@@ -121,58 +121,6 @@ _public_ int sd_pid_get_session(pid_t pid, char **session) {
         return 0;
 }
 
-_public_ int sd_pid_get_unit(pid_t pid, char **unit) {
-        int r;
-        char *cgroup, *p, *at, *b;
-        size_t k;
-
-        if (!unit)
-                return -EINVAL;
-
-        r = pid_get_cgroup(pid, NULL, &cgroup);
-        if (r < 0)
-                return r;
-
-        if (!startswith(cgroup, "/system/")) {
-                free(cgroup);
-                return -ENOENT;
-        }
-
-        p = cgroup + 8;
-        k = strcspn(p, "/");
-
-        at = memchr(p, '@', k);
-        if (at && at[1] == '.') {
-                size_t j;
-
-                /* This is a templated service */
-                if (p[k] != '/') {
-                        free(cgroup);
-                        return -EIO;
-                }
-
-                j = strcspn(p+k+1, "/");
-
-                b = malloc(k + j + 1);
-
-                if (b) {
-                        memcpy(b, p, at - p + 1);
-                        memcpy(b + (at - p) + 1, p + k + 1, j);
-                        memcpy(b + (at - p) + 1 + j, at + 1, k - (at - p) - 1);
-                        b[k+j] = 0;
-                }
-        } else
-                  b = strndup(p, k);
-
-        free(cgroup);
-
-        if (!b)
-                return -ENOMEM;
-
-        *unit = b;
-        return 0;
-}
-
 _public_ int sd_pid_get_owner_uid(pid_t pid, uid_t *uid) {
         int r;
         char *root, *cgroup, *p, *cc;
@@ -354,40 +302,17 @@ _public_ int sd_uid_get_seats(uid_t uid, int require_active, char ***seats) {
         return uid_get_array(uid, require_active ? "ACTIVE_SEATS" : "SEATS", seats);
 }
 
-static int file_of_session(const char *session, char **_p) {
-        char *p;
+_public_ int sd_session_is_active(const char *session) {
         int r;
+        char *p, *s = NULL;
 
-        assert(_p);
-
-        if (session)
-                p = strappend("/run/systemd/sessions/", session);
-        else {
-                char *buf;
-
-                r = sd_pid_get_session(0, &buf);
-                if (r < 0)
-                        return r;
-
-                p = strappend("/run/systemd/sessions/", buf);
-                free(buf);
-        }
+        if (!session)
+                return -EINVAL;
 
+        p = strappend("/run/systemd/sessions/", session);
         if (!p)
                 return -ENOMEM;
 
-        *_p = p;
-        return 0;
-}
-
-_public_ int sd_session_is_active(const char *session) {
-        int r;
-        char *p, *s = NULL;
-
-        r = file_of_session(session, &p);
-        if (r < 0)
-                return r;
-
         r = parse_env_file(p, NEWLINE, "ACTIVE", &s, NULL);
         free(p);
 
@@ -409,12 +334,14 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
         int r;
         char *p, *s = NULL;
 
+        if (!session)
+                return -EINVAL;
         if (!uid)
                 return -EINVAL;
 
-        r = file_of_session(session, &p);
-        if (r < 0)
-                return r;
+        p = strappend("/run/systemd/sessions/", session);
+        if (!p)
+                return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE, "UID", &s, NULL);
         free(p);
@@ -433,18 +360,20 @@ _public_ int sd_session_get_uid(const char *session, uid_t *uid) {
         return r;
 }
 
-static int session_get_string(const char *session, const char *field, char **value) {
+_public_ int sd_session_get_seat(const char *session, char **seat) {
         char *p, *s = NULL;
         int r;
 
-        if (!value)
+        if (!session)
+                return -EINVAL;
+        if (!seat)
                 return -EINVAL;
 
-        r = file_of_session(session, &p);
-        if (r < 0)
-                return r;
+        p = strappend("/run/systemd/sessions/", session);
+        if (!p)
+                return -ENOMEM;
 
-        r = parse_env_file(p, NEWLINE, field, &s, NULL);
+        r = parse_env_file(p, NEWLINE, "SEAT", &s, NULL);
         free(p);
 
         if (r < 0) {
@@ -455,53 +384,7 @@ static int session_get_string(const char *session, const char *field, char **val
         if (isempty(s))
                 return -ENOENT;
 
-        *value = s;
-        return 0;
-}
-
-_public_ int sd_session_get_seat(const char *session, char **seat) {
-        return session_get_string(session, "SEAT", seat);
-}
-
-_public_ int sd_session_get_service(const char *session, char **service) {
-        return session_get_string(session, "SERVICE", service);
-}
-
-_public_ int sd_session_get_type(const char *session, char **type) {
-        return session_get_string(session, "TYPE", type);
-}
-
-_public_ int sd_session_get_class(const char *session, char **class) {
-        return session_get_string(session, "CLASS", class);
-}
-
-_public_ int sd_session_get_display(const char *session, char **display) {
-        return session_get_string(session, "DISPLAY", display);
-}
-
-static int file_of_seat(const char *seat, char **_p) {
-        char *p;
-        int r;
-
-        assert(_p);
-
-        if (seat)
-                p = strappend("/run/systemd/seats/", seat);
-        else {
-                char *buf;
-
-                r = sd_session_get_seat(NULL, &buf);
-                if (r < 0)
-                        return r;
-
-                p = strappend("/run/systemd/seats/", buf);
-                free(buf);
-        }
-
-        if (!p)
-                return -ENOMEM;
-
-        *_p = p;
+        *seat = s;
         return 0;
 }
 
@@ -509,12 +392,14 @@ _public_ int sd_seat_get_active(const char *seat, char **session, uid_t *uid) {
         char *p, *s = NULL, *t = NULL;
         int r;
 
+        if (!seat)
+                return -EINVAL;
         if (!session && !uid)
                 return -EINVAL;
 
-        r = file_of_seat(seat, &p);
-        if (r < 0)
-                return r;
+        p = strappend("/run/systemd/seats/", seat);
+        if (!p)
+                return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE,
                            "ACTIVE", &s,
@@ -563,9 +448,12 @@ _public_ int sd_seat_get_sessions(const char *seat, char ***sessions, uid_t **ui
         unsigned n = 0;
         int r;
 
-        r = file_of_seat(seat, &p);
-        if (r < 0)
-                return r;
+        if (!seat)
+                return -EINVAL;
+
+        p = strappend("/run/systemd/seats/", seat);
+        if (!p)
+                return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE,
                            "SESSIONS", &s,
@@ -651,12 +539,15 @@ _public_ int sd_seat_can_multi_session(const char *seat) {
         char *p, *s = NULL;
         int r;
 
-        r = file_of_seat(seat, &p);
-        if (r < 0)
-                return r;
+        if (!seat)
+                return -EINVAL;
+
+        p = strappend("/run/systemd/seats/", seat);
+        if (!p)
+                return -ENOMEM;
 
         r = parse_env_file(p, NEWLINE,
-                           "CAN_MULTI_SESSION", &s,
+                           "IS_VTCONSOLE", &s,
                            NULL);
         free(p);
 
similarity index 85%
rename from src/systemd/sd-login.h
rename to src/sd-login.h
index 2f3c90c..0cb0bf0 100644 (file)
 
 #include <sys/types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * A few points:
  *
@@ -57,10 +53,6 @@ int sd_pid_get_session(pid_t pid, char **session);
  * return an error for system processes. */
 int sd_pid_get_owner_uid(pid_t pid, uid_t *uid);
 
-/* Get systemd unit (i.e. service) name from PID. This will return an
- * error for non-service processes. */
-int sd_pid_get_unit(pid_t, char **unit);
-
 /* Get state from uid. Possible states: offline, lingering, online, active */
 int sd_uid_get_state(uid_t uid, char**state);
 
@@ -87,18 +79,6 @@ int sd_session_get_uid(const char *session, uid_t *uid);
 /* Determine seat of session */
 int sd_session_get_seat(const char *session, char **seat);
 
-/* Determine the (PAM) service name this session was registered by. */
-int sd_session_get_service(const char *session, char **service);
-
-/* Determine the type of this session, i.e. one of "tty", "x11" or "unspecified". */
-int sd_session_get_type(const char *session, char **type);
-
-/* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */
-int sd_session_get_class(const char *session, char **class);
-
-/* Determine the X11 display of this session. */
-int sd_session_get_display(const char *session, char **display);
-
 /* Return active session and user of seat */
 int sd_seat_get_active(const char *seat, char **session, uid_t *uid);
 
@@ -138,8 +118,4 @@ int sd_login_monitor_flush(sd_login_monitor *m);
 /* Get FD from monitor */
 int sd_login_monitor_get_fd(sd_login_monitor *m);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
similarity index 87%
rename from src/readahead/sd-readahead.c
rename to src/sd-readahead.c
index a334066..c5cfe67 100644 (file)
 
 #include "sd-readahead.h"
 
-#if (__GNUC__ >= 4)
-#ifdef SD_EXPORT_SYMBOLS
-/* Export symbols */
-#define _sd_export_ __attribute__ ((visibility("default")))
-#else
-/* Don't export the symbols */
-#define _sd_export_ __attribute__ ((visibility("hidden")))
-#endif
-#else
-#define _sd_export_
-#endif
-
 static int touch(const char *path) {
 
 #if !defined(DISABLE_SYSTEMD) && defined(__linux__)
@@ -72,7 +60,7 @@ static int touch(const char *path) {
         return 0;
 }
 
-_sd_export_ int sd_readahead(const char *action) {
+int sd_readahead(const char *action) {
 
         if (!action)
                 return -EINVAL;
similarity index 87%
rename from src/systemd/sd-readahead.h
rename to src/sd-readahead.h
index 1f8c5a0..5bf975a 100644 (file)
@@ -47,8 +47,8 @@ extern "C" {
 
   You may find an up-to-date version of these source files online:
 
-  http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-readahead.h
-  http://cgit.freedesktop.org/systemd/systemd/plain/src/readahead/sd-readahead.c
+  http://cgit.freedesktop.org/systemd/plain/src/sd-readahead.h
+  http://cgit.freedesktop.org/systemd/plain/src/sd-readahead.c
 
   This should compile on non-Linux systems, too, but all functions
   will become NOPs.
@@ -56,6 +56,14 @@ extern "C" {
   See sd-readahead(7) for more information.
 */
 
+#ifndef _sd_hidden_
+#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
+#define _sd_hidden_ __attribute__ ((visibility("hidden")))
+#else
+#define _sd_hidden_
+#endif
+#endif
+
 /*
   Controls ongoing disk read-ahead operations during boot-up. The argument
   must be a string, and either "cancel", "done" or "noreplay".
@@ -64,7 +72,7 @@ extern "C" {
   done = terminate read-ahead data collection, keep collected information
   noreplay = terminate read-ahead replay
 */
-int sd_readahead(const char *action);
+int sd_readahead(const char *action) _sd_hidden_;
 
 #ifdef __cplusplus
 }
index ec2725a..6184390 100644 (file)
@@ -23,9 +23,7 @@
 #include <signal.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <sys/reboot.h>
 
-#include "manager.h"
 #include "unit.h"
 #include "service.h"
 #include "load-fragment.h"
@@ -110,13 +108,10 @@ static void service_init(Unit *u) {
         Service *s = SERVICE(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         s->timeout_usec = DEFAULT_TIMEOUT_USEC;
         s->restart_usec = DEFAULT_RESTART_USEC;
-
-        s->watchdog_watch.type = WATCH_INVALID;
-
         s->timer_watch.type = WATCH_INVALID;
 #ifdef HAVE_SYSV_COMPAT
         s->sysv_start_priority = -1;
@@ -127,7 +122,7 @@ static void service_init(Unit *u) {
 
         exec_context_init(&s->exec_context);
 
-        RATELIMIT_INIT(s->start_limit, 10*USEC_PER_SEC, 5);
+        RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5);
 
         s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
 }
@@ -152,17 +147,6 @@ static void service_unwatch_main_pid(Service *s) {
         s->main_pid = 0;
 }
 
-static void service_unwatch_pid_file(Service *s) {
-        if (!s->pid_file_pathspec)
-                return;
-
-        log_debug("Stopping watch for %s's PID file %s", UNIT(s)->id, s->pid_file_pathspec->path);
-        path_spec_unwatch(s->pid_file_pathspec, UNIT(s));
-        path_spec_done(s->pid_file_pathspec);
-        free(s->pid_file_pathspec);
-        s->pid_file_pathspec = NULL;
-}
-
 static int service_set_main_pid(Service *s, pid_t pid) {
         pid_t ppid;
 
@@ -179,7 +163,7 @@ static int service_set_main_pid(Service *s, pid_t pid) {
 
         if (get_parent_of_pid(pid, &ppid) >= 0 && ppid != getpid()) {
                 log_warning("%s: Supervising process %lu which is not our child. We'll most likely not notice when it exits.",
-                            UNIT(s)->id, (unsigned long) pid);
+                            s->meta.id, (unsigned long) pid);
 
                 s->main_pid_alien = true;
         } else
@@ -203,49 +187,11 @@ static void service_close_socket_fd(Service *s) {
 static void service_connection_unref(Service *s) {
         assert(s);
 
-        if (!UNIT_DEREF(s->accept_socket))
-                return;
-
-        socket_connection_unref(SOCKET(UNIT_DEREF(s->accept_socket)));
-        unit_ref_unset(&s->accept_socket);
-}
-
-static void service_stop_watchdog(Service *s) {
-        assert(s);
-
-        unit_unwatch_timer(UNIT(s), &s->watchdog_watch);
-        s->watchdog_timestamp.realtime = 0;
-        s->watchdog_timestamp.monotonic = 0;
-}
-
-static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart);
-
-static void service_handle_watchdog(Service *s) {
-        usec_t offset;
-        int r;
-
-        assert(s);
-
-        if (s->watchdog_usec == 0)
-                return;
-
-        offset = now(CLOCK_MONOTONIC) - s->watchdog_timestamp.monotonic;
-        if (offset >= s->watchdog_usec) {
-                log_error("%s watchdog timeout!", UNIT(s)->id);
-                service_enter_dead(s, SERVICE_FAILURE_WATCHDOG, true);
+        if (!s->accept_socket)
                 return;
-        }
 
-        r = unit_watch_timer(UNIT(s), s->watchdog_usec - offset, &s->watchdog_watch);
-        if (r < 0)
-                log_warning("%s failed to install watchdog timer: %s", UNIT(s)->id, strerror(-r));
-}
-
-static void service_reset_watchdog(Service *s) {
-        assert(s);
-
-        dual_timestamp_get(&s->watchdog_timestamp);
-        service_handle_watchdog(s);
+        socket_connection_unref(s->accept_socket);
+        s->accept_socket = NULL;
 }
 
 static void service_done(Unit *u) {
@@ -276,10 +222,9 @@ static void service_done(Unit *u) {
          * our resources */
         service_unwatch_main_pid(s);
         service_unwatch_control_pid(s);
-        service_unwatch_pid_file(s);
 
         if (s->bus_name)  {
-                unit_unwatch_bus_name(u, s->bus_name);
+                unit_unwatch_bus_name(UNIT(u), s->bus_name);
                 free(s->bus_name);
                 s->bus_name = NULL;
         }
@@ -287,9 +232,7 @@ static void service_done(Unit *u) {
         service_close_socket_fd(s);
         service_connection_unref(s);
 
-        unit_ref_unset(&s->accept_socket);
-
-        service_stop_watchdog(s);
+        set_free(s->configured_sockets);
 
         unit_unwatch_timer(u, &s->timer_watch);
 }
@@ -334,8 +277,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
         static const char * const table[] = {
                 /* LSB defined facilities */
                 "local_fs",             SPECIAL_LOCAL_FS_TARGET,
-#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
-#else
+#ifndef TARGET_MANDRIVA
                 /* Due to unfortunate name selection in Mandriva,
                  * $network is provided by network-up which is ordered
                  * after network which actually starts interfaces.
@@ -417,7 +359,7 @@ finish:
 }
 
 static int sysv_fix_order(Service *s) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(s);
@@ -428,17 +370,17 @@ static int sysv_fix_order(Service *s) {
         /* For each pair of services where at least one lacks a LSB
          * header, we use the start priority value to order things. */
 
-        LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) {
+        LIST_FOREACH(units_by_type, other, s->meta.manager->units_by_type[UNIT_SERVICE]) {
                 Service *t;
                 UnitDependency d;
                 bool special_s, special_t;
 
-                t = SERVICE(other);
+                t = (Service*) other;
 
                 if (s == t)
                         continue;
 
-                if (UNIT(t)->load_state != UNIT_LOADED)
+                if (t->meta.load_state != UNIT_LOADED)
                         continue;
 
                 if (t->sysv_start_priority < 0)
@@ -446,8 +388,8 @@ static int sysv_fix_order(Service *s) {
 
                 /* If both units have modern headers we don't care
                  * about the priorities */
-                if ((UNIT(s)->fragment_path || s->sysv_has_lsb) &&
-                    (UNIT(t)->fragment_path || t->sysv_has_lsb))
+                if ((s->meta.fragment_path || s->sysv_has_lsb) &&
+                    (t->meta.fragment_path || t->sysv_has_lsb))
                         continue;
 
                 special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels);
@@ -553,7 +495,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
         s->sysv_mtime = timespec_load(&st.st_mtim);
 
         if (null_or_empty(&st)) {
-                u->load_state = UNIT_MASKED;
+                u->meta.load_state = UNIT_MASKED;
                 r = 0;
                 goto finish;
         }
@@ -884,7 +826,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                  * needed for early boot) and don't create any links
                  * to it. */
 
-                UNIT(s)->default_dependencies = false;
+                s->meta.default_dependencies = false;
 
                 /* Don't timeout special services during boot (like fsck) */
                 s->timeout_usec = 0;
@@ -896,10 +838,9 @@ static int service_load_sysv_path(Service *s, const char *path) {
         s->remain_after_exit = !s->pid_file;
         s->guess_main_pid = false;
         s->restart = SERVICE_RESTART_NO;
-        s->exec_context.ignore_sigpipe = false;
 
-        if (UNIT(s)->manager->sysv_console)
-                s->exec_context.std_output = EXEC_OUTPUT_JOURNAL_AND_CONSOLE;
+        if (s->meta.manager->sysv_console)
+                s->exec_context.std_output = EXEC_OUTPUT_TTY;
 
         s->exec_context.kill_mode = KILL_PROCESS;
 
@@ -923,7 +864,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                         goto finish;
                 }
 
-                u->description = d;
+                u->meta.description = d;
         }
 
         /* The priority that has been set in /etc/rcN.d/ hierarchies
@@ -932,7 +873,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
         if (s->sysv_start_priority_from_rcnd >= 0)
                 s->sysv_start_priority = s->sysv_start_priority_from_rcnd;
 
-        u->load_state = UNIT_LOADED;
+        u->meta.load_state = UNIT_LOADED;
         r = 0;
 
 finish:
@@ -970,7 +911,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
                 return -ENOENT;
 #endif
 
-        STRV_FOREACH(p, UNIT(s)->manager->lookup_paths.sysvinit_path) {
+        STRV_FOREACH(p, s->meta.manager->lookup_paths.sysvinit_path) {
                 char *path;
                 int r;
 
@@ -984,7 +925,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
                 r = service_load_sysv_path(s, path);
 
 #if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM)
-                if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
+                if (r >= 0 && s->meta.load_state == UNIT_STUB) {
                         /* Try Debian style *.sh source'able init scripts */
                         strcat(path, ".sh");
                         r = service_load_sysv_path(s, path);
@@ -993,7 +934,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
                 free(path);
 
 #ifdef TARGET_SUSE
-                if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
+                if (r >= 0 && s->meta.load_state == UNIT_STUB) {
                         /* Try SUSE style boot.* init scripts */
 
                         path = join(*p, "/boot.", name, NULL);
@@ -1008,7 +949,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
 #endif
 
 #ifdef TARGET_FRUGALWARE
-                if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) {
+                if (r >= 0 && s->meta.load_state == UNIT_STUB) {
                         /* Try Frugalware style rc.* init scripts */
 
                         path = join(*p, "/rc.", name, NULL);
@@ -1025,7 +966,7 @@ static int service_load_sysv_name(Service *s, const char *name) {
                 if (r < 0)
                         return r;
 
-                if ((UNIT(s)->load_state != UNIT_STUB))
+                if ((s->meta.load_state != UNIT_STUB))
                         break;
         }
 
@@ -1042,22 +983,22 @@ static int service_load_sysv(Service *s) {
         /* Load service data from SysV init scripts, preferably with
          * LSB headers ... */
 
-        if (strv_isempty(UNIT(s)->manager->lookup_paths.sysvinit_path))
+        if (strv_isempty(s->meta.manager->lookup_paths.sysvinit_path))
                 return 0;
 
-        if ((t = UNIT(s)->id))
+        if ((t = s->meta.id))
                 if ((r = service_load_sysv_name(s, t)) < 0)
                         return r;
 
-        if (UNIT(s)->load_state == UNIT_STUB)
-                SET_FOREACH(t, UNIT(s)->names, i) {
-                        if (t == UNIT(s)->id)
+        if (s->meta.load_state == UNIT_STUB)
+                SET_FOREACH(t, s->meta.names, i) {
+                        if (t == s->meta.id)
                                 continue;
 
                         if ((r = service_load_sysv_name(s, t)) < 0)
                                 return r;
 
-                        if (UNIT(s)->load_state != UNIT_STUB)
+                        if (s->meta.load_state != UNIT_STUB)
                                 break;
                 }
 
@@ -1066,7 +1007,7 @@ static int service_load_sysv(Service *s) {
 #endif
 
 static int fsck_fix_order(Service *s) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(s);
@@ -1077,16 +1018,16 @@ static int fsck_fix_order(Service *s) {
         /* For each pair of services where both have an fsck priority
          * we order things based on it. */
 
-        LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) {
+        LIST_FOREACH(units_by_type, other, s->meta.manager->units_by_type[UNIT_SERVICE]) {
                 Service *t;
                 UnitDependency d;
 
-                t = SERVICE(other);
+                t = (Service*) other;
 
                 if (s == t)
                         continue;
 
-                if (UNIT(t)->load_state != UNIT_LOADED)
+                if (t->meta.load_state != UNIT_LOADED)
                         continue;
 
                 if (t->fsck_passno <= 0)
@@ -1109,33 +1050,33 @@ static int fsck_fix_order(Service *s) {
 static int service_verify(Service *s) {
         assert(s);
 
-        if (UNIT(s)->load_state != UNIT_LOADED)
+        if (s->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!s->exec_command[SERVICE_EXEC_START]) {
-                log_error("%s lacks ExecStart setting. Refusing.", UNIT(s)->id);
+                log_error("%s lacks ExecStart setting. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->type != SERVICE_ONESHOT &&
             s->exec_command[SERVICE_EXEC_START]->command_next) {
-                log_error("%s has more than one ExecStart setting, which is only allowed for Type=oneshot services. Refusing.", UNIT(s)->id);
+                log_error("%s has more than one ExecStart setting, which is only allowed for Type=oneshot services. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->type == SERVICE_ONESHOT &&
             s->exec_command[SERVICE_EXEC_RELOAD]) {
-                log_error("%s has an ExecReload setting, which is not allowed for Type=oneshot services. Refusing.", UNIT(s)->id);
+                log_error("%s has an ExecReload setting, which is not allowed for Type=oneshot services. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->type == SERVICE_DBUS && !s->bus_name) {
-                log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->id);
+                log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) {
-                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(s)->id);
+                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
@@ -1151,12 +1092,12 @@ static int service_add_default_dependencies(Service *s) {
          * majority of services. */
 
         /* First, pull in base system */
-        if (UNIT(s)->manager->running_as == MANAGER_SYSTEM) {
+        if (s->meta.manager->running_as == MANAGER_SYSTEM) {
 
                 if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
                         return r;
 
-        } else if (UNIT(s)->manager->running_as == MANAGER_USER) {
+        } else if (s->meta.manager->running_as == MANAGER_USER) {
 
                 if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
                         return r;
@@ -1177,11 +1118,11 @@ static void service_fix_output(Service *s) {
         if (s->exec_context.std_error == EXEC_OUTPUT_INHERIT &&
             s->exec_context.std_output == EXEC_OUTPUT_INHERIT &&
             s->exec_context.std_input == EXEC_INPUT_NULL)
-                s->exec_context.std_error = UNIT(s)->manager->default_std_error;
+                s->exec_context.std_error = s->meta.manager->default_std_error;
 
         if (s->exec_context.std_output == EXEC_OUTPUT_INHERIT &&
             s->exec_context.std_input == EXEC_INPUT_NULL)
-                s->exec_context.std_output = UNIT(s)->manager->default_std_output;
+                s->exec_context.std_output = s->meta.manager->default_std_output;
 }
 
 static int service_load(Unit *u) {
@@ -1196,13 +1137,13 @@ static int service_load(Unit *u) {
 
 #ifdef HAVE_SYSV_COMPAT
         /* Load a classic init script as a fallback, if we couldn't find anything */
-        if (u->load_state == UNIT_STUB)
+        if (u->meta.load_state == UNIT_STUB)
                 if ((r = service_load_sysv(s)) < 0)
                         return r;
 #endif
 
         /* Still nothing found? Then let's give up */
-        if (u->load_state == UNIT_STUB)
+        if (u->meta.load_state == UNIT_STUB)
                 return -ENOENT;
 
         /* We were able to load something, then let's add in the
@@ -1211,7 +1152,7 @@ static int service_load(Unit *u) {
                 return r;
 
         /* This is a new unit? Then let's add in some extras */
-        if (u->load_state == UNIT_LOADED) {
+        if (u->meta.load_state == UNIT_LOADED) {
                 service_fix_output(s);
 
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
@@ -1235,14 +1176,11 @@ static int service_load(Unit *u) {
                 if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE)
                         s->notify_access = NOTIFY_MAIN;
 
-                if (s->watchdog_usec > 0 && s->notify_access == NOTIFY_NONE)
-                        s->notify_access = NOTIFY_MAIN;
-
                 if (s->type == SERVICE_DBUS || s->bus_name)
                         if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_SOCKET, NULL, true)) < 0)
                                 return r;
 
-                if (UNIT(s)->default_dependencies)
+                if (s->meta.default_dependencies)
                         if ((r = service_add_default_dependencies(s)) < 0)
                                 return r;
         }
@@ -1264,8 +1202,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sService State: %s\n"
-                "%sResult: %s\n"
-                "%sReload Result: %s\n"
                 "%sPermissionsStartOnly: %s\n"
                 "%sRootDirectoryStartOnly: %s\n"
                 "%sRemainAfterExit: %s\n"
@@ -1274,8 +1210,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sRestart: %s\n"
                 "%sNotifyAccess: %s\n",
                 prefix, service_state_to_string(s->state),
-                prefix, service_result_to_string(s->result),
-                prefix, service_result_to_string(s->reload_result),
                 prefix, yes_no(s->permissions_start_only),
                 prefix, yes_no(s->root_directory_start_only),
                 prefix, yes_no(s->remain_after_exit),
@@ -1355,7 +1289,7 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
         free(p2);
 }
 
-static int service_load_pid_file(Service *s, bool may_warn) {
+static int service_load_pid_file(Service *s, bool warn_if_missing) {
         char *k;
         int r;
         pid_t pid;
@@ -1366,9 +1300,9 @@ static int service_load_pid_file(Service *s, bool may_warn) {
                 return -ENOENT;
 
         if ((r = read_one_line_file(s->pid_file, &k)) < 0) {
-                if (may_warn)
-                        log_info("PID file %s not readable (yet?) after %s.",
-                                 s->pid_file, service_state_to_string(s->state));
+                if (warn_if_missing)
+                        log_warning("Failed to read PID file %s after %s. The service might be broken.",
+                                    s->pid_file, service_state_to_string(s->state));
                 return r;
         }
 
@@ -1379,9 +1313,8 @@ static int service_load_pid_file(Service *s, bool may_warn) {
                 return r;
 
         if (kill(pid, 0) < 0 && errno != EPERM) {
-                if (may_warn)
-                        log_info("PID %lu read from file %s does not exist.",
-                                 (unsigned long) pid, s->pid_file);
+                log_warning("PID %lu read from file %s does not exist. Your service or init script might be broken.",
+                            (unsigned long) pid, s->pid_file);
                 return -ESRCH;
         }
 
@@ -1393,8 +1326,7 @@ static int service_load_pid_file(Service *s, bool may_warn) {
                           (unsigned long) s->main_pid, (unsigned long) pid);
                 service_unwatch_main_pid(s);
                 s->main_pid_known = false;
-        } else
-                log_debug("Main PID loaded: %lu", (unsigned long) pid);
+        }
 
         if ((r = service_set_main_pid(s, pid)) < 0)
                 return r;
@@ -1422,10 +1354,9 @@ static int service_search_main_pid(Service *s) {
 
         assert(s->main_pid <= 0);
 
-        if ((pid = cgroup_bonding_search_main_pid_list(UNIT(s)->cgroup_bondings)) <= 0)
+        if ((pid = cgroup_bonding_search_main_pid_list(s->meta.cgroup_bondings)) <= 0)
                 return -ENOENT;
 
-        log_debug("Main PID guessed: %lu", (unsigned long) pid);
         if ((r = service_set_main_pid(s, pid)) < 0)
                 return r;
 
@@ -1436,22 +1367,86 @@ static int service_search_main_pid(Service *s) {
         return 0;
 }
 
-static void service_notify_sockets_dead(Service *s) {
+static int service_get_sockets(Service *s, Set **_set) {
+        Set *set;
         Iterator i;
-        Unit *u;
+        char *t;
+        int r;
+
+        assert(s);
+        assert(_set);
+
+        if (s->socket_fd >= 0)
+                return 0;
+
+        if (!set_isempty(s->configured_sockets))
+                return 0;
+
+        /* Collects all Socket objects that belong to this
+         * service. Note that a service might have multiple sockets
+         * via multiple names. */
+
+        if (!(set = set_new(NULL, NULL)))
+                return -ENOMEM;
+
+        SET_FOREACH(t, s->meta.names, i) {
+                char *k;
+                Unit *p;
+
+                /* Look for all socket objects that go by any of our
+                 * units and collect their fds */
+
+                if (!(k = unit_name_change_suffix(t, ".socket"))) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                p = manager_get_unit(s->meta.manager, k);
+                free(k);
+
+                if (!p)
+                        continue;
+
+                if ((r = set_put(set, p)) < 0)
+                        goto fail;
+        }
+
+        *_set = set;
+        return 0;
+
+fail:
+        set_free(set);
+        return r;
+}
+
+static int service_notify_sockets_dead(Service *s) {
+        Iterator i;
+        Set *set, *free_set = NULL;
+        Socket *sock;
+        int r;
 
         assert(s);
 
         /* Notifies all our sockets when we die */
 
         if (s->socket_fd >= 0)
-                return;
+                return 0;
 
-        SET_FOREACH(u, UNIT(s)->dependencies[UNIT_TRIGGERED_BY], i)
-                if (u->type == UNIT_SOCKET)
-                        socket_notify_service_dead(SOCKET(u));
+        if (!set_isempty(s->configured_sockets))
+                set = s->configured_sockets;
+        else {
+                if ((r = service_get_sockets(s, &free_set)) < 0)
+                        return r;
 
-        return;
+                set = free_set;
+        }
+
+        SET_FOREACH(sock, set, i)
+                socket_notify_service_dead(sock);
+
+        set_free(free_set);
+
+        return 0;
 }
 
 static void service_set_state(Service *s, ServiceState state) {
@@ -1461,8 +1456,6 @@ static void service_set_state(Service *s, ServiceState state) {
         old_state = s->state;
         s->state = state;
 
-        service_unwatch_pid_file(s);
-
         if (state != SERVICE_START_PRE &&
             state != SERVICE_START &&
             state != SERVICE_START_POST &&
@@ -1524,24 +1517,21 @@ static void service_set_state(Service *s, ServiceState state) {
             state != SERVICE_STOP_POST &&
             state != SERVICE_FINAL_SIGTERM &&
             state != SERVICE_FINAL_SIGKILL &&
-            !(state == SERVICE_DEAD && UNIT(s)->job)) {
+            !(state == SERVICE_DEAD && s->meta.job)) {
                 service_close_socket_fd(s);
                 service_connection_unref(s);
         }
 
-        if (state == SERVICE_STOP)
-                service_stop_watchdog(s);
-
         /* For the inactive states unit_notify() will trim the cgroup,
          * but for exit we have to do that ourselves... */
-        if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0)
-                cgroup_bonding_trim_list(UNIT(s)->cgroup_bondings, true);
+        if (state == SERVICE_EXITED && s->meta.manager->n_reloading <= 0)
+                cgroup_bonding_trim_list(s->meta.cgroup_bondings, true);
 
         if (old_state != state)
-                log_debug("%s changed %s -> %s", UNIT(s)->id, service_state_to_string(old_state), service_state_to_string(state));
+                log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state));
 
-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], s->reload_result == SERVICE_SUCCESS);
-        s->reload_result = SERVICE_SUCCESS;
+        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], !s->reload_failure);
+        s->reload_failure = false;
 }
 
 static int service_coldplug(Unit *u) {
@@ -1604,12 +1594,9 @@ static int service_coldplug(Unit *u) {
                                 if ((r = unit_watch_pid(UNIT(s), s->control_pid)) < 0)
                                         return r;
 
-                if (s->deserialized_state == SERVICE_START_POST ||
-                    s->deserialized_state == SERVICE_RUNNING)
-                        service_handle_watchdog(s);
-
                 service_set_state(s, s->deserialized_state);
         }
+
         return 0;
 }
 
@@ -1618,7 +1605,8 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
         int r;
         int *rfds = NULL;
         unsigned rn_fds = 0;
-        Unit *u;
+        Set *set, *free_set = NULL;
+        Socket *sock;
 
         assert(s);
         assert(fds);
@@ -1627,15 +1615,18 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
         if (s->socket_fd >= 0)
                 return 0;
 
-        SET_FOREACH(u, UNIT(s)->dependencies[UNIT_TRIGGERED_BY], i) {
-                int *cfds;
-                unsigned cn_fds;
-                Socket *sock;
+        if (!set_isempty(s->configured_sockets))
+                set = s->configured_sockets;
+        else {
+                if ((r = service_get_sockets(s, &free_set)) < 0)
+                        return r;
 
-                if (u->type != UNIT_SOCKET)
-                        continue;
+                set = free_set;
+        }
 
-                sock = SOCKET(u);
+        SET_FOREACH(sock, set, i) {
+                int *cfds;
+                unsigned cn_fds;
 
                 if ((r = socket_collect_fds(sock, &cfds, &cn_fds)) < 0)
                         goto fail;
@@ -1668,9 +1659,12 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
         *fds = rfds;
         *n_fds = rn_fds;
 
+        set_free(free_set);
+
         return 0;
 
 fail:
+        set_free(set);
         free(rfds);
 
         return r;
@@ -1730,7 +1724,7 @@ static int service_spawn(
         }
 
         if (set_notify_socket)
-                if (asprintf(our_env + n_env++, "NOTIFY_SOCKET=%s", UNIT(s)->manager->notify_socket) < 0) {
+                if (asprintf(our_env + n_env++, "NOTIFY_SOCKET=%s", s->meta.manager->notify_socket) < 0) {
                         r = -ENOMEM;
                         goto fail;
                 }
@@ -1741,14 +1735,8 @@ static int service_spawn(
                         goto fail;
                 }
 
-        if (s->watchdog_usec > 0)
-                if (asprintf(our_env + n_env++, "WATCHDOG_USEC=%llu", (unsigned long long) s->watchdog_usec) < 0) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-
         if (!(final_env = strv_env_merge(2,
-                                         UNIT(s)->manager->environment,
+                                         s->meta.manager->environment,
                                          our_env,
                                          NULL))) {
                 r = -ENOMEM;
@@ -1763,9 +1751,9 @@ static int service_spawn(
                        apply_permissions,
                        apply_chroot,
                        apply_tty_stdin,
-                       UNIT(s)->manager->confirm_spawn,
-                       UNIT(s)->cgroup_bondings,
-                       UNIT(s)->cgroup_attributes,
+                       s->meta.manager->confirm_spawn,
+                       s->meta.cgroup_bondings,
+                       s->meta.cgroup_attributes,
                        &pid);
 
         if (r < 0)
@@ -1833,52 +1821,52 @@ static int cgroup_good(Service *s) {
 
         assert(s);
 
-        if ((r = cgroup_bonding_is_empty_list(UNIT(s)->cgroup_bondings)) < 0)
+        if ((r = cgroup_bonding_is_empty_list(s->meta.cgroup_bondings)) < 0)
                 return r;
 
         return !r;
 }
 
-static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) {
+static void service_enter_dead(Service *s, bool success, bool allow_restart) {
         int r;
         assert(s);
 
-        if (f != SERVICE_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         if (allow_restart &&
             !s->forbid_restart &&
             (s->restart == SERVICE_RESTART_ALWAYS ||
-             (s->restart == SERVICE_RESTART_ON_SUCCESS && s->result == SERVICE_SUCCESS) ||
-             (s->restart == SERVICE_RESTART_ON_FAILURE && s->result != SERVICE_SUCCESS) ||
-             (s->restart == SERVICE_RESTART_ON_ABORT && (s->result == SERVICE_FAILURE_SIGNAL ||
-                                                         s->result == SERVICE_FAILURE_CORE_DUMP)))) {
+             (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure) ||
+             (s->restart == SERVICE_RESTART_ON_FAILURE && s->failure) ||
+             (s->restart == SERVICE_RESTART_ON_ABORT && s->failure &&
+              (s->main_exec_status.code == CLD_KILLED ||
+               s->main_exec_status.code == CLD_DUMPED)))) {
 
-                r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch);
-                if (r < 0)
+                if ((r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch)) < 0)
                         goto fail;
 
                 service_set_state(s, SERVICE_AUTO_RESTART);
         } else
-                service_set_state(s, s->result != SERVICE_SUCCESS ? SERVICE_FAILED : SERVICE_DEAD);
+                service_set_state(s, s->failure ? SERVICE_FAILED : SERVICE_DEAD);
 
         s->forbid_restart = false;
 
         return;
 
 fail:
-        log_warning("%s failed to run install restart timer: %s", UNIT(s)->id, strerror(-r));
-        service_enter_dead(s, SERVICE_FAILURE_RESOURCES, false);
+        log_warning("%s failed to run install restart timer: %s", s->meta.id, strerror(-r));
+        service_enter_dead(s, false, false);
 }
 
-static void service_enter_signal(Service *s, ServiceState state, ServiceResult f);
+static void service_enter_signal(Service *s, ServiceState state, bool success);
 
-static void service_enter_stop_post(Service *s, ServiceResult f) {
+static void service_enter_stop_post(Service *s, bool success) {
         int r;
         assert(s);
 
-        if (f != SERVICE_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         service_unwatch_control_pid(s);
 
@@ -1899,24 +1887,24 @@ static void service_enter_stop_post(Service *s, ServiceResult f) {
 
                 service_set_state(s, SERVICE_STOP_POST);
         } else
-                service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_SUCCESS);
+                service_enter_signal(s, SERVICE_FINAL_SIGTERM, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->id, strerror(-r));
-        service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'stop-post' task: %s", s->meta.id, strerror(-r));
+        service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
-static void service_enter_signal(Service *s, ServiceState state, ServiceResult f) {
+static void service_enter_signal(Service *s, ServiceState state, bool success) {
         int r;
         Set *pid_set = NULL;
         bool wait_for_exit = false;
 
         assert(s);
 
-        if (f != SERVICE_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         if (s->exec_context.kill_mode != KILL_NONE) {
                 int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL;
@@ -1951,7 +1939,7 @@ static void service_enter_signal(Service *s, ServiceState state, ServiceResult f
                                 if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0)
                                         goto fail;
 
-                        if ((r = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, sig, true, pid_set)) < 0) {
+                        if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig, true, pid_set)) < 0) {
                                 if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
                                         log_warning("Failed to kill control group: %s", strerror(-r));
                         } else if (r > 0)
@@ -1969,31 +1957,31 @@ static void service_enter_signal(Service *s, ServiceState state, ServiceResult f
 
                 service_set_state(s, state);
         } else if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL)
-                service_enter_stop_post(s, SERVICE_SUCCESS);
+                service_enter_stop_post(s, true);
         else
-                service_enter_dead(s, SERVICE_SUCCESS, true);
+                service_enter_dead(s, true, true);
 
         return;
 
 fail:
-        log_warning("%s failed to kill processes: %s", UNIT(s)->id, strerror(-r));
+        log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r));
 
         if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL)
-                service_enter_stop_post(s, SERVICE_FAILURE_RESOURCES);
+                service_enter_stop_post(s, false);
         else
-                service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
+                service_enter_dead(s, false, true);
 
         if (pid_set)
                 set_free(pid_set);
 }
 
-static void service_enter_stop(Service *s, ServiceResult f) {
+static void service_enter_stop(Service *s, bool success) {
         int r;
 
         assert(s);
 
-        if (f != SERVICE_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         service_unwatch_control_pid(s);
 
@@ -2013,21 +2001,21 @@ static void service_enter_stop(Service *s, ServiceResult f) {
 
                 service_set_state(s, SERVICE_STOP);
         } else
-                service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_SUCCESS);
+                service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run 'stop' task: %s", UNIT(s)->id, strerror(-r));
-        service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'stop' task: %s", s->meta.id, strerror(-r));
+        service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
 }
 
-static void service_enter_running(Service *s, ServiceResult f) {
+static void service_enter_running(Service *s, bool success) {
         int main_pid_ok, cgroup_ok;
         assert(s);
 
-        if (f != SERVICE_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         main_pid_ok = main_pid_good(s);
         cgroup_ok = cgroup_good(s);
@@ -2038,7 +2026,7 @@ static void service_enter_running(Service *s, ServiceResult f) {
         else if (s->remain_after_exit)
                 service_set_state(s, SERVICE_EXITED);
         else
-                service_enter_stop(s, SERVICE_SUCCESS);
+                service_enter_stop(s, true);
 }
 
 static void service_enter_start_post(Service *s) {
@@ -2047,9 +2035,6 @@ static void service_enter_start_post(Service *s) {
 
         service_unwatch_control_pid(s);
 
-        if (s->watchdog_usec > 0)
-                service_reset_watchdog(s);
-
         if ((s->control_command = s->exec_command[SERVICE_EXEC_START_POST])) {
                 s->control_command_id = SERVICE_EXEC_START_POST;
 
@@ -2066,13 +2051,13 @@ static void service_enter_start_post(Service *s) {
 
                 service_set_state(s, SERVICE_START_POST);
         } else
-                service_enter_running(s, SERVICE_SUCCESS);
+                service_enter_running(s, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->id, strerror(-r));
-        service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'start-post' task: %s", s->meta.id, strerror(-r));
+        service_enter_stop(s, false);
 }
 
 static void service_enter_start(Service *s) {
@@ -2090,11 +2075,6 @@ static void service_enter_start(Service *s) {
         else
                 service_unwatch_main_pid(s);
 
-        /* We want to ensure that nobody leaks processes from
-         * START_PRE here, so let's go on a killing spree, People
-         * should not spawn long running processes from START_PRE. */
-        cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, SIGKILL, true, NULL);
-
         if (s->type == SERVICE_FORKING) {
                 s->control_command_id = SERVICE_EXEC_START;
                 c = s->control_command = s->exec_command[SERVICE_EXEC_START];
@@ -2152,8 +2132,8 @@ static void service_enter_start(Service *s) {
         return;
 
 fail:
-        log_warning("%s failed to run 'start' task: %s", UNIT(s)->id, strerror(-r));
-        service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'start' task: %s", s->meta.id, strerror(-r));
+        service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
 static void service_enter_start_pre(Service *s) {
@@ -2164,11 +2144,6 @@ static void service_enter_start_pre(Service *s) {
         service_unwatch_control_pid(s);
 
         if ((s->control_command = s->exec_command[SERVICE_EXEC_START_PRE])) {
-
-                /* Before we start anything, let's clear up what might
-                 * be left from previous runs. */
-                cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, SIGKILL, true, NULL);
-
                 s->control_command_id = SERVICE_EXEC_START_PRE;
 
                 if ((r = service_spawn(s,
@@ -2189,8 +2164,8 @@ static void service_enter_start_pre(Service *s) {
         return;
 
 fail:
-        log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->id, strerror(-r));
-        service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
+        log_warning("%s failed to run 'start-pre' task: %s", s->meta.id, strerror(-r));
+        service_enter_dead(s, false, true);
 }
 
 static void service_enter_restart(Service *s) {
@@ -2200,24 +2175,24 @@ static void service_enter_restart(Service *s) {
         assert(s);
         dbus_error_init(&error);
 
-        if (UNIT(s)->job) {
+        if (s->meta.job) {
                 log_info("Job pending for unit, delaying automatic restart.");
 
                 if ((r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch)) < 0)
                         goto fail;
         }
 
-        service_enter_dead(s, SERVICE_SUCCESS, false);
+        service_enter_dead(s, true, false);
 
-        if ((r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT(s), JOB_FAIL, false, &error, NULL)) < 0)
+        if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, &error, NULL)) < 0)
                 goto fail;
 
-        log_debug("%s scheduled restart job.", UNIT(s)->id);
+        log_debug("%s scheduled restart job.", s->meta.id);
         return;
 
 fail:
-        log_warning("%s failed to schedule restart job: %s", UNIT(s)->id, bus_error(&error, -r));
-        service_enter_dead(s, SERVICE_FAILURE_RESOURCES, false);
+        log_warning("%s failed to schedule restart job: %s", s->meta.id, bus_error(&error, -r));
+        service_enter_dead(s, false, false);
 
         dbus_error_free(&error);
 }
@@ -2245,23 +2220,26 @@ static void service_enter_reload(Service *s) {
 
                 service_set_state(s, SERVICE_RELOAD);
         } else
-                service_enter_running(s, SERVICE_SUCCESS);
+                service_enter_running(s, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run 'reload' task: %s", UNIT(s)->id, strerror(-r));
-        s->reload_result = SERVICE_FAILURE_RESOURCES;
-        service_enter_running(s, SERVICE_SUCCESS);
+        log_warning("%s failed to run 'reload' task: %s", s->meta.id, strerror(-r));
+        s->reload_failure = true;
+        service_enter_running(s, true);
 }
 
-static void service_run_next_control(Service *s) {
+static void service_run_next_control(Service *s, bool success) {
         int r;
 
         assert(s);
         assert(s->control_command);
         assert(s->control_command->command_next);
 
+        if (!success)
+                s->failure = true;
+
         assert(s->control_command_id != SERVICE_EXEC_START);
 
         s->control_command = s->control_command->command_next;
@@ -2282,22 +2260,22 @@ static void service_run_next_control(Service *s) {
         return;
 
 fail:
-        log_warning("%s failed to run next control task: %s", UNIT(s)->id, strerror(-r));
+        log_warning("%s failed to run next control task: %s", s->meta.id, strerror(-r));
 
         if (s->state == SERVICE_START_PRE)
-                service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
+                service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
         else if (s->state == SERVICE_STOP)
-                service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
+                service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
         else if (s->state == SERVICE_STOP_POST)
-                service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
+                service_enter_dead(s, false, true);
         else if (s->state == SERVICE_RELOAD) {
-                s->reload_result = SERVICE_FAILURE_RESOURCES;
-                service_enter_running(s, SERVICE_SUCCESS);
+                s->reload_failure = true;
+                service_enter_running(s, true);
         } else
-                service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
+                service_enter_stop(s, false);
 }
 
-static void service_run_next_main(Service *s) {
+static void service_run_next_main(Service *s, bool success) {
         pid_t pid;
         int r;
 
@@ -2306,6 +2284,9 @@ static void service_run_next_main(Service *s) {
         assert(s->main_command->command_next);
         assert(s->type == SERVICE_ONESHOT);
 
+        if (!success)
+                s->failure = true;
+
         s->main_command = s->main_command->command_next;
         service_unwatch_main_pid(s);
 
@@ -2325,60 +2306,12 @@ static void service_run_next_main(Service *s) {
         return;
 
 fail:
-        log_warning("%s failed to run next main task: %s", UNIT(s)->id, strerror(-r));
-        service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
-}
-
-static int service_start_limit_test(Service *s) {
-        assert(s);
-
-        if (ratelimit_test(&s->start_limit))
-                return 0;
-
-        switch (s->start_limit_action) {
-
-        case SERVICE_START_LIMIT_NONE:
-                log_warning("%s start request repeated too quickly, refusing to start.", UNIT(s)->id);
-                break;
-
-        case SERVICE_START_LIMIT_REBOOT: {
-                DBusError error;
-                int r;
-
-                dbus_error_init(&error);
-
-                log_warning("%s start request repeated too quickly, rebooting.", UNIT(s)->id);
-
-                r = manager_add_job_by_name(UNIT(s)->manager, JOB_START, SPECIAL_REBOOT_TARGET, JOB_REPLACE, true, &error, NULL);
-                if (r < 0) {
-                        log_error("Failed to reboot: %s.", bus_error(&error, r));
-                        dbus_error_free(&error);
-                }
-
-                break;
-        }
-
-        case SERVICE_START_LIMIT_REBOOT_FORCE:
-                log_warning("%s start request repeated too quickly, force rebooting.", UNIT(s)->id);
-                UNIT(s)->manager->exit_code = MANAGER_REBOOT;
-                break;
-
-        case SERVICE_START_LIMIT_REBOOT_IMMEDIATE:
-                log_warning("%s start request repeated too quickly, rebooting immediately.", UNIT(s)->id);
-                reboot(RB_AUTOBOOT);
-                break;
-
-        default:
-                log_error("start limit action=%i", s->start_limit_action);
-                assert_not_reached("Unknown StartLimitAction.");
-        }
-
-        return -ECANCELED;
+        log_warning("%s failed to run next main task: %s", s->meta.id, strerror(-r));
+        service_enter_stop(s, false);
 }
 
 static int service_start(Unit *u) {
         Service *s = SERVICE(u);
-        int r;
 
         assert(s);
 
@@ -2401,12 +2334,12 @@ static int service_start(Unit *u) {
         assert(s->state == SERVICE_DEAD || s->state == SERVICE_FAILED || s->state == SERVICE_AUTO_RESTART);
 
         /* Make sure we don't enter a busy loop of some kind. */
-        r = service_start_limit_test(s);
-        if (r < 0)
-                return r;
+        if (!ratelimit_test(&s->ratelimit)) {
+                log_warning("%s start request repeated too quickly, refusing to start.", u->meta.id);
+                return -ECANCELED;
+        }
 
-        s->result = SERVICE_SUCCESS;
-        s->reload_result = SERVICE_SUCCESS;
+        s->failure = false;
         s->main_pid_known = false;
         s->main_pid_alien = false;
         s->forbid_restart = false;
@@ -2445,14 +2378,14 @@ static int service_stop(Unit *u) {
             s->state == SERVICE_START ||
             s->state == SERVICE_START_POST ||
             s->state == SERVICE_RELOAD) {
-                service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_SUCCESS);
+                service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
                 return 0;
         }
 
         assert(s->state == SERVICE_RUNNING ||
                s->state == SERVICE_EXITED);
 
-        service_enter_stop(s, SERVICE_SUCCESS);
+        service_enter_stop(s, true);
         return 0;
 }
 
@@ -2483,8 +2416,7 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", service_state_to_string(s->state));
-        unit_serialize_item(u, f, "result", service_result_to_string(s->result));
-        unit_serialize_item(u, f, "reload-result", service_result_to_string(s->reload_result));
+        unit_serialize_item(u, f, "failure", yes_no(s->failure));
 
         if (s->control_pid > 0)
                 unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid);
@@ -2497,9 +2429,9 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
         if (s->status_text)
                 unit_serialize_item(u, f, "status-text", s->status_text);
 
-        /* FIXME: There's a minor uncleanliness here: if there are
-         * multiple commands attached here, we will start from the
-         * first one again */
+        /* There's a minor uncleanliness here: if there are multiple
+         * commands attached here, we will start from the first one
+         * again */
         if (s->control_command_id >= 0)
                 unit_serialize_item(u, f, "control-command", service_exec_command_to_string(s->control_command_id));
 
@@ -2522,8 +2454,6 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
                         unit_serialize_item_format(u, f, "main-exec-status-status", "%i", s->main_exec_status.status);
                 }
         }
-        if (dual_timestamp_is_set(&s->watchdog_timestamp))
-                dual_timestamp_serialize(f, "watchdog-timestamp", &s->watchdog_timestamp);
 
         return 0;
 }
@@ -2543,24 +2473,13 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
                         log_debug("Failed to parse state value %s", value);
                 else
                         s->deserialized_state = state;
-        } else if (streq(key, "result")) {
-                ServiceResult f;
-
-                f = service_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != SERVICE_SUCCESS)
-                        s->result = f;
-
-        } else if (streq(key, "reload-result")) {
-                ServiceResult f;
-
-                f = service_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse reload result value %s", value);
-                else if (f != SERVICE_SUCCESS)
-                        s->reload_result = f;
+        } else if (streq(key, "failure")) {
+                int b;
 
+                if ((b = parse_boolean(value)) < 0)
+                        log_debug("Failed to parse failure value %s", value);
+                else
+                        s->failure = b || s->failure;
         } else if (streq(key, "control-pid")) {
                 pid_t pid;
 
@@ -2635,8 +2554,6 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
                 dual_timestamp_deserialize(value, &s->main_exec_status.start_timestamp);
         else if (streq(key, "main-exec-status-exit"))
                 dual_timestamp_deserialize(value, &s->main_exec_status.exit_timestamp);
-        else if (streq(key, "watchdog-timestamp"))
-                dual_timestamp_deserialize(value, &s->watchdog_timestamp);
         else
                 log_debug("Unknown serialization key '%s'", key);
 
@@ -2683,112 +2600,17 @@ static bool service_check_snapshot(Unit *u) {
         return !s->got_socket_fd;
 }
 
-static int service_retry_pid_file(Service *s) {
-        int r;
-
-        assert(s->pid_file);
-        assert(s->state == SERVICE_START || s->state == SERVICE_START_POST);
-
-        r = service_load_pid_file(s, false);
-        if (r < 0)
-                return r;
-
-        service_unwatch_pid_file(s);
-
-        service_enter_running(s, SERVICE_SUCCESS);
-        return 0;
-}
-
-static int service_watch_pid_file(Service *s) {
-        int r;
-
-        log_debug("Setting watch for %s's PID file %s", UNIT(s)->id, s->pid_file_pathspec->path);
-        r = path_spec_watch(s->pid_file_pathspec, UNIT(s));
-        if (r < 0)
-                goto fail;
-
-        /* the pidfile might have appeared just before we set the watch */
-        service_retry_pid_file(s);
-
-        return 0;
-fail:
-        log_error("Failed to set a watch for %s's PID file %s: %s",
-                  UNIT(s)->id, s->pid_file_pathspec->path, strerror(-r));
-        service_unwatch_pid_file(s);
-        return r;
-}
-
-static int service_demand_pid_file(Service *s) {
-        PathSpec *ps;
-
-        assert(s->pid_file);
-        assert(!s->pid_file_pathspec);
-
-        ps = new0(PathSpec, 1);
-        if (!ps)
-                return -ENOMEM;
-
-        ps->path = strdup(s->pid_file);
-        if (!ps->path) {
-                free(ps);
-                return -ENOMEM;
-        }
-
-        path_kill_slashes(ps->path);
-
-        /* PATH_CHANGED would not be enough. There are daemons (sendmail) that
-         * keep their PID file open all the time. */
-        ps->type = PATH_MODIFIED;
-        ps->inotify_fd = -1;
-
-        s->pid_file_pathspec = ps;
-
-        return service_watch_pid_file(s);
-}
-
-static void service_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
-        Service *s = SERVICE(u);
-
-        assert(s);
-        assert(fd >= 0);
-        assert(s->state == SERVICE_START || s->state == SERVICE_START_POST);
-        assert(s->pid_file_pathspec);
-        assert(path_spec_owns_inotify_fd(s->pid_file_pathspec, fd));
-
-        log_debug("inotify event for %s", u->id);
-
-        if (path_spec_fd_event(s->pid_file_pathspec, events) < 0)
-                goto fail;
-
-        if (service_retry_pid_file(s) == 0)
-                return;
-
-        if (service_watch_pid_file(s) < 0)
-                goto fail;
-
-        return;
-fail:
-        service_unwatch_pid_file(s);
-        service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
-}
-
 static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         Service *s = SERVICE(u);
-        ServiceResult f;
+        bool success;
 
         assert(s);
         assert(pid >= 0);
 
-        if (UNIT(s)->fragment_path ? is_clean_exit(code, status) : is_clean_exit_lsb(code, status))
-                f = SERVICE_SUCCESS;
-        else if (code == CLD_EXITED)
-                f = SERVICE_FAILURE_EXIT_CODE;
-        else if (code == CLD_KILLED)
-                f = SERVICE_FAILURE_SIGNAL;
-        else if (code == CLD_DUMPED)
-                f = SERVICE_FAILURE_CORE_DUMP;
+        if (!s->meta.fragment_path)
+                success = is_clean_exit_lsb(code, status);
         else
-                assert_not_reached("Unknown code");
+                success = is_clean_exit(code, status);
 
         if (s->main_pid == pid) {
                 /* Forking services may occasionally move to a new PID.
@@ -2808,24 +2630,22 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         s->main_command->exec_status = s->main_exec_status;
 
                         if (s->main_command->ignore)
-                                f = SERVICE_SUCCESS;
+                                success = true;
                 }
 
-                log_full(f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
-                         "%s: main process exited, code=%s, status=%i", u->id, sigchld_code_to_string(code), status);
-
-                if (f != SERVICE_SUCCESS)
-                        s->result = f;
+                log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                         "%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status);
+                s->failure = s->failure || !success;
 
                 if (s->main_command &&
                     s->main_command->command_next &&
-                    f == SERVICE_SUCCESS) {
+                    success) {
 
                         /* There is another command to *
                          * execute, so let's do that. */
 
-                        log_debug("%s running next main command for state %s", u->id, service_state_to_string(s->state));
-                        service_run_next_main(s);
+                        log_debug("%s running next main command for state %s", u->meta.id, service_state_to_string(s->state));
+                        service_run_next_main(s, success);
 
                 } else {
 
@@ -2845,10 +2665,10 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         case SERVICE_START:
                                 if (s->type == SERVICE_ONESHOT) {
                                         /* This was our main goal, so let's go on */
-                                        if (f == SERVICE_SUCCESS)
+                                        if (success)
                                                 service_enter_start_post(s);
                                         else
-                                                service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
+                                                service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
                                         break;
                                 } else {
                                         assert(s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY);
@@ -2857,14 +2677,14 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                                 }
 
                         case SERVICE_RUNNING:
-                                service_enter_running(s, f);
+                                service_enter_running(s, success);
                                 break;
 
                         case SERVICE_STOP_SIGTERM:
                         case SERVICE_STOP_SIGKILL:
 
                                 if (!control_pid_good(s))
-                                        service_enter_stop_post(s, f);
+                                        service_enter_stop_post(s, success);
 
                                 /* If there is still a control process, wait for that first */
                                 break;
@@ -2882,24 +2702,22 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         exec_status_exit(&s->control_command->exec_status, &s->exec_context, pid, code, status);
 
                         if (s->control_command->ignore)
-                                f = SERVICE_SUCCESS;
+                                success = true;
                 }
 
-                log_full(f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
-                         "%s: control process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status);
-
-                if (f != SERVICE_SUCCESS)
-                        s->result = f;
+               log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                         "%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+                s->failure = s->failure || !success;
 
                 if (s->control_command &&
                     s->control_command->command_next &&
-                    f == SERVICE_SUCCESS) {
+                    success) {
 
                         /* There is another command to *
                          * execute, so let's do that. */
 
-                        log_debug("%s running next control command for state %s", u->id, service_state_to_string(s->state));
-                        service_run_next_control(s);
+                        log_debug("%s running next control command for state %s", u->meta.id, service_state_to_string(s->state));
+                        service_run_next_control(s, success);
 
                 } else {
                         /* No further commands for this step, so let's
@@ -2908,87 +2726,65 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         s->control_command = NULL;
                         s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
 
-                        log_debug("%s got final SIGCHLD for state %s", u->id, service_state_to_string(s->state));
+                        log_debug("%s got final SIGCHLD for state %s", u->meta.id, service_state_to_string(s->state));
 
                         switch (s->state) {
 
                         case SERVICE_START_PRE:
-                                if (f == SERVICE_SUCCESS)
+                                if (success)
                                         service_enter_start(s);
                                 else
-                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
+                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
                                 break;
 
                         case SERVICE_START:
                                 assert(s->type == SERVICE_FORKING);
 
-                                if (f != SERVICE_SUCCESS) {
-                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
-                                        break;
-                                }
+                                /* Let's try to load the pid
+                                 * file here if we can. We
+                                 * ignore the return value,
+                                 * since the PID file might
+                                 * actually be created by a
+                                 * START_POST script */
 
-                                if (s->pid_file) {
-                                        bool has_start_post;
-                                        int r;
-
-                                        /* Let's try to load the pid file here if we can.
-                                         * The PID file might actually be created by a START_POST
-                                         * script. In that case don't worry if the loading fails. */
-
-                                        has_start_post = !!s->exec_command[SERVICE_EXEC_START_POST];
-                                        r = service_load_pid_file(s, !has_start_post);
-                                        if (!has_start_post && r < 0) {
-                                                r = service_demand_pid_file(s);
-                                                if (r < 0 || !cgroup_good(s))
-                                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
-                                                break;
-                                        }
-                                } else
+                                if (success) {
+                                        service_load_pid_file(s, !s->exec_command[SERVICE_EXEC_START_POST]);
                                         service_search_main_pid(s);
 
-                                service_enter_start_post(s);
+                                        service_enter_start_post(s);
+                                } else
+                                        service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+
                                 break;
 
                         case SERVICE_START_POST:
-                                if (f != SERVICE_SUCCESS) {
-                                        service_enter_stop(s, f);
-                                        break;
-                                }
-
-                                if (s->pid_file) {
-                                        int r;
-
-                                        r = service_load_pid_file(s, true);
-                                        if (r < 0) {
-                                                r = service_demand_pid_file(s);
-                                                if (r < 0 || !cgroup_good(s))
-                                                        service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
-                                                break;
-                                        }
-                                } else
+                                if (success) {
+                                        service_load_pid_file(s, true);
                                         service_search_main_pid(s);
+                                }
 
-                                service_enter_running(s, SERVICE_SUCCESS);
+                                s->reload_failure = !success;
+                                service_enter_running(s, true);
                                 break;
 
                         case SERVICE_RELOAD:
-                                if (f == SERVICE_SUCCESS) {
+                                if (success) {
                                         service_load_pid_file(s, true);
                                         service_search_main_pid(s);
                                 }
 
-                                s->reload_result = f;
-                                service_enter_running(s, SERVICE_SUCCESS);
+                                s->reload_failure = !success;
+                                service_enter_running(s, true);
                                 break;
 
                         case SERVICE_STOP:
-                                service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
+                                service_enter_signal(s, SERVICE_STOP_SIGTERM, success);
                                 break;
 
                         case SERVICE_STOP_SIGTERM:
                         case SERVICE_STOP_SIGKILL:
                                 if (main_pid_good(s) <= 0)
-                                        service_enter_stop_post(s, f);
+                                        service_enter_stop_post(s, success);
 
                                 /* If there is still a service
                                  * process around, wait until
@@ -2998,7 +2794,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         case SERVICE_STOP_POST:
                         case SERVICE_FINAL_SIGTERM:
                         case SERVICE_FINAL_SIGKILL:
-                                service_enter_dead(s, f, true);
+                                service_enter_dead(s, success, true);
                                 break;
 
                         default:
@@ -3017,44 +2813,39 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
         assert(s);
         assert(elapsed == 1);
 
-        if (w == &s->watchdog_watch) {
-                service_handle_watchdog(s);
-                return;
-        }
-
         assert(w == &s->timer_watch);
 
         switch (s->state) {
 
         case SERVICE_START_PRE:
         case SERVICE_START:
-                log_warning("%s operation timed out. Terminating.", u->id);
-                service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_TIMEOUT);
+                log_warning("%s operation timed out. Terminating.", u->meta.id);
+                service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
                 break;
 
         case SERVICE_START_POST:
-                log_warning("%s operation timed out. Stopping.", u->id);
-                service_enter_stop(s, SERVICE_FAILURE_TIMEOUT);
+                log_warning("%s operation timed out. Stopping.", u->meta.id);
+                service_enter_stop(s, false);
                 break;
 
         case SERVICE_RELOAD:
-                log_warning("%s operation timed out. Stopping.", u->id);
-                s->reload_result = SERVICE_FAILURE_TIMEOUT;
-                service_enter_running(s, SERVICE_SUCCESS);
+                log_warning("%s operation timed out. Stopping.", u->meta.id);
+                s->reload_failure = true;
+                service_enter_running(s, true);
                 break;
 
         case SERVICE_STOP:
-                log_warning("%s stopping timed out. Terminating.", u->id);
-                service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
+                log_warning("%s stopping timed out. Terminating.", u->meta.id);
+                service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
                 break;
 
         case SERVICE_STOP_SIGTERM:
                 if (s->exec_context.send_sigkill) {
-                        log_warning("%s stopping timed out. Killing.", u->id);
-                        service_enter_signal(s, SERVICE_STOP_SIGKILL, SERVICE_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out. Killing.", u->meta.id);
+                        service_enter_signal(s, SERVICE_STOP_SIGKILL, false);
                 } else {
-                        log_warning("%s stopping timed out. Skipping SIGKILL.", u->id);
-                        service_enter_stop_post(s, SERVICE_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out. Skipping SIGKILL.", u->meta.id);
+                        service_enter_stop_post(s, false);
                 }
 
                 break;
@@ -3064,33 +2855,33 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
                  * Must be something we cannot kill, so let's just be
                  * weirded out and continue */
 
-                log_warning("%s still around after SIGKILL. Ignoring.", u->id);
-                service_enter_stop_post(s, SERVICE_FAILURE_TIMEOUT);
+                log_warning("%s still around after SIGKILL. Ignoring.", u->meta.id);
+                service_enter_stop_post(s, false);
                 break;
 
         case SERVICE_STOP_POST:
-                log_warning("%s stopping timed out (2). Terminating.", u->id);
-                service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_TIMEOUT);
+                log_warning("%s stopping timed out (2). Terminating.", u->meta.id);
+                service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
                 break;
 
         case SERVICE_FINAL_SIGTERM:
                 if (s->exec_context.send_sigkill) {
-                        log_warning("%s stopping timed out (2). Killing.", u->id);
-                        service_enter_signal(s, SERVICE_FINAL_SIGKILL, SERVICE_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out (2). Killing.", u->meta.id);
+                        service_enter_signal(s, SERVICE_FINAL_SIGKILL, false);
                 } else {
-                        log_warning("%s stopping timed out (2). Skipping SIGKILL. Entering failed mode.", u->id);
-                        service_enter_dead(s, SERVICE_FAILURE_TIMEOUT, false);
+                        log_warning("%s stopping timed out (2). Skipping SIGKILL. Entering failed mode.", u->meta.id);
+                        service_enter_dead(s, false, true);
                 }
 
                 break;
 
         case SERVICE_FINAL_SIGKILL:
-                log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->id);
-                service_enter_dead(s, SERVICE_FAILURE_TIMEOUT, true);
+                log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->meta.id);
+                service_enter_dead(s, false, true);
                 break;
 
         case SERVICE_AUTO_RESTART:
-                log_info("%s holdoff time over, scheduling restart.", u->id);
+                log_info("%s holdoff time over, scheduling restart.", u->meta.id);
                 service_enter_restart(s);
                 break;
 
@@ -3104,7 +2895,7 @@ static void service_cgroup_notify_event(Unit *u) {
 
         assert(u);
 
-        log_debug("%s: cgroup is empty", u->id);
+        log_debug("%s: cgroup is empty", u->meta.id);
 
         switch (s->state) {
 
@@ -3114,37 +2905,22 @@ static void service_cgroup_notify_event(Unit *u) {
                  * except when we don't know pid which to expect the
                  * SIGCHLD for. */
 
-        case SERVICE_START:
-        case SERVICE_START_POST:
-                /* If we were hoping for the daemon to write its PID file,
-                 * we can give up now. */
-                if (s->pid_file_pathspec) {
-                        log_warning("%s never wrote its PID file. Failing.", UNIT(s)->id);
-                        service_unwatch_pid_file(s);
-                        if (s->state == SERVICE_START)
-                                service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
-                        else
-                                service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
-                }
-                break;
-
         case SERVICE_RUNNING:
-                /* service_enter_running() will figure out what to do */
-                service_enter_running(s, SERVICE_SUCCESS);
+                service_enter_running(s, true);
                 break;
 
         case SERVICE_STOP_SIGTERM:
         case SERVICE_STOP_SIGKILL:
 
                 if (main_pid_good(s) <= 0 && !control_pid_good(s))
-                        service_enter_stop_post(s, SERVICE_SUCCESS);
+                        service_enter_stop_post(s, true);
 
                 break;
 
         case SERVICE_FINAL_SIGTERM:
         case SERVICE_FINAL_SIGKILL:
                 if (main_pid_good(s) <= 0 && !control_pid_good(s))
-                        service_enter_dead(s, SERVICE_SUCCESS, SERVICE_SUCCESS);
+                        service_enter_dead(s, true, true);
 
                 break;
 
@@ -3161,17 +2937,17 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
 
         if (s->notify_access == NOTIFY_NONE) {
                 log_warning("%s: Got notification message from PID %lu, but reception is disabled.",
-                            u->id, (unsigned long) pid);
+                            u->meta.id, (unsigned long) pid);
                 return;
         }
 
         if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) {
                 log_warning("%s: Got notification message from PID %lu, but reception only permitted for PID %lu",
-                            u->id, (unsigned long) pid, (unsigned long) s->main_pid);
+                            u->meta.id, (unsigned long) pid, (unsigned long) s->main_pid);
                 return;
         }
 
-        log_debug("%s: Got message", u->id);
+        log_debug("%s: Got message", u->meta.id);
 
         /* Interpret MAINPID= */
         if ((e = strv_find_prefix(tags, "MAINPID=")) &&
@@ -3183,7 +2959,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
                 if (parse_pid(e + 8, &pid) < 0)
                         log_warning("Failed to parse notification message %s", e);
                 else {
-                        log_debug("%s: got %s", u->id, e);
+                        log_debug("%s: got %s", u->meta.id, e);
                         service_set_main_pid(s, pid);
                 }
         }
@@ -3192,7 +2968,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
         if (s->type == SERVICE_NOTIFY &&
             s->state == SERVICE_START &&
             strv_find(tags, "READY=1")) {
-                log_debug("%s: got READY=1", u->id);
+                log_debug("%s: got READY=1", u->meta.id);
 
                 service_enter_start_post(s);
         }
@@ -3207,7 +2983,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
                                 return;
                         }
 
-                        log_debug("%s: got %s", u->id, e);
+                        log_debug("%s: got %s", u->meta.id, e);
 
                         free(s->status_text);
                         s->status_text = t;
@@ -3217,10 +2993,6 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
                 }
 
         }
-        if (strv_find(tags, "WATCHDOG=1")) {
-                log_debug("%s: got WATCHDOG=1", u->id);
-                service_reset_watchdog(s);
-        }
 
         /* Notify clients about changed status or main pid */
         unit_add_to_dbus_queue(u);
@@ -3262,7 +3034,7 @@ static void sysv_facility_in_insserv_conf(Manager *mgr) {
                         Unit *u;
                         if (sysv_translate_facility(parsed[0], NULL, &facility) < 0)
                                 continue;
-                        if ((u = manager_get_unit(mgr, facility)) && (u->type == UNIT_TARGET)) {
+                        if ((u = manager_get_unit(mgr, facility)) && (u->meta.type == UNIT_TARGET)) {
                                 UnitDependency e;
                                 char *dep = NULL, *name, **j;
 
@@ -3415,7 +3187,7 @@ static int service_enumerate(Manager *m) {
                 SET_FOREACH(service, runlevel_services[i], j) {
                         service = unit_follow_merge(service);
 
-                        if (service->fragment_path)
+                        if (service->meta.fragment_path)
                                 continue;
 
                         if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0)
@@ -3432,7 +3204,7 @@ static int service_enumerate(Manager *m) {
         SET_FOREACH(service, shutdown_services, j) {
                 service = unit_follow_merge(service);
 
-                if (service->fragment_path)
+                if (service->meta.fragment_path)
                         continue;
 
                 if ((r = unit_add_two_dependencies_by_name(service, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0)
@@ -3442,7 +3214,7 @@ static int service_enumerate(Manager *m) {
         r = 0;
 
 #ifdef TARGET_SUSE
-        sysv_facility_in_insserv_conf (m);
+       sysv_facility_in_insserv_conf (m);
 #endif
 
 finish:
@@ -3476,11 +3248,11 @@ static void service_bus_name_owner_change(
         assert(old_owner || new_owner);
 
         if (old_owner && new_owner)
-                log_debug("%s's D-Bus name %s changed owner from %s to %s", u->id, name, old_owner, new_owner);
+                log_debug("%s's D-Bus name %s changed owner from %s to %s", u->meta.id, name, old_owner, new_owner);
         else if (old_owner)
-                log_debug("%s's D-Bus name %s no longer registered by %s", u->id, name, old_owner);
+                log_debug("%s's D-Bus name %s no longer registered by %s", u->meta.id, name, old_owner);
         else
-                log_debug("%s's D-Bus name %s now registered by %s", u->id, name, new_owner);
+                log_debug("%s's D-Bus name %s now registered by %s", u->meta.id, name, new_owner);
 
         s->bus_name_good = !!new_owner;
 
@@ -3489,7 +3261,7 @@ static void service_bus_name_owner_change(
                 /* service_enter_running() will figure out what to
                  * do */
                 if (s->state == SERVICE_RUNNING)
-                        service_enter_running(s, SERVICE_SUCCESS);
+                        service_enter_running(s, true);
                 else if (s->state == SERVICE_START && new_owner)
                         service_enter_start_post(s);
 
@@ -3503,7 +3275,7 @@ static void service_bus_name_owner_change(
                 /* Try to acquire PID from bus service */
                 log_debug("Trying to acquire PID from D-Bus name...");
 
-                bus_query_pid(u->manager, name);
+                bus_query_pid(u->meta.manager, name);
         }
 }
 
@@ -3517,7 +3289,7 @@ static void service_bus_query_pid_done(
         assert(s);
         assert(name);
 
-        log_debug("%s's D-Bus name %s is now owned by process %u", u->id, name, (unsigned) pid);
+        log_debug("%s's D-Bus name %s is now owned by process %u", u->meta.id, name, (unsigned) pid);
 
         if (s->main_pid <= 0 &&
             (s->state == SERVICE_START ||
@@ -3528,7 +3300,6 @@ static void service_bus_query_pid_done(
 }
 
 int service_set_socket_fd(Service *s, int fd, Socket *sock) {
-
         assert(s);
         assert(fd >= 0);
 
@@ -3536,7 +3307,7 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) {
          * service for a stream socket and the socket needs to be
          * configured. */
 
-        if (UNIT(s)->load_state != UNIT_LOADED)
+        if (s->meta.load_state != UNIT_LOADED)
                 return -EINVAL;
 
         if (s->socket_fd >= 0)
@@ -3547,10 +3318,9 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) {
 
         s->socket_fd = fd;
         s->got_socket_fd = true;
+        s->accept_socket = sock;
 
-        unit_ref_set(&s->accept_socket, UNIT(sock));
-
-        return unit_add_two_dependencies(UNIT(sock), UNIT_BEFORE, UNIT_TRIGGERS, UNIT(s), false);
+        return 0;
 }
 
 static void service_reset_failed(Unit *u) {
@@ -3561,8 +3331,7 @@ static void service_reset_failed(Unit *u) {
         if (s->state == SERVICE_FAILED)
                 service_set_state(s, SERVICE_DEAD);
 
-        s->result = SERVICE_SUCCESS;
-        s->reload_result = SERVICE_SUCCESS;
+        s->failure = false;
 }
 
 static bool service_need_daemon_reload(Unit *u) {
@@ -3634,7 +3403,7 @@ static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusErro
                                 goto finish;
                         }
 
-                if ((q = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, signo, false, pid_set)) < 0)
+                if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
                                 r = q;
         }
@@ -3705,29 +3474,8 @@ static const char* const notify_access_table[_NOTIFY_ACCESS_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess);
 
-static const char* const service_result_table[_SERVICE_RESULT_MAX] = {
-        [SERVICE_SUCCESS] = "success",
-        [SERVICE_FAILURE_RESOURCES] = "resources",
-        [SERVICE_FAILURE_TIMEOUT] = "timeout",
-        [SERVICE_FAILURE_EXIT_CODE] = "exit-code",
-        [SERVICE_FAILURE_SIGNAL] = "signal",
-        [SERVICE_FAILURE_CORE_DUMP] = "core-dump",
-        [SERVICE_FAILURE_WATCHDOG] = "watchdog"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(service_result, ServiceResult);
-
-static const char* const start_limit_action_table[_SERVICE_START_LIMIT_MAX] = {
-        [SERVICE_START_LIMIT_NONE] = "none",
-        [SERVICE_START_LIMIT_REBOOT] = "reboot",
-        [SERVICE_START_LIMIT_REBOOT_FORCE] = "reboot-force",
-        [SERVICE_START_LIMIT_REBOOT_IMMEDIATE] = "reboot-immediate"
-};
-DEFINE_STRING_TABLE_LOOKUP(start_limit_action, StartLimitAction);
-
 const UnitVTable service_vtable = {
         .suffix = ".service",
-        .object_size = sizeof(Service),
         .sections =
                 "Unit\0"
                 "Service\0"
@@ -3761,7 +3509,6 @@ const UnitVTable service_vtable = {
 
         .sigchld_event = service_sigchld_event,
         .timer_event = service_timer_event,
-        .fd_event = service_fd_event,
 
         .reset_failed = service_reset_failed,
 
index 60b1051..e28f74b 100644 (file)
@@ -25,9 +25,7 @@
 typedef struct Service Service;
 
 #include "unit.h"
-#include "path.h"
 #include "ratelimit.h"
-#include "service.h"
 
 typedef enum ServiceState {
         SERVICE_DEAD,
@@ -88,29 +86,8 @@ typedef enum NotifyAccess {
         _NOTIFY_ACCESS_INVALID = -1
 } NotifyAccess;
 
-typedef enum ServiceResult {
-        SERVICE_SUCCESS,
-        SERVICE_FAILURE_RESOURCES,
-        SERVICE_FAILURE_TIMEOUT,
-        SERVICE_FAILURE_EXIT_CODE,
-        SERVICE_FAILURE_SIGNAL,
-        SERVICE_FAILURE_CORE_DUMP,
-        SERVICE_FAILURE_WATCHDOG,
-        _SERVICE_RESULT_MAX,
-        _SERVICE_RESULT_INVALID = -1
-} ServiceResult;
-
-typedef enum StartLimitAction {
-        SERVICE_START_LIMIT_NONE,
-        SERVICE_START_LIMIT_REBOOT,
-        SERVICE_START_LIMIT_REBOOT_FORCE,
-        SERVICE_START_LIMIT_REBOOT_IMMEDIATE,
-        _SERVICE_START_LIMIT_MAX,
-        _SERVICE_START_LIMIT_INVALID = -1
-} StartLimitAction;
-
 struct Service {
-        Unit meta;
+        Meta meta;
 
         ServiceType type;
         ServiceRestart restart;
@@ -121,10 +98,6 @@ struct Service {
         usec_t restart_usec;
         usec_t timeout_usec;
 
-        dual_timestamp watchdog_timestamp;
-        usec_t watchdog_usec;
-        Watch watchdog_watch;
-
         ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
@@ -155,8 +128,8 @@ struct Service {
         bool guess_main_pid;
 
         /* If we shut down, remember why */
-        ServiceResult result;
-        ServiceResult reload_result;
+        bool failure:1;
+        bool reload_failure:1;
 
         bool main_pid_known:1;
         bool main_pid_alien:1;
@@ -178,22 +151,18 @@ struct Service {
 
         char *status_text;
 
-        RateLimit start_limit;
-        StartLimitAction start_limit_action;
-
+        RateLimit ratelimit;
 
-        UnitRef accept_socket;
+        struct Socket *accept_socket;
+        Set *configured_sockets;
 
         Watch timer_watch;
-        PathSpec *pid_file_pathspec;
 
         NotifyAccess notify_access;
 };
 
 extern const UnitVTable service_vtable;
 
-struct Socket;
-
 int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
 
 const char* service_state_to_string(ServiceState i);
@@ -211,10 +180,4 @@ ServiceExecCommand service_exec_command_from_string(const char *s);
 const char* notify_access_to_string(NotifyAccess i);
 NotifyAccess notify_access_from_string(const char *s);
 
-const char* service_result_to_string(ServiceResult i);
-ServiceResult service_result_from_string(const char *s);
-
-const char* start_limit_action_to_string(StartLimitAction i);
-StartLimitAction start_limit_action_from_string(const char *s);
-
 #endif
index d157e0f..11213f9 100644 (file)
 #define FINALIZE_ATTEMPTS 50
 
 static bool ignore_proc(pid_t pid) {
-        char buf[PATH_MAX];
-        FILE *f;
-        char c;
-        size_t count;
-        uid_t uid;
-        int r;
-
-        /* We are PID 1, let's not commit suicide */
         if (pid == 1)
                 return true;
 
-        r = get_process_uid(pid, &uid);
-        if (r < 0)
-                return true; /* not really, but better safe than sorry */
+        /* TODO: add more ignore rules here: device-mapper, etc */
 
-        /* Non-root processes otherwise are always subject to be killed */
-        if (uid != 0)
-                return false;
+        return false;
+}
 
-        snprintf(buf, sizeof(buf), "/proc/%lu/cmdline", (unsigned long) pid);
-        char_array_0(buf);
+static bool is_kernel_thread(pid_t pid)
+{
+        char buf[PATH_MAX];
+        FILE *f;
+        char c;
+        size_t count;
 
+        snprintf(buf, sizeof(buf), "/proc/%lu/cmdline", (unsigned long)pid);
         f = fopen(buf, "re");
         if (!f)
                 return true; /* not really, but has the desired effect */
 
         count = fread(&c, 1, 1, f);
         fclose(f);
-
-        /* Kernel threads have an empty cmdline */
-        if (count <= 0)
-                return true;
-
-        /* Processes with argv[0][0] = '@' we ignore from the killing
-         * spree.
-         *
-         * http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons */
-        if (count == 1 && c == '@')
-                return true;
-
-        return false;
+        return count != 1;
 }
 
 static int killall(int sign) {
@@ -95,8 +77,7 @@ static int killall(int sign) {
         struct dirent *d;
         unsigned int n_processes = 0;
 
-        dir = opendir("/proc");
-        if (!dir)
+        if ((dir = opendir("/proc")) == NULL)
                 return -errno;
 
         while ((d = readdir(dir))) {
@@ -105,6 +86,9 @@ static int killall(int sign) {
                 if (parse_pid(d->d_name, &pid) < 0)
                         continue;
 
+                if (is_kernel_thread(pid))
+                        continue;
+
                 if (ignore_proc(pid))
                         continue;
 
index b4052d4..0ffa8b2 100644 (file)
 #include <unistd.h>
 #include <fcntl.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "shutdownd.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
+#include "sd-daemon.h"
 #include "utmp-wtmp.h"
 
 static int read_packet(int fd, struct shutdownd_command *_c) {
@@ -174,6 +173,7 @@ int main(int argc, char *argv[]) {
         };
 
         int r = EXIT_FAILURE, n_fds;
+        int one = 1;
         struct shutdownd_command c;
         struct pollfd pollfd[_FD_MAX];
         bool exec_shutdown = false, unlink_nologin = false, failed = false;
@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
@@ -205,6 +205,11 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
+        if (setsockopt(SD_LISTEN_FDS_START, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) {
+                log_error("SO_PASSCRED failed: %m");
+                return EXIT_FAILURE;
+        }
+
         zero(c);
         zero(pollfd);
 
index 82ec510..270dc4f 100644 (file)
@@ -36,10 +36,10 @@ static void snapshot_init(Unit *u) {
         Snapshot *s = SNAPSHOT(u);
 
         assert(s);
-        assert(UNIT(s)->load_state == UNIT_STUB);
+        assert(s->meta.load_state == UNIT_STUB);
 
-        UNIT(s)->ignore_on_isolate = true;
-        UNIT(s)->ignore_on_snapshot = true;
+        s->meta.ignore_on_isolate = true;
+        s->meta.ignore_on_snapshot = true;
 }
 
 static void snapshot_set_state(Snapshot *s, SnapshotState state) {
@@ -51,7 +51,7 @@ static void snapshot_set_state(Snapshot *s, SnapshotState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(s)->id,
+                          s->meta.id,
                           snapshot_state_to_string(old_state),
                           snapshot_state_to_string(state));
 
@@ -62,14 +62,14 @@ static int snapshot_load(Unit *u) {
         Snapshot *s = SNAPSHOT(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         /* Make sure that only snapshots created via snapshot_create()
          * can be loaded */
-        if (!s->by_snapshot_create && UNIT(s)->manager->n_reloading <= 0)
+        if (!s->by_snapshot_create && s->meta.manager->n_reloading <= 0)
                 return -ENOENT;
 
-        u->load_state = UNIT_LOADED;
+        u->meta.load_state = UNIT_LOADED;
         return 0;
 }
 
@@ -133,8 +133,8 @@ static int snapshot_serialize(Unit *u, FILE *f, FDSet *fds) {
 
         unit_serialize_item(u, f, "state", snapshot_state_to_string(s->state));
         unit_serialize_item(u, f, "cleanup", yes_no(s->cleanup));
-        SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
-                unit_serialize_item(u, f, "wants", other->id);
+        SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i)
+                unit_serialize_item(u, f, "wants", other->meta.id);
 
         return 0;
 }
@@ -234,14 +234,14 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, DBusError *e, Sn
 
         SNAPSHOT(u)->by_snapshot_create = true;
         manager_dispatch_load_queue(m);
-        assert(u->load_state == UNIT_LOADED);
+        assert(u->meta.load_state == UNIT_LOADED);
 
         HASHMAP_FOREACH_KEY(other, k, m->units, i) {
 
-                if (other->ignore_on_snapshot)
+                if (other->meta.ignore_on_snapshot)
                         continue;
 
-                if (k != other->id)
+                if (k != other->meta.id)
                         continue;
 
                 if (UNIT_VTABLE(other)->check_snapshot)
@@ -282,7 +282,6 @@ DEFINE_STRING_TABLE_LOOKUP(snapshot_state, SnapshotState);
 
 const UnitVTable snapshot_vtable = {
         .suffix = ".snapshot",
-        .object_size = sizeof(Snapshot),
 
         .no_alias = true,
         .no_instances = true,
index bf92e99..9a30520 100644 (file)
@@ -34,7 +34,7 @@ typedef enum SnapshotState {
 } SnapshotState;
 
 struct Snapshot {
-        Unit meta;
+        Meta meta;
 
         SnapshotState state, deserialized_state;
 
index 15a517b..7ddf326 100644 (file)
@@ -64,7 +64,7 @@ static void socket_init(Unit *u) {
         Socket *s = SOCKET(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         s->backlog = SOMAXCONN;
         s->timeout_usec = DEFAULT_TIMEOUT_USEC;
@@ -79,8 +79,8 @@ static void socket_init(Unit *u) {
         s->mark = -1;
 
         exec_context_init(&s->exec_context);
-        s->exec_context.std_output = u->manager->default_std_output;
-        s->exec_context.std_error = u->manager->default_std_error;
+        s->exec_context.std_output = u->meta.manager->default_std_output;
+        s->exec_context.std_error = u->meta.manager->default_std_error;
 
         s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
 }
@@ -98,6 +98,7 @@ static void socket_unwatch_control_pid(Socket *s) {
 static void socket_done(Unit *u) {
         Socket *s = SOCKET(u);
         SocketPort *p;
+        Meta *i;
 
         assert(s);
 
@@ -119,7 +120,7 @@ static void socket_done(Unit *u) {
 
         socket_unwatch_control_pid(s);
 
-        unit_ref_unset(&s->service);
+        s->service = NULL;
 
         free(s->tcp_congestion);
         s->tcp_congestion = NULL;
@@ -128,6 +129,16 @@ static void socket_done(Unit *u) {
         s->bind_to_device = NULL;
 
         unit_unwatch_timer(u, &s->timer_watch);
+
+        /* Make sure no service instance refers to us anymore. */
+        LIST_FOREACH(units_by_type, i, u->meta.manager->units_by_type[UNIT_SERVICE]) {
+                Service *service = (Service *) i;
+
+                if (service->accept_socket == s)
+                        service->accept_socket = NULL;
+
+                set_remove(service->configured_sockets, s);
+        }
 }
 
 static int socket_instantiate_service(Socket *s) {
@@ -142,12 +153,12 @@ static int socket_instantiate_service(Socket *s) {
          * here. For Accept=no this is mostly a NOP since the service
          * is figured out at load time anyway. */
 
-        if (UNIT_DEREF(s->service))
+        if (s->service)
                 return 0;
 
         assert(s->accept);
 
-        if (!(prefix = unit_name_to_prefix(UNIT(s)->id)))
+        if (!(prefix = unit_name_to_prefix(s->meta.id)))
                 return -ENOMEM;
 
         r = asprintf(&name, "%s@%u.service", prefix, s->n_accepted);
@@ -156,7 +167,7 @@ static int socket_instantiate_service(Socket *s) {
         if (r < 0)
                 return -ENOMEM;
 
-        r = manager_load_unit(UNIT(s)->manager, name, NULL, NULL, &u);
+        r = manager_load_unit(s->meta.manager, name, NULL, NULL, &u);
         free(name);
 
         if (r < 0)
@@ -169,10 +180,9 @@ static int socket_instantiate_service(Socket *s) {
         }
 #endif
 
-        u->no_gc = true;
-        unit_ref_set(&s->service, u);
-
-        return unit_add_two_dependencies(UNIT(s), UNIT_BEFORE, UNIT_TRIGGERS, u, false);
+        u->meta.no_gc = true;
+        s->service = SERVICE(u);
+        return 0;
 }
 
 static bool have_non_accept_socket(Socket *s) {
@@ -198,31 +208,31 @@ static bool have_non_accept_socket(Socket *s) {
 static int socket_verify(Socket *s) {
         assert(s);
 
-        if (UNIT(s)->load_state != UNIT_LOADED)
+        if (s->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!s->ports) {
-                log_error("%s lacks Listen setting. Refusing.", UNIT(s)->id);
+                log_error("%s lacks Listen setting. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->accept && have_non_accept_socket(s)) {
-                log_error("%s configured for accepting sockets, but sockets are non-accepting. Refusing.", UNIT(s)->id);
+                log_error("%s configured for accepting sockets, but sockets are non-accepting. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->accept && s->max_connections <= 0) {
-                log_error("%s's MaxConnection setting too small. Refusing.", UNIT(s)->id);
+                log_error("%s's MaxConnection setting too small. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
-        if (s->accept && UNIT_DEREF(s->service)) {
-                log_error("Explicit service configuration for accepting sockets not supported on %s. Refusing.", UNIT(s)->id);
+        if (s->accept && s->service) {
+                log_error("Explicit service configuration for accepting sockets not supported on %s. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) {
-                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(s)->id);
+                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
@@ -254,8 +264,8 @@ int socket_add_one_mount_link(Socket *s, Mount *m) {
         assert(s);
         assert(m);
 
-        if (UNIT(s)->load_state != UNIT_LOADED ||
-            UNIT(m)->load_state != UNIT_LOADED)
+        if (s->meta.load_state != UNIT_LOADED ||
+            m->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!socket_needs_mount(s, m->where))
@@ -268,13 +278,13 @@ int socket_add_one_mount_link(Socket *s, Mount *m) {
 }
 
 static int socket_add_mount_links(Socket *s) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(s);
 
-        LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_MOUNT])
-                if ((r = socket_add_one_mount_link(s, MOUNT(other))) < 0)
+        LIST_FOREACH(units_by_type, other, s->meta.manager->units_by_type[UNIT_MOUNT])
+                if ((r = socket_add_one_mount_link(s, (Mount*) other)) < 0)
                         return r;
 
         return 0;
@@ -302,7 +312,7 @@ static int socket_add_default_dependencies(Socket *s) {
         int r;
         assert(s);
 
-        if (UNIT(s)->manager->running_as == MANAGER_SYSTEM) {
+        if (s->meta.manager->running_as == MANAGER_SYSTEM) {
                 if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
                         return r;
 
@@ -313,44 +323,26 @@ static int socket_add_default_dependencies(Socket *s) {
         return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
 }
 
-static bool socket_has_exec(Socket *s) {
-        unsigned i;
-        assert(s);
-
-        for (i = 0; i < _SOCKET_EXEC_COMMAND_MAX; i++)
-                if (s->exec_command[i])
-                        return true;
-
-        return false;
-}
-
 static int socket_load(Unit *u) {
         Socket *s = SOCKET(u);
         int r;
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         if ((r = unit_load_fragment_and_dropin(u)) < 0)
                 return r;
 
         /* This is a new unit? Then let's add in some extras */
-        if (u->load_state == UNIT_LOADED) {
+        if (u->meta.load_state == UNIT_LOADED) {
 
                 if (have_non_accept_socket(s)) {
 
-                        if (!UNIT_DEREF(s->service)) {
-                                Unit *x;
-
-                                r = unit_load_related_unit(u, ".service", &x);
-                                if (r < 0)
+                        if (!s->service)
+                                if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)) < 0)
                                         return r;
 
-                                unit_ref_set(&s->service, x);
-                        }
-
-                        r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(s->service), true);
-                        if (r < 0)
+                        if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service), true)) < 0)
                                 return r;
                 }
 
@@ -360,14 +352,13 @@ static int socket_load(Unit *u) {
                 if ((r = socket_add_device_link(s)) < 0)
                         return r;
 
-                if (socket_has_exec(s))
-                        if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
-                                return r;
+                if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
+                        return r;
 
                 if ((r = unit_add_default_cgroups(u)) < 0)
                         return r;
 
-                if (UNIT(s)->default_dependencies)
+                if (s->meta.default_dependencies)
                         if ((r = socket_add_default_dependencies(s)) < 0)
                                 return r;
         }
@@ -407,7 +398,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sSocket State: %s\n"
-                "%sResult: %s\n"
                 "%sBindIPv6Only: %s\n"
                 "%sBacklog: %u\n"
                 "%sSocketMode: %04o\n"
@@ -416,10 +406,8 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sFreeBind: %s\n"
                 "%sTransparent: %s\n"
                 "%sBroadcast: %s\n"
-                "%sPassCredentials: %s\n"
                 "%sTCPCongestion: %s\n",
                 prefix, socket_state_to_string(s->state),
-                prefix, socket_result_to_string(s->result),
                 prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only),
                 prefix, s->backlog,
                 prefix, s->socket_mode,
@@ -428,7 +416,6 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
                 prefix, yes_no(s->free_bind),
                 prefix, yes_no(s->transparent),
                 prefix, yes_no(s->broadcast),
-                prefix, yes_no(s->pass_cred),
                 prefix, strna(s->tcp_congestion));
 
         if (s->control_pid > 0)
@@ -670,31 +657,20 @@ static void socket_apply_socket_options(Socket *s, int fd) {
                         log_warning("SO_BROADCAST failed: %m");
         }
 
-        if (s->pass_cred) {
-                int one = 1;
-                if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0)
-                        log_warning("SO_PASSCRED failed: %m");
-        }
-
         if (s->priority >= 0)
                 if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &s->priority, sizeof(s->priority)) < 0)
                         log_warning("SO_PRIORITY failed: %m");
 
         if (s->receive_buffer > 0) {
                 int value = (int) s->receive_buffer;
-
-                /* We first try with SO_RCVBUFFORCE, in case we have the perms for that */
-
                 if (setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &value, sizeof(value)) < 0)
-                        if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value)) < 0)
-                                log_warning("SO_RCVBUF failed: %m");
+                        log_warning("SO_RCVBUFFORCE failed: %m");
         }
 
         if (s->send_buffer > 0) {
                 int value = (int) s->send_buffer;
                 if (setsockopt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &value, sizeof(value)) < 0)
-                        if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0)
-                                log_warning("SO_SNDBUF failed: %m");
+                        log_warning("SO_SNDBUFFORCE failed: %m");
         }
 
         if (s->mark >= 0)
@@ -916,9 +892,8 @@ static int socket_open_fds(Socket *s) {
                                 if ((r = socket_instantiate_service(s)) < 0)
                                         return r;
 
-                                if (UNIT_DEREF(s->service) &&
-                                    SERVICE(UNIT_DEREF(s->service))->exec_command[SERVICE_EXEC_START]) {
-                                        r = label_get_create_label_from_exe(SERVICE(UNIT_DEREF(s->service))->exec_command[SERVICE_EXEC_START]->path, &label);
+                                if (s->service && s->service->exec_command[SERVICE_EXEC_START]) {
+                                        r = label_get_create_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label);
 
                                         if (r < 0) {
                                                 if (r != -EPERM)
@@ -1056,7 +1031,7 @@ static void socket_set_state(Socket *s, SocketState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(s)->id,
+                          s->meta.id,
                           socket_state_to_string(old_state),
                           socket_state_to_string(state));
 
@@ -1131,13 +1106,13 @@ static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
                        argv,
                        &s->exec_context,
                        NULL, 0,
-                       UNIT(s)->manager->environment,
+                       s->meta.manager->environment,
                        true,
                        true,
                        true,
-                       UNIT(s)->manager->confirm_spawn,
-                       UNIT(s)->cgroup_bondings,
-                       UNIT(s)->cgroup_attributes,
+                       s->meta.manager->confirm_spawn,
+                       s->meta.cgroup_bondings,
+                       s->meta.cgroup_attributes,
                        &pid);
 
         strv_free(argv);
@@ -1158,23 +1133,23 @@ fail:
         return r;
 }
 
-static void socket_enter_dead(Socket *s, SocketResult f) {
+static void socket_enter_dead(Socket *s, bool success) {
         assert(s);
 
-        if (f != SOCKET_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
-        socket_set_state(s, s->result != SOCKET_SUCCESS ? SOCKET_FAILED : SOCKET_DEAD);
+        socket_set_state(s, s->failure ? SOCKET_FAILED : SOCKET_DEAD);
 }
 
-static void socket_enter_signal(Socket *s, SocketState state, SocketResult f);
+static void socket_enter_signal(Socket *s, SocketState state, bool success);
 
-static void socket_enter_stop_post(Socket *s, SocketResult f) {
+static void socket_enter_stop_post(Socket *s, bool success) {
         int r;
         assert(s);
 
-        if (f != SOCKET_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         socket_unwatch_control_pid(s);
 
@@ -1186,24 +1161,24 @@ static void socket_enter_stop_post(Socket *s, SocketResult f) {
 
                 socket_set_state(s, SOCKET_STOP_POST);
         } else
-                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, SOCKET_SUCCESS);
+                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->id, strerror(-r));
-        socket_enter_signal(s, SOCKET_FINAL_SIGTERM, SOCKET_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'stop-post' task: %s", s->meta.id, strerror(-r));
+        socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
 }
 
-static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
+static void socket_enter_signal(Socket *s, SocketState state, bool success) {
         int r;
         Set *pid_set = NULL;
         bool wait_for_exit = false;
 
         assert(s);
 
-        if (f != SOCKET_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         if (s->exec_context.kill_mode != KILL_NONE) {
                 int sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL;
@@ -1228,7 +1203,7 @@ static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
                                 if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0)
                                         goto fail;
 
-                        if ((r = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, sig, true, pid_set)) < 0) {
+                        if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig, true, pid_set)) < 0) {
                                 if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
                                         log_warning("Failed to kill control group: %s", strerror(-r));
                         } else if (r > 0)
@@ -1245,30 +1220,30 @@ static void socket_enter_signal(Socket *s, SocketState state, SocketResult f) {
 
                 socket_set_state(s, state);
         } else if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
-                socket_enter_stop_post(s, SOCKET_SUCCESS);
+                socket_enter_stop_post(s, true);
         else
-                socket_enter_dead(s, SOCKET_SUCCESS);
+                socket_enter_dead(s, true);
 
         return;
 
 fail:
-        log_warning("%s failed to kill processes: %s", UNIT(s)->id, strerror(-r));
+        log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r));
 
         if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
-                socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
+                socket_enter_stop_post(s, false);
         else
-                socket_enter_dead(s, SOCKET_FAILURE_RESOURCES);
+                socket_enter_dead(s, false);
 
         if (pid_set)
                 set_free(pid_set);
 }
 
-static void socket_enter_stop_pre(Socket *s, SocketResult f) {
+static void socket_enter_stop_pre(Socket *s, bool success) {
         int r;
         assert(s);
 
-        if (f != SOCKET_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         socket_unwatch_control_pid(s);
 
@@ -1280,22 +1255,21 @@ static void socket_enter_stop_pre(Socket *s, SocketResult f) {
 
                 socket_set_state(s, SOCKET_STOP_PRE);
         } else
-                socket_enter_stop_post(s, SOCKET_SUCCESS);
+                socket_enter_stop_post(s, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run 'stop-pre' task: %s", UNIT(s)->id, strerror(-r));
-        socket_enter_stop_post(s, SOCKET_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'stop-pre' task: %s", s->meta.id, strerror(-r));
+        socket_enter_stop_post(s, false);
 }
 
 static void socket_enter_listening(Socket *s) {
         int r;
         assert(s);
 
-        r = socket_watch_fds(s);
-        if (r < 0) {
-                log_warning("%s failed to watch sockets: %s", UNIT(s)->id, strerror(-r));
+        if ((r = socket_watch_fds(s)) < 0) {
+                log_warning("%s failed to watch sockets: %s", s->meta.id, strerror(-r));
                 goto fail;
         }
 
@@ -1303,16 +1277,15 @@ static void socket_enter_listening(Socket *s) {
         return;
 
 fail:
-        socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
+        socket_enter_stop_pre(s, false);
 }
 
 static void socket_enter_start_post(Socket *s) {
         int r;
         assert(s);
 
-        r = socket_open_fds(s);
-        if (r < 0) {
-                log_warning("%s failed to listen on sockets: %s", UNIT(s)->id, strerror(-r));
+        if ((r = socket_open_fds(s)) < 0) {
+                log_warning("%s failed to listen on sockets: %s", s->meta.id, strerror(-r));
                 goto fail;
         }
 
@@ -1321,9 +1294,8 @@ static void socket_enter_start_post(Socket *s) {
         s->control_command_id = SOCKET_EXEC_START_POST;
 
         if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST])) {
-                r = socket_spawn(s, s->control_command, &s->control_pid);
-                if (r < 0) {
-                        log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->id, strerror(-r));
+                if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0) {
+                        log_warning("%s failed to run 'start-post' task: %s", s->meta.id, strerror(-r));
                         goto fail;
                 }
 
@@ -1334,7 +1306,7 @@ static void socket_enter_start_post(Socket *s) {
         return;
 
 fail:
-        socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
+        socket_enter_stop_pre(s, false);
 }
 
 static void socket_enter_start_pre(Socket *s) {
@@ -1356,8 +1328,8 @@ static void socket_enter_start_pre(Socket *s) {
         return;
 
 fail:
-        log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->id, strerror(-r));
-        socket_enter_dead(s, SOCKET_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'start-pre' task: %s", s->meta.id, strerror(-r));
+        socket_enter_dead(s, false);
 }
 
 static void socket_enter_running(Socket *s, int cfd) {
@@ -1370,7 +1342,7 @@ static void socket_enter_running(Socket *s, int cfd) {
         /* We don't take connections anymore if we are supposed to
          * shut down anyway */
         if (unit_pending_inactive(UNIT(s))) {
-                log_debug("Suppressing connection request on %s since unit stop is scheduled.", UNIT(s)->id);
+                log_debug("Suppressing connection request on %s since unit stop is scheduled.", s->meta.id);
 
                 if (cfd >= 0)
                         close_nointr_nofail(cfd);
@@ -1378,10 +1350,9 @@ static void socket_enter_running(Socket *s, int cfd) {
                         /* Flush all sockets by closing and reopening them */
                         socket_close_fds(s);
 
-                        r = socket_watch_fds(s);
-                        if (r < 0) {
-                                log_warning("%s failed to watch sockets: %s", UNIT(s)->id, strerror(-r));
-                                socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
+                        if ((r = socket_watch_fds(s)) < 0) {
+                                log_warning("%s failed to watch sockets: %s", s->meta.id, strerror(-r));
+                                socket_enter_stop_pre(s, false);
                         }
                 }
 
@@ -1389,24 +1360,28 @@ static void socket_enter_running(Socket *s, int cfd) {
         }
 
         if (cfd < 0) {
-                Iterator i;
-                Unit *u;
                 bool pending = false;
+                Meta *i;
 
                 /* If there's already a start pending don't bother to
                  * do anything */
-                SET_FOREACH(u, UNIT(s)->dependencies[UNIT_TRIGGERS], i)
-                        if (unit_pending_active(u)) {
-                                pending = true;
-                                break;
-                        }
+                LIST_FOREACH(units_by_type, i, s->meta.manager->units_by_type[UNIT_SERVICE]) {
+                        Service *service = (Service *) i;
 
-                if (!pending) {
-                        r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT_DEREF(s->service), JOB_REPLACE, true, &error, NULL);
-                        if (r < 0)
-                                goto fail;
+                        if (!set_get(service->configured_sockets, s))
+                                continue;
+
+                        if (!unit_pending_active(UNIT(service)))
+                                continue;
+
+                        pending = true;
+                        break;
                 }
 
+                if (!pending)
+                        if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s->service), JOB_REPLACE, true, &error, NULL)) < 0)
+                                goto fail;
+
                 socket_set_state(s, SOCKET_RUNNING);
         } else {
                 char *prefix, *instance = NULL, *name;
@@ -1418,23 +1393,13 @@ static void socket_enter_running(Socket *s, int cfd) {
                         return;
                 }
 
-                r = socket_instantiate_service(s);
-                if (r < 0)
+                if ((r = socket_instantiate_service(s)) < 0)
                         goto fail;
 
-                r = instance_from_socket(cfd, s->n_accepted, &instance);
-                if (r < 0) {
-                        if (r != -ENOTCONN)
-                                goto fail;
-
-                        /* ENOTCONN is legitimate if TCP RST was received.
-                         * This connection is over, but the socket unit lives on. */
-                        close_nointr_nofail(cfd);
-                        return;
-                }
+                if ((r = instance_from_socket(cfd, s->n_accepted, &instance)) < 0)
+                        goto fail;
 
-                prefix = unit_name_to_prefix(UNIT(s)->id);
-                if (!prefix) {
+                if (!(prefix = unit_name_to_prefix(s->meta.id))) {
                         free(instance);
                         r = -ENOMEM;
                         goto fail;
@@ -1449,30 +1414,27 @@ static void socket_enter_running(Socket *s, int cfd) {
                         goto fail;
                 }
 
-                r = unit_add_name(UNIT_DEREF(s->service), name);
-                if (r < 0) {
+                if ((r = unit_add_name(UNIT(s->service), name)) < 0) {
                         free(name);
                         goto fail;
                 }
 
-                service = SERVICE(UNIT_DEREF(s->service));
-                unit_ref_unset(&s->service);
+                service = s->service;
+                s->service = NULL;
                 s->n_accepted ++;
 
-                UNIT(service)->no_gc = false;
+                service->meta.no_gc = false;
 
                 unit_choose_id(UNIT(service), name);
                 free(name);
 
-                r = service_set_socket_fd(service, cfd, s);
-                if (r < 0)
+                if ((r = service_set_socket_fd(service, cfd, s)) < 0)
                         goto fail;
 
                 cfd = -1;
                 s->n_connections ++;
 
-                r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT(service), JOB_REPLACE, true, &error, NULL);
-                if (r < 0)
+                if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(service), JOB_REPLACE, true, &error, NULL)) < 0)
                         goto fail;
 
                 /* Notify clients about changed counters */
@@ -1482,8 +1444,8 @@ static void socket_enter_running(Socket *s, int cfd) {
         return;
 
 fail:
-        log_warning("%s failed to queue socket startup job: %s", UNIT(s)->id, bus_error(&error, r));
-        socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
+        log_warning("%s failed to queue socket startup job: %s", s->meta.id, bus_error(&error, r));
+        socket_enter_stop_pre(s, false);
 
         if (cfd >= 0)
                 close_nointr_nofail(cfd);
@@ -1491,13 +1453,16 @@ fail:
         dbus_error_free(&error);
 }
 
-static void socket_run_next(Socket *s) {
+static void socket_run_next(Socket *s, bool success) {
         int r;
 
         assert(s);
         assert(s->control_command);
         assert(s->control_command->command_next);
 
+        if (!success)
+                s->failure = true;
+
         socket_unwatch_control_pid(s);
 
         s->control_command = s->control_command->command_next;
@@ -1508,14 +1473,14 @@ static void socket_run_next(Socket *s) {
         return;
 
 fail:
-        log_warning("%s failed to run next task: %s", UNIT(s)->id, strerror(-r));
+        log_warning("%s failed to run next task: %s", s->meta.id, strerror(-r));
 
         if (s->state == SOCKET_START_POST)
-                socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
+                socket_enter_stop_pre(s, false);
         else if (s->state == SOCKET_STOP_POST)
-                socket_enter_dead(s, SOCKET_FAILURE_RESOURCES);
+                socket_enter_dead(s, false);
         else
-                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, SOCKET_FAILURE_RESOURCES);
+                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
 }
 
 static int socket_start(Unit *u) {
@@ -1538,27 +1503,23 @@ static int socket_start(Unit *u) {
                 return 0;
 
         /* Cannot run this without the service being around */
-        if (UNIT_DEREF(s->service)) {
-                Service *service;
-
-                service = SERVICE(UNIT_DEREF(s->service));
-
-                if (UNIT(service)->load_state != UNIT_LOADED) {
-                        log_error("Socket service %s not loaded, refusing.", UNIT(service)->id);
+        if (s->service) {
+                if (s->service->meta.load_state != UNIT_LOADED) {
+                        log_error("Socket service %s not loaded, refusing.", s->service->meta.id);
                         return -ENOENT;
                 }
 
                 /* If the service is already active we cannot start the
                  * socket */
-                if (service->state != SERVICE_DEAD &&
-                    service->state != SERVICE_FAILED &&
-                    service->state != SERVICE_AUTO_RESTART) {
-                        log_error("Socket service %s already active, refusing.", UNIT(service)->id);
+                if (s->service->state != SERVICE_DEAD &&
+                    s->service->state != SERVICE_FAILED &&
+                    s->service->state != SERVICE_AUTO_RESTART) {
+                        log_error("Socket service %s already active, refusing.", s->service->meta.id);
                         return -EBUSY;
                 }
 
 #ifdef HAVE_SYSV_COMPAT
-                if (service->sysv_path) {
+                if (s->service->sysv_path) {
                         log_error("Using SysV services for socket activation is not supported. Refusing.");
                         return -ENOENT;
                 }
@@ -1567,7 +1528,7 @@ static int socket_start(Unit *u) {
 
         assert(s->state == SOCKET_DEAD || s->state == SOCKET_FAILED);
 
-        s->result = SOCKET_SUCCESS;
+        s->failure = false;
         socket_enter_start_pre(s);
         return 0;
 }
@@ -1590,13 +1551,13 @@ static int socket_stop(Unit *u) {
          * kill mode. */
         if (s->state == SOCKET_START_PRE ||
             s->state == SOCKET_START_POST) {
-                socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, SOCKET_SUCCESS);
+                socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, true);
                 return -EAGAIN;
         }
 
         assert(s->state == SOCKET_LISTENING || s->state == SOCKET_RUNNING);
 
-        socket_enter_stop_pre(s, SOCKET_SUCCESS);
+        socket_enter_stop_pre(s, true);
         return 0;
 }
 
@@ -1610,7 +1571,7 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", socket_state_to_string(s->state));
-        unit_serialize_item(u, f, "result", socket_result_to_string(s->result));
+        unit_serialize_item(u, f, "failure", yes_no(s->failure));
         unit_serialize_item_format(u, f, "n-accepted", "%u", s->n_accepted);
 
         if (s->control_pid > 0)
@@ -1665,14 +1626,13 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value,
                         log_debug("Failed to parse state value %s", value);
                 else
                         s->deserialized_state = state;
-        } else if (streq(key, "result")) {
-                SocketResult f;
+        } else if (streq(key, "failure")) {
+                int b;
 
-                f = socket_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != SOCKET_SUCCESS)
-                        s->result = f;
+                if ((b = parse_boolean(value)) < 0)
+                        log_debug("Failed to parse failure value %s", value);
+                else
+                        s->failure = b || s->failure;
 
         } else if (streq(key, "n-accepted")) {
                 unsigned k;
@@ -1811,14 +1771,14 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         if (s->state != SOCKET_LISTENING)
                 return;
 
-        log_debug("Incoming traffic on %s", u->id);
+        log_debug("Incoming traffic on %s", u->meta.id);
 
         if (events != EPOLLIN) {
 
                 if (events & EPOLLHUP)
-                        log_error("%s: Got POLLHUP on a listening socket. The service probably invoked shutdown() on it, and should better not do that.", u->id);
+                        log_error("%s: Got POLLHUP on a listening socket. The service probably invoked shutdown() on it, and should better not do that.", u->meta.id);
                 else
-                        log_error("%s: Got unexpected poll event (0x%x) on socket.", u->id, events);
+                        log_error("%s: Got unexpected poll event (0x%x) on socket.", u->meta.id, events);
 
                 goto fail;
         }
@@ -1845,12 +1805,12 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
         return;
 
 fail:
-        socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
+        socket_enter_stop_pre(s, false);
 }
 
 static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         Socket *s = SOCKET(u);
-        SocketResult f;
+        bool success;
 
         assert(s);
         assert(pid >= 0);
@@ -1860,36 +1820,22 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
         s->control_pid = 0;
 
-        if (is_clean_exit(code, status))
-                f = SOCKET_SUCCESS;
-        else if (code == CLD_EXITED)
-                f = SOCKET_FAILURE_EXIT_CODE;
-        else if (code == CLD_KILLED)
-                f = SOCKET_FAILURE_SIGNAL;
-        else if (code == CLD_DUMPED)
-                f = SOCKET_FAILURE_CORE_DUMP;
-        else
-                assert_not_reached("Unknown code");
+        success = is_clean_exit(code, status);
 
         if (s->control_command) {
                 exec_status_exit(&s->control_command->exec_status, &s->exec_context, pid, code, status);
 
                 if (s->control_command->ignore)
-                        f = SOCKET_SUCCESS;
+                        success = true;
         }
 
-        log_full(f == SOCKET_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
-                 "%s control process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status);
+        log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                 "%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+        s->failure = s->failure || !success;
 
-        if (f != SOCKET_SUCCESS)
-                s->result = f;
-
-        if (s->control_command &&
-            s->control_command->command_next &&
-            f == SOCKET_SUCCESS) {
-
-                log_debug("%s running next command for state %s", u->id, socket_state_to_string(s->state));
-                socket_run_next(s);
+        if (s->control_command && s->control_command->command_next && success) {
+                log_debug("%s running next command for state %s", u->meta.id, socket_state_to_string(s->state));
+                socket_run_next(s, success);
         } else {
                 s->control_command = NULL;
                 s->control_command_id = _SOCKET_EXEC_COMMAND_INVALID;
@@ -1897,34 +1843,34 @@ static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                 /* No further commands for this step, so let's figure
                  * out what to do next */
 
-                log_debug("%s got final SIGCHLD for state %s", u->id, socket_state_to_string(s->state));
+                log_debug("%s got final SIGCHLD for state %s", u->meta.id, socket_state_to_string(s->state));
 
                 switch (s->state) {
 
                 case SOCKET_START_PRE:
-                        if (f == SOCKET_SUCCESS)
+                        if (success)
                                 socket_enter_start_post(s);
                         else
-                                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, f);
+                                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
                         break;
 
                 case SOCKET_START_POST:
-                        if (f == SOCKET_SUCCESS)
+                        if (success)
                                 socket_enter_listening(s);
                         else
-                                socket_enter_stop_pre(s, f);
+                                socket_enter_stop_pre(s, false);
                         break;
 
                 case SOCKET_STOP_PRE:
                 case SOCKET_STOP_PRE_SIGTERM:
                 case SOCKET_STOP_PRE_SIGKILL:
-                        socket_enter_stop_post(s, f);
+                        socket_enter_stop_post(s, success);
                         break;
 
                 case SOCKET_STOP_POST:
                 case SOCKET_FINAL_SIGTERM:
                 case SOCKET_FINAL_SIGKILL:
-                        socket_enter_dead(s, f);
+                        socket_enter_dead(s, success);
                         break;
 
                 default:
@@ -1946,53 +1892,53 @@ static void socket_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
         switch (s->state) {
 
         case SOCKET_START_PRE:
-                log_warning("%s starting timed out. Terminating.", u->id);
-                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, SOCKET_FAILURE_TIMEOUT);
+                log_warning("%s starting timed out. Terminating.", u->meta.id);
+                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
                 break;
 
         case SOCKET_START_POST:
-                log_warning("%s starting timed out. Stopping.", u->id);
-                socket_enter_stop_pre(s, SOCKET_FAILURE_TIMEOUT);
+                log_warning("%s starting timed out. Stopping.", u->meta.id);
+                socket_enter_stop_pre(s, false);
                 break;
 
         case SOCKET_STOP_PRE:
-                log_warning("%s stopping timed out. Terminating.", u->id);
-                socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, SOCKET_FAILURE_TIMEOUT);
+                log_warning("%s stopping timed out. Terminating.", u->meta.id);
+                socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, false);
                 break;
 
         case SOCKET_STOP_PRE_SIGTERM:
                 if (s->exec_context.send_sigkill) {
-                        log_warning("%s stopping timed out. Killing.", u->id);
-                        socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, SOCKET_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out. Killing.", u->meta.id);
+                        socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, false);
                 } else {
-                        log_warning("%s stopping timed out. Skipping SIGKILL. Ignoring.", u->id);
-                        socket_enter_stop_post(s, SOCKET_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out. Skipping SIGKILL. Ignoring.", u->meta.id);
+                        socket_enter_stop_post(s, false);
                 }
                 break;
 
         case SOCKET_STOP_PRE_SIGKILL:
-                log_warning("%s still around after SIGKILL. Ignoring.", u->id);
-                socket_enter_stop_post(s, SOCKET_FAILURE_TIMEOUT);
+                log_warning("%s still around after SIGKILL. Ignoring.", u->meta.id);
+                socket_enter_stop_post(s, false);
                 break;
 
         case SOCKET_STOP_POST:
-                log_warning("%s stopping timed out (2). Terminating.", u->id);
-                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, SOCKET_FAILURE_TIMEOUT);
+                log_warning("%s stopping timed out (2). Terminating.", u->meta.id);
+                socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
                 break;
 
         case SOCKET_FINAL_SIGTERM:
                 if (s->exec_context.send_sigkill) {
-                        log_warning("%s stopping timed out (2). Killing.", u->id);
-                        socket_enter_signal(s, SOCKET_FINAL_SIGKILL, SOCKET_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out (2). Killing.", u->meta.id);
+                        socket_enter_signal(s, SOCKET_FINAL_SIGKILL, false);
                 } else {
-                        log_warning("%s stopping timed out (2). Skipping SIGKILL. Ignoring.", u->id);
-                        socket_enter_dead(s, SOCKET_FAILURE_TIMEOUT);
+                        log_warning("%s stopping timed out (2). Skipping SIGKILL. Ignoring.", u->meta.id);
+                        socket_enter_dead(s, false);
                 }
                 break;
 
         case SOCKET_FINAL_SIGKILL:
-                log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->id);
-                socket_enter_dead(s, SOCKET_FAILURE_TIMEOUT);
+                log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->meta.id);
+                socket_enter_dead(s, false);
                 break;
 
         default:
@@ -2047,7 +1993,7 @@ void socket_notify_service_dead(Socket *s) {
          * services. */
 
         if (s->state == SOCKET_RUNNING) {
-                log_debug("%s got notified about service death.", UNIT(s)->id);
+                log_debug("%s got notified about service death.", s->meta.id);
                 socket_enter_listening(s);
         }
 }
@@ -2063,7 +2009,7 @@ void socket_connection_unref(Socket *s) {
         assert(s->n_connections > 0);
         s->n_connections--;
 
-        log_debug("%s: One connection closed, %u left.", UNIT(s)->id, s->n_connections);
+        log_debug("%s: One connection closed, %u left.", s->meta.id, s->n_connections);
 }
 
 static void socket_reset_failed(Unit *u) {
@@ -2074,7 +2020,7 @@ static void socket_reset_failed(Unit *u) {
         if (s->state == SOCKET_FAILED)
                 socket_set_state(s, SOCKET_DEAD);
 
-        s->result = SOCKET_SUCCESS;
+        s->failure = false;
 }
 
 static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
@@ -2112,7 +2058,7 @@ static int socket_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
                                 goto finish;
                         }
 
-                if ((q = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, signo, false, pid_set)) < 0)
+                if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
                                 r = q;
         }
@@ -2150,20 +2096,8 @@ static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(socket_exec_command, SocketExecCommand);
 
-static const char* const socket_result_table[_SOCKET_RESULT_MAX] = {
-        [SOCKET_SUCCESS] = "success",
-        [SOCKET_FAILURE_RESOURCES] = "resources",
-        [SOCKET_FAILURE_TIMEOUT] = "timeout",
-        [SOCKET_FAILURE_EXIT_CODE] = "exit-code",
-        [SOCKET_FAILURE_SIGNAL] = "signal",
-        [SOCKET_FAILURE_CORE_DUMP] = "core-dump"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);
-
 const UnitVTable socket_vtable = {
         .suffix = ".socket",
-        .object_size = sizeof(Socket),
         .sections =
                 "Unit\0"
                 "Socket\0"
index d242796..fd13ac4 100644 (file)
@@ -28,7 +28,6 @@ typedef struct Socket Socket;
 #include "unit.h"
 #include "socket-util.h"
 #include "mount.h"
-#include "service.h"
 
 typedef enum SocketState {
         SOCKET_DEAD,
@@ -65,17 +64,6 @@ typedef enum SocketType {
         _SOCKET_FIFO_INVALID = -1
 } SocketType;
 
-typedef enum SocketResult {
-        SOCKET_SUCCESS,
-        SOCKET_FAILURE_RESOURCES,
-        SOCKET_FAILURE_TIMEOUT,
-        SOCKET_FAILURE_EXIT_CODE,
-        SOCKET_FAILURE_SIGNAL,
-        SOCKET_FAILURE_CORE_DUMP,
-        _SOCKET_RESULT_MAX,
-        _SOCKET_RESULT_INVALID = -1
-} SocketResult;
-
 typedef struct SocketPort {
         SocketType type;
         int fd;
@@ -88,7 +76,7 @@ typedef struct SocketPort {
 } SocketPort;
 
 struct Socket {
-        Unit meta;
+        Meta meta;
 
         LIST_HEAD(SocketPort, ports);
 
@@ -105,7 +93,7 @@ struct Socket {
         /* For Accept=no sockets refers to the one service we'll
         activate. For Accept=yes sockets is either NULL, or filled
         when the next service we spawn. */
-        UnitRef service;
+        Service *service;
 
         SocketState state, deserialized_state;
 
@@ -115,10 +103,13 @@ struct Socket {
         SocketExecCommand control_command_id;
         pid_t control_pid;
 
+        /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
+        SocketAddressBindIPv6Only bind_ipv6_only;
+
         mode_t directory_mode;
         mode_t socket_mode;
 
-        SocketResult result;
+        bool failure;
 
         bool accept;
 
@@ -127,7 +118,6 @@ struct Socket {
         bool free_bind;
         bool transparent;
         bool broadcast;
-        bool pass_cred;
         int priority;
         int mark;
         size_t receive_buffer;
@@ -139,9 +129,6 @@ struct Socket {
         char *tcp_congestion;
         long mq_maxmsg;
         long mq_msgsize;
-
-        /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */
-        SocketAddressBindIPv6Only bind_ipv6_only;
 };
 
 /* Called from the service code when collecting fds */
@@ -165,7 +152,4 @@ SocketState socket_state_from_string(const char *s);
 const char* socket_exec_command_to_string(SocketExecCommand i);
 SocketExecCommand socket_exec_command_from_string(const char *s);
 
-const char* socket_result_to_string(SocketResult i);
-SocketResult socket_result_from_string(const char *s);
-
 #endif
index 8185eaf..3fe34c9 100644 (file)
@@ -70,8 +70,8 @@
 /* Services systemd relies on */
 #define SPECIAL_DBUS_SERVICE "dbus.service"
 #define SPECIAL_DBUS_SOCKET "dbus.socket"
-#define SPECIAL_JOURNALD_SOCKET "systemd-journald.socket"
-#define SPECIAL_JOURNALD_SERVICE "systemd-journald.service"
+#define SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET "systemd-stdout-syslog-bridge.socket"
+#define SPECIAL_SYSLOG_SOCKET "syslog.socket"
 
 /* Magic init signals */
 #define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
diff --git a/src/stdout-syslog-bridge.c b/src/stdout-syslog-bridge.c
new file mode 100644 (file)
index 0000000..721817f
--- /dev/null
@@ -0,0 +1,710 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <assert.h>
+#include <time.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/poll.h>
+#include <sys/epoll.h>
+#include <sys/un.h>
+#include <fcntl.h>
+
+#include "util.h"
+#include "log.h"
+#include "list.h"
+#include "sd-daemon.h"
+#include "tcpwrap.h"
+#include "def.h"
+
+#define STREAMS_MAX 4096
+#define SERVER_FD_MAX 16
+#define TIMEOUT_MSEC ((int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC))
+
+typedef struct Stream Stream;
+
+typedef struct Server {
+        int syslog_fd;
+        int kmsg_fd;
+        int epoll_fd;
+
+        unsigned n_server_fd;
+
+        bool syslog_is_stream;
+
+        LIST_HEAD(Stream, streams);
+        unsigned n_streams;
+} Server;
+
+typedef enum StreamTarget {
+        STREAM_SYSLOG,
+        STREAM_KMSG
+} StreamTarget;
+
+typedef enum StreamState {
+        STREAM_TARGET,
+        STREAM_PRIORITY,
+        STREAM_PROCESS,
+        STREAM_PREFIX,
+        STREAM_RUNNING
+} StreamState;
+
+struct Stream {
+        Server *server;
+
+        StreamState state;
+
+        int fd;
+
+        StreamTarget target;
+        int priority;
+        char *process;
+        pid_t pid;
+        uid_t uid;
+        gid_t gid;
+
+        bool prefix:1;
+        bool tee_console:1;
+
+        char buffer[LINE_MAX+1];
+        size_t length;
+
+        LIST_FIELDS(Stream, stream);
+};
+
+static int stream_log(Stream *s, char *p, usec_t ts) {
+
+        char header_priority[16], header_time[64], header_pid[16];
+        struct iovec iovec[5];
+        int priority;
+
+        assert(s);
+        assert(p);
+
+        priority = s->priority;
+
+        if (s->prefix)
+                parse_syslog_priority(&p, &priority);
+
+        if (*p == 0)
+                return 0;
+
+        /* Patch in configured facility if necessary */
+        if ((priority & LOG_FACMASK) == 0)
+                priority = (s->priority & LOG_FACMASK) | priority;
+
+        /*
+         * The format glibc uses to talk to the syslog daemon is:
+         *
+         *     <priority>time process[pid]: msg
+         *
+         * The format the kernel uses is:
+         *
+         *     <priority>msg\n
+         *
+         *  We extend the latter to include the process name and pid.
+         */
+
+        snprintf(header_priority, sizeof(header_priority), "<%i>", priority);
+        char_array_0(header_priority);
+
+        if (s->target == STREAM_SYSLOG) {
+                time_t t;
+                struct tm *tm;
+
+                t = (time_t) (ts / USEC_PER_SEC);
+                if (!(tm = localtime(&t)))
+                        return -EINVAL;
+
+                if (strftime(header_time, sizeof(header_time), "%h %e %T ", tm) <= 0)
+                        return -EINVAL;
+        }
+
+        snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) s->pid);
+        char_array_0(header_pid);
+
+        zero(iovec);
+        IOVEC_SET_STRING(iovec[0], header_priority);
+
+        if (s->target == STREAM_SYSLOG) {
+                struct msghdr msghdr;
+                union {
+                        struct cmsghdr cmsghdr;
+                        uint8_t buf[CMSG_SPACE(sizeof(struct ucred))];
+                } control;
+                struct ucred *ucred;
+
+                zero(control);
+                control.cmsghdr.cmsg_level = SOL_SOCKET;
+                control.cmsghdr.cmsg_type = SCM_CREDENTIALS;
+                control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred));
+
+                ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr);
+                ucred->pid = s->pid;
+                ucred->uid = s->uid;
+                ucred->gid = s->gid;
+
+                IOVEC_SET_STRING(iovec[1], header_time);
+                IOVEC_SET_STRING(iovec[2], s->process);
+                IOVEC_SET_STRING(iovec[3], header_pid);
+                IOVEC_SET_STRING(iovec[4], p);
+
+                /* When using syslog via SOCK_STREAM separate the messages by NUL chars */
+                if (s->server->syslog_is_stream)
+                        iovec[4].iov_len++;
+
+                zero(msghdr);
+                msghdr.msg_iov = iovec;
+                msghdr.msg_iovlen = ELEMENTSOF(iovec);
+                msghdr.msg_control = &control;
+                msghdr.msg_controllen = control.cmsghdr.cmsg_len;
+
+                for (;;) {
+                        ssize_t n;
+
+                        if ((n = sendmsg(s->server->syslog_fd, &msghdr, MSG_NOSIGNAL)) < 0) {
+
+                                if (errno == ESRCH) {
+                                        pid_t our_pid;
+
+                                        /* Hmm, maybe the process this
+                                         * line originates from is
+                                         * dead? Then let's patch in
+                                         * our own pid and retry,
+                                         * since we have nothing
+                                         * better */
+
+                                        our_pid = getpid();
+
+                                        if (ucred->pid != our_pid) {
+                                                ucred->pid = our_pid;
+                                                continue;
+                                        }
+                                }
+
+                                return -errno;
+                        }
+
+                        if (!s->server->syslog_is_stream ||
+                            (size_t) n >= IOVEC_TOTAL_SIZE(iovec, ELEMENTSOF(iovec)))
+                                break;
+
+                        IOVEC_INCREMENT(iovec, ELEMENTSOF(iovec), n);
+                }
+
+        } else if (s->target == STREAM_KMSG) {
+                IOVEC_SET_STRING(iovec[1], s->process);
+                IOVEC_SET_STRING(iovec[2], header_pid);
+                IOVEC_SET_STRING(iovec[3], p);
+                IOVEC_SET_STRING(iovec[4], (char*) "\n");
+
+                if (writev(s->server->kmsg_fd, iovec, ELEMENTSOF(iovec)) < 0)
+                        return -errno;
+        } else
+                assert_not_reached("Unknown log target");
+
+        if (s->tee_console) {
+                int console;
+
+                if ((console = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC)) >= 0) {
+                        IOVEC_SET_STRING(iovec[0], s->process);
+                        IOVEC_SET_STRING(iovec[1], header_pid);
+                        IOVEC_SET_STRING(iovec[2], p);
+                        IOVEC_SET_STRING(iovec[3], (char*) "\n");
+
+                        writev(console, iovec, 4);
+                }
+
+        }
+
+        return 0;
+}
+
+static int stream_line(Stream *s, char *p, usec_t ts) {
+        int r;
+
+        assert(s);
+        assert(p);
+
+        p = strstrip(p);
+
+        switch (s->state) {
+
+        case STREAM_TARGET:
+                if (streq(p, "syslog") || streq(p, "syslog+console"))
+                        s->target = STREAM_SYSLOG;
+                else if (streq(p, "kmsg") || streq(p, "kmsg+console")) {
+
+                        if (s->server->kmsg_fd >= 0 && s->uid == 0)
+                                s->target = STREAM_KMSG;
+                        else {
+                                log_warning("/dev/kmsg logging not available.");
+                                return -EPERM;
+                        }
+                } else {
+                        log_warning("Failed to parse log target line.");
+                        return -EBADMSG;
+                }
+
+                if (endswith(p, "+console"))
+                        s->tee_console = true;
+
+                s->state = STREAM_PRIORITY;
+                return 0;
+
+        case STREAM_PRIORITY:
+                if ((r = safe_atoi(p, &s->priority)) < 0) {
+                        log_warning("Failed to parse log priority line: %m");
+                        return r;
+                }
+
+                if (s->priority < 0) {
+                        log_warning("Log priority negative: %m");
+                        return -ERANGE;
+                }
+
+                s->state = STREAM_PROCESS;
+                return 0;
+
+        case STREAM_PROCESS:
+                if (!(s->process = strdup(p)))
+                        return -ENOMEM;
+
+                s->state = STREAM_PREFIX;
+                return 0;
+
+        case STREAM_PREFIX:
+
+                if ((r = parse_boolean(p)) < 0)
+                        return r;
+
+                s->prefix = r;
+                s->state = STREAM_RUNNING;
+                return 0;
+
+        case STREAM_RUNNING:
+                return stream_log(s, p, ts);
+        }
+
+        assert_not_reached("Unknown stream state");
+}
+
+static int stream_scan(Stream *s, usec_t ts) {
+        char *p;
+        size_t remaining;
+        int r = 0;
+
+        assert(s);
+
+        p = s->buffer;
+        remaining = s->length;
+        for (;;) {
+                char *end;
+                size_t skip;
+
+                end = memchr(p, '\n', remaining);
+                if (!end) {
+                        if (remaining >= LINE_MAX) {
+                                end = p + LINE_MAX;
+                                skip = LINE_MAX;
+                        } else
+                                break;
+                } else
+                        skip = end - p + 1;
+
+                *end = 0;
+
+                r = stream_line(s, p, ts);
+                if (r >= 0) {
+                        remaining -= skip;
+                        p += skip;
+                }
+        }
+
+        if (p > s->buffer) {
+                memmove(s->buffer, p, remaining);
+                s->length = remaining;
+        }
+
+        return r;
+}
+
+static int stream_process(Stream *s, usec_t ts) {
+        ssize_t l;
+        int r;
+        assert(s);
+
+        l = read(s->fd, s->buffer+s->length, LINE_MAX-s->length);
+        if (l < 0) {
+
+                if (errno == EAGAIN)
+                        return 0;
+
+                log_warning("Failed to read from stream: %m");
+                return -errno;
+        }
+
+
+        if (l == 0)
+                return 0;
+
+        s->length += l;
+        r = stream_scan(s, ts);
+
+        if (r < 0)
+                return r;
+
+        return 1;
+}
+
+static void stream_free(Stream *s) {
+        assert(s);
+
+        if (s->server) {
+                assert(s->server->n_streams > 0);
+                s->server->n_streams--;
+                LIST_REMOVE(Stream, stream, s->server->streams, s);
+
+        }
+
+        if (s->fd >= 0) {
+                if (s->server)
+                        epoll_ctl(s->server->epoll_fd, EPOLL_CTL_DEL, s->fd, NULL);
+
+                close_nointr_nofail(s->fd);
+        }
+
+        free(s->process);
+        free(s);
+}
+
+static int stream_new(Server *s, int server_fd) {
+        Stream *stream;
+        int fd;
+        struct ucred ucred;
+        socklen_t len = sizeof(ucred);
+        struct epoll_event ev;
+        int r;
+
+        assert(s);
+
+        if ((fd = accept(server_fd, NULL, NULL)) < 0)
+                return -errno;
+
+        if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
+                return -errno;
+
+        if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
+                return -errno;
+
+        if (s->n_streams >= STREAMS_MAX) {
+                log_warning("Too many connections, refusing connection.");
+                close_nointr_nofail(fd);
+                return 0;
+        }
+
+        if (!socket_tcpwrap(fd, "systemd-stdout-syslog-bridge")) {
+                close_nointr_nofail(fd);
+                return 0;
+        }
+
+        if (!(stream = new0(Stream, 1))) {
+                close_nointr_nofail(fd);
+                return -ENOMEM;
+        }
+
+        stream->fd = fd;
+
+        if (getsockopt(stream->fd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) < 0) {
+                r = -errno;
+                goto fail;
+        }
+
+        if (shutdown(fd, SHUT_WR) < 0) {
+                r = -errno;
+                goto fail;
+        }
+
+        zero(ev);
+        ev.data.ptr = stream;
+        ev.events = EPOLLIN;
+        if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
+                r = -errno;
+                goto fail;
+        }
+
+        stream->pid = ucred.pid;
+        stream->uid = ucred.uid;
+        stream->gid = ucred.gid;
+
+        stream->server = s;
+        LIST_PREPEND(Stream, stream, s->streams, stream);
+        s->n_streams ++;
+
+        return 0;
+
+fail:
+        stream_free(stream);
+        return r;
+}
+
+static void server_done(Server *s) {
+        unsigned i;
+        assert(s);
+
+        while (s->streams)
+                stream_free(s->streams);
+
+        for (i = 0; i < s->n_server_fd; i++)
+                close_nointr_nofail(SD_LISTEN_FDS_START+i);
+
+        if (s->syslog_fd >= 0)
+                close_nointr_nofail(s->syslog_fd);
+
+        if (s->epoll_fd >= 0)
+                close_nointr_nofail(s->epoll_fd);
+
+        if (s->kmsg_fd >= 0)
+                close_nointr_nofail(s->kmsg_fd);
+}
+
+static int server_init(Server *s, unsigned n_sockets) {
+        int r;
+        unsigned i;
+        union {
+                struct sockaddr sa;
+                struct sockaddr_un un;
+        } sa;
+
+        assert(s);
+        assert(n_sockets > 0);
+
+        zero(*s);
+
+        s->n_server_fd = n_sockets;
+        s->syslog_fd = -1;
+        s->kmsg_fd = -1;
+
+        if ((s->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) {
+                r = -errno;
+                log_error("Failed to create epoll object: %m");
+                goto fail;
+        }
+
+        for (i = 0; i < n_sockets; i++) {
+                struct epoll_event ev;
+                int fd;
+
+                fd = SD_LISTEN_FDS_START+i;
+
+                if ((r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1)) < 0) {
+                        log_error("Failed to determine file descriptor type: %s", strerror(-r));
+                        goto fail;
+                }
+
+                if (!r) {
+                        log_error("Wrong file descriptor type.");
+                        r = -EINVAL;
+                        goto fail;
+                }
+
+                /* We use ev.data.ptr instead of ev.data.fd here,
+                 * since on 64bit archs fd is 32bit while a pointer is
+                 * 64bit. To make sure we can easily distinguish fd
+                 * values and pointer values we want to make sure to
+                 * write the full field unconditionally. */
+
+                zero(ev);
+                ev.events = EPOLLIN;
+                ev.data.ptr = INT_TO_PTR(fd);
+                if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
+                        r = -errno;
+                        log_error("Failed to add server fd to epoll object: %m");
+                        goto fail;
+                }
+        }
+
+        zero(sa);
+        sa.un.sun_family = AF_UNIX;
+        strncpy(sa.un.sun_path, "/dev/log", sizeof(sa.un.sun_path));
+
+        if ((s->syslog_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
+                r = -errno;
+                log_error("Failed to create log fd: %m");
+                goto fail;
+        }
+
+        if (connect(s->syslog_fd, &sa.sa, sizeof(sa)) < 0) {
+                close_nointr_nofail(s->syslog_fd);
+
+                if ((s->syslog_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0)) < 0) {
+                        r = -errno;
+                        log_error("Failed to create log fd: %m");
+                        goto fail;
+                }
+
+                if (connect(s->syslog_fd, &sa.sa, sizeof(sa)) < 0) {
+                        r = -errno;
+                        log_error("Failed to connect log socket to /dev/log: %m");
+                        goto fail;
+                }
+
+                s->syslog_is_stream = true;
+        } else
+                s->syslog_is_stream = false;
+
+        /* /dev/kmsg logging is strictly optional */
+        if ((s->kmsg_fd = open("/dev/kmsg", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0)
+                log_warning("Failed to open /dev/kmsg for logging, disabling kernel log buffer support: %m");
+
+        return 0;
+
+fail:
+        server_done(s);
+        return r;
+}
+
+static int process_event(Server *s, struct epoll_event *ev) {
+        int r;
+
+        assert(s);
+
+        /* Yes, this is a bit ugly, we assume that that valid pointers
+         * are > SD_LISTEN_FDS_START+SERVER_FD_MAX. Which is certainly
+         * true on Linux (and probably most other OSes, too, since the
+         * first 4k usually are part of a separate null pointer
+         * dereference page. */
+
+        if (PTR_TO_INT(ev->data.ptr) >= SD_LISTEN_FDS_START &&
+            PTR_TO_INT(ev->data.ptr) < SD_LISTEN_FDS_START+(int)s->n_server_fd) {
+
+                if (ev->events != EPOLLIN) {
+                        log_info("Got invalid event from epoll. (1)");
+                        return -EIO;
+                }
+
+                if ((r = stream_new(s, PTR_TO_INT(ev->data.ptr))) < 0) {
+                        log_info("Failed to accept new connection: %s", strerror(-r));
+                        return r;
+                }
+
+        } else {
+                usec_t ts;
+                Stream *stream = ev->data.ptr;
+
+                ts = now(CLOCK_REALTIME);
+
+                if (!(ev->events & EPOLLIN)) {
+                        log_info("Got invalid event from epoll. (2)");
+                        stream_free(stream);
+                        return 0;
+                }
+
+                if ((r = stream_process(stream, ts)) <= 0) {
+
+                        if (r < 0)
+                                log_info("Got error on stream: %s", strerror(-r));
+
+                        stream_free(stream);
+                        return 0;
+                }
+        }
+
+        return 0;
+}
+
+int main(int argc, char *argv[]) {
+        Server server;
+        int r = EXIT_FAILURE, n;
+
+        if (getppid() != 1) {
+                log_error("This program should be invoked by init only.");
+                return EXIT_FAILURE;
+        }
+
+        if (argc > 1) {
+                log_error("This program does not take arguments.");
+                return EXIT_FAILURE;
+        }
+
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
+        log_parse_environment();
+        log_open();
+
+        umask(0022);
+
+        if ((n = sd_listen_fds(true)) < 0) {
+                log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
+                return EXIT_FAILURE;
+        }
+
+        if (n <= 0 || n > SERVER_FD_MAX) {
+                log_error("No or too many file descriptors passed.");
+                return EXIT_FAILURE;
+        }
+
+        if (server_init(&server, (unsigned) n) < 0)
+                return EXIT_FAILURE;
+
+        log_debug("systemd-stdout-syslog-bridge running as pid %lu", (unsigned long) getpid());
+
+        sd_notify(false,
+                  "READY=1\n"
+                  "STATUS=Processing requests...");
+
+        for (;;) {
+                struct epoll_event event;
+                int k;
+
+                if ((k = epoll_wait(server.epoll_fd,
+                                    &event, 1,
+                                    server.n_streams <= 0 ? TIMEOUT_MSEC : -1)) < 0) {
+
+                        if (errno == EINTR)
+                                continue;
+
+                        log_error("epoll_wait() failed: %m");
+                        goto fail;
+                }
+
+                if (k <= 0)
+                        break;
+
+                if (process_event(&server, &event) < 0)
+                        goto fail;
+        }
+
+        r = EXIT_SUCCESS;
+
+        log_debug("systemd-stdout-syslog-bridge stopped as pid %lu", (unsigned long) getpid());
+
+fail:
+        sd_notify(false,
+                  "STATUS=Shutting down...");
+
+        server_done(&server);
+
+        return r;
+}
index 9c72732..54a8640 100644 (file)
@@ -62,37 +62,36 @@ static void swap_unset_proc_swaps(Swap *s) {
         /* Remove this unit from the chain of swaps which share the
          * same kernel swap device. */
 
-        first = hashmap_get(UNIT(s)->manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
+        first = hashmap_get(s->meta.manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
         LIST_REMOVE(Swap, same_proc_swaps, first, s);
 
         if (first)
-                hashmap_remove_and_replace(UNIT(s)->manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what, first->parameters_proc_swaps.what, first);
+                hashmap_remove_and_replace(s->meta.manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what, first->parameters_proc_swaps.what, first);
         else
-                hashmap_remove(UNIT(s)->manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
+                hashmap_remove(s->meta.manager->swaps_by_proc_swaps, s->parameters_proc_swaps.what);
 
         free(s->parameters_proc_swaps.what);
         s->parameters_proc_swaps.what = NULL;
 }
 
-static void swap_init(Unit *u) {
+ static void swap_init(Unit *u) {
         Swap *s = SWAP(u);
 
         assert(s);
-        assert(UNIT(s)->load_state == UNIT_STUB);
+        assert(s->meta.load_state == UNIT_STUB);
 
         s->timeout_usec = DEFAULT_TIMEOUT_USEC;
 
         exec_context_init(&s->exec_context);
-        s->exec_context.std_output = u->manager->default_std_output;
-        s->exec_context.std_error = u->manager->default_std_error;
+        s->exec_context.std_output = EXEC_OUTPUT_KMSG;
 
         s->parameters_etc_fstab.priority = s->parameters_proc_swaps.priority = s->parameters_fragment.priority = -1;
 
         s->timer_watch.type = WATCH_INVALID;
 
-        s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
+        s->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
 
-        UNIT(s)->ignore_on_isolate = true;
+        s->meta.ignore_on_isolate = true;
 }
 
 static void swap_unwatch_control_pid(Swap *s) {
@@ -134,8 +133,8 @@ int swap_add_one_mount_link(Swap *s, Mount *m) {
         assert(s);
         assert(m);
 
-        if (UNIT(s)->load_state != UNIT_LOADED ||
-            UNIT(m)->load_state != UNIT_LOADED)
+        if (s->meta.load_state != UNIT_LOADED ||
+            m->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (is_device_path(s->what))
@@ -151,13 +150,13 @@ int swap_add_one_mount_link(Swap *s, Mount *m) {
 }
 
 static int swap_add_mount_links(Swap *s) {
-        Unit *other;
+        Meta *other;
         int r;
 
         assert(s);
 
-        LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_MOUNT])
-                if ((r = swap_add_one_mount_link(s, MOUNT(other))) < 0)
+        LIST_FOREACH(units_by_type, other, s->meta.manager->units_by_type[UNIT_MOUNT])
+                if ((r = swap_add_one_mount_link(s, (Mount*) other)) < 0)
                         return r;
 
         return 0;
@@ -177,14 +176,14 @@ static int swap_add_target_links(Swap *s) {
         else
                 return 0;
 
-        if ((r = manager_load_unit(UNIT(s)->manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
+        if ((r = manager_load_unit(s->meta.manager, SPECIAL_SWAP_TARGET, NULL, NULL, &tu)) < 0)
                 return r;
 
         if (!p->noauto &&
             !p->nofail &&
-            (p->handle || UNIT(s)->manager->swap_auto) &&
+            (p->handle || s->meta.manager->swap_auto) &&
             s->from_etc_fstab &&
-            UNIT(s)->manager->running_as == MANAGER_SYSTEM)
+            s->meta.manager->running_as == MANAGER_SYSTEM)
                 if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0)
                         return r;
 
@@ -209,7 +208,7 @@ static int swap_add_device_links(Swap *s) {
         if (is_device_path(s->what))
                 return unit_add_node_link(UNIT(s), s->what,
                                           !p->noauto && p->nofail &&
-                                          UNIT(s)->manager->running_as == MANAGER_SYSTEM);
+                                          s->meta.manager->running_as == MANAGER_SYSTEM);
         else
                 /* File based swap devices need to be ordered after
                  * remount-rootfs.service, since they might need a
@@ -222,7 +221,7 @@ static int swap_add_default_dependencies(Swap *s) {
 
         assert(s);
 
-        if (UNIT(s)->manager->running_as == MANAGER_SYSTEM) {
+        if (s->meta.manager->running_as == MANAGER_SYSTEM) {
 
                 if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
                         return r;
@@ -235,7 +234,7 @@ static int swap_verify(Swap *s) {
         bool b;
         char *e;
 
-        if (UNIT(s)->load_state != UNIT_LOADED)
+        if (s->meta.load_state != UNIT_LOADED)
                   return 0;
 
         if (!(e = unit_name_from_path(s->what, ".swap")))
@@ -245,12 +244,12 @@ static int swap_verify(Swap *s) {
         free(e);
 
         if (!b) {
-                log_error("%s: Value of \"What\" and unit name do not match, not loading.\n", UNIT(s)->id);
+                log_error("%s: Value of \"What\" and unit name do not match, not loading.\n", s->meta.id);
                 return -EINVAL;
         }
 
         if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) {
-                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", UNIT(s)->id);
+                log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id);
                 return -EINVAL;
         }
 
@@ -262,17 +261,17 @@ static int swap_load(Unit *u) {
         Swap *s = SWAP(u);
 
         assert(s);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         /* Load a .swap file */
         if ((r = unit_load_fragment_and_dropin_optional(u)) < 0)
                 return r;
 
-        if (u->load_state == UNIT_LOADED) {
+        if (u->meta.load_state == UNIT_LOADED) {
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
                         return r;
 
-                if (UNIT(s)->fragment_path)
+                if (s->meta.fragment_path)
                         s->from_fragment = true;
 
                 if (!s->what) {
@@ -283,7 +282,7 @@ static int swap_load(Unit *u) {
                         else if (s->parameters_proc_swaps.what)
                                 s->what = strdup(s->parameters_proc_swaps.what);
                         else
-                                s->what = unit_name_to_path(u->id);
+                                s->what = unit_name_to_path(u->meta.id);
 
                         if (!s->what)
                                 return -ENOMEM;
@@ -291,7 +290,7 @@ static int swap_load(Unit *u) {
 
                 path_kill_slashes(s->what);
 
-                if (!UNIT(s)->description)
+                if (!s->meta.description)
                         if ((r = unit_set_description(u, s->what)) < 0)
                                 return r;
 
@@ -307,7 +306,7 @@ static int swap_load(Unit *u) {
                 if ((r = unit_add_default_cgroups(u)) < 0)
                         return r;
 
-                if (UNIT(s)->default_dependencies)
+                if (s->meta.default_dependencies)
                         if ((r = swap_add_default_dependencies(s)) < 0)
                                 return r;
         }
@@ -334,8 +333,7 @@ int swap_add_one(
         assert(m);
         assert(what);
 
-        e = unit_name_from_path(what, ".swap");
-        if (!e)
+        if (!(e = unit_name_from_path(what, ".swap")))
                 return -ENOMEM;
 
         u = manager_get_unit(m, e);
@@ -349,18 +347,15 @@ int swap_add_one(
         if (!u) {
                 delete = true;
 
-                u = unit_new(m, sizeof(Swap));
-                if (!u) {
+                if (!(u = unit_new(m))) {
                         free(e);
                         return -ENOMEM;
                 }
 
-                r = unit_add_name(u, e);
-                if (r < 0)
+                if ((r = unit_add_name(u, e)) < 0)
                         goto fail;
 
-                SWAP(u)->what = strdup(what);
-                if (!SWAP(u)->what) {
+                if (!(SWAP(u)->what = strdup(what))) {
                         r = -ENOMEM;
                         goto fail;
                 }
@@ -510,7 +505,7 @@ static void swap_set_state(Swap *s, SwapState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(s)->id,
+                          s->meta.id,
                           swap_state_to_string(old_state),
                           swap_state_to_string(state));
 
@@ -571,7 +566,6 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sSwap State: %s\n"
-                "%sResult: %s\n"
                 "%sWhat: %s\n"
                 "%sPriority: %i\n"
                 "%sNoAuto: %s\n"
@@ -581,7 +575,6 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sFrom /proc/swaps: %s\n"
                 "%sFrom fragment: %s\n",
                 prefix, swap_state_to_string(s->state),
-                prefix, swap_result_to_string(s->result),
                 prefix, s->what,
                 prefix, p->priority,
                 prefix, yes_no(p->noauto),
@@ -614,13 +607,13 @@ static int swap_spawn(Swap *s, ExecCommand *c, pid_t *_pid) {
                             NULL,
                             &s->exec_context,
                             NULL, 0,
-                            UNIT(s)->manager->environment,
+                            s->meta.manager->environment,
                             true,
                             true,
                             true,
-                            UNIT(s)->manager->confirm_spawn,
-                            UNIT(s)->cgroup_bondings,
-                            UNIT(s)->cgroup_attributes,
+                            s->meta.manager->confirm_spawn,
+                            s->meta.cgroup_bondings,
+                            s->meta.cgroup_attributes,
                             &pid)) < 0)
                 goto fail;
 
@@ -638,33 +631,33 @@ fail:
         return r;
 }
 
-static void swap_enter_dead(Swap *s, SwapResult f) {
+static void swap_enter_dead(Swap *s, bool success) {
         assert(s);
 
-        if (f != SWAP_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
-        swap_set_state(s, s->result != SWAP_SUCCESS ? SWAP_FAILED : SWAP_DEAD);
+        swap_set_state(s, s->failure ? SWAP_FAILED : SWAP_DEAD);
 }
 
-static void swap_enter_active(Swap *s, SwapResult f) {
+static void swap_enter_active(Swap *s, bool success) {
         assert(s);
 
-        if (f != SWAP_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         swap_set_state(s, SWAP_ACTIVE);
 }
 
-static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
+static void swap_enter_signal(Swap *s, SwapState state, bool success) {
         int r;
         Set *pid_set = NULL;
         bool wait_for_exit = false;
 
         assert(s);
 
-        if (f != SWAP_SUCCESS)
-                s->result = f;
+        if (!success)
+                s->failure = true;
 
         if (s->exec_context.kill_mode != KILL_NONE) {
                 int sig = (state == SWAP_ACTIVATING_SIGTERM ||
@@ -690,7 +683,7 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
                                 if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0)
                                         goto fail;
 
-                        if ((r = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, sig, true, pid_set)) < 0) {
+                        if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig, true, pid_set)) < 0) {
                                 if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
                                         log_warning("Failed to kill control group: %s", strerror(-r));
                         } else if (r > 0)
@@ -707,14 +700,14 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
 
                 swap_set_state(s, state);
         } else
-                swap_enter_dead(s, SWAP_SUCCESS);
+                swap_enter_dead(s, true);
 
         return;
 
 fail:
-        log_warning("%s failed to kill processes: %s", UNIT(s)->id, strerror(-r));
+        log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r));
 
-        swap_enter_dead(s, SWAP_FAILURE_RESOURCES);
+        swap_enter_dead(s, false);
 
         if (pid_set)
                 set_free(pid_set);
@@ -768,15 +761,18 @@ static void swap_enter_activating(Swap *s) {
         return;
 
 fail:
-        log_warning("%s failed to run 'swapon' task: %s", UNIT(s)->id, strerror(-r));
-        swap_enter_dead(s, SWAP_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'swapon' task: %s", s->meta.id, strerror(-r));
+        swap_enter_dead(s, false);
 }
 
-static void swap_enter_deactivating(Swap *s) {
+static void swap_enter_deactivating(Swap *s, bool success) {
         int r;
 
         assert(s);
 
+        if (!success)
+                s->failure = true;
+
         s->control_command_id = SWAP_EXEC_DEACTIVATE;
         s->control_command = s->exec_command + SWAP_EXEC_DEACTIVATE;
 
@@ -797,8 +793,8 @@ static void swap_enter_deactivating(Swap *s) {
         return;
 
 fail:
-        log_warning("%s failed to run 'swapoff' task: %s", UNIT(s)->id, strerror(-r));
-        swap_enter_active(s, SWAP_FAILURE_RESOURCES);
+        log_warning("%s failed to run 'swapoff' task: %s", s->meta.id, strerror(-r));
+        swap_enter_active(s, false);
 }
 
 static int swap_start(Unit *u) {
@@ -821,7 +817,7 @@ static int swap_start(Unit *u) {
 
         assert(s->state == SWAP_DEAD || s->state == SWAP_FAILED);
 
-        s->result = SWAP_SUCCESS;
+        s->failure = false;
         swap_enter_activating(s);
         return 0;
 }
@@ -841,7 +837,7 @@ static int swap_stop(Unit *u) {
         assert(s->state == SWAP_ACTIVATING ||
                s->state == SWAP_ACTIVE);
 
-        swap_enter_deactivating(s);
+        swap_enter_deactivating(s, true);
         return 0;
 }
 
@@ -853,7 +849,7 @@ static int swap_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", swap_state_to_string(s->state));
-        unit_serialize_item(u, f, "result", swap_result_to_string(s->result));
+        unit_serialize_item(u, f, "failure", yes_no(s->failure));
 
         if (s->control_pid > 0)
                 unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid);
@@ -877,14 +873,14 @@ static int swap_deserialize_item(Unit *u, const char *key, const char *value, FD
                         log_debug("Failed to parse state value %s", value);
                 else
                         s->deserialized_state = state;
-        } else if (streq(key, "result")) {
-                SwapResult f;
-
-                f = swap_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != SWAP_SUCCESS)
-                        s->result = f;
+        } else if (streq(key, "failure")) {
+                int b;
+
+                if ((b = parse_boolean(value)) < 0)
+                        log_debug("Failed to parse failure value %s", value);
+                else
+                        s->failure = b || s->failure;
+
         } else if (streq(key, "control-pid")) {
                 pid_t pid;
 
@@ -931,7 +927,7 @@ static bool swap_check_gc(Unit *u) {
 
 static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         Swap *s = SWAP(u);
-        SwapResult f;
+        bool success;
 
         assert(s);
         assert(pid >= 0);
@@ -941,29 +937,17 @@ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
         s->control_pid = 0;
 
-        if (is_clean_exit(code, status))
-                f = SWAP_SUCCESS;
-        else if (code == CLD_EXITED)
-                f = SWAP_FAILURE_EXIT_CODE;
-        else if (code == CLD_KILLED)
-                f = SWAP_FAILURE_SIGNAL;
-        else if (code == CLD_DUMPED)
-                f = SWAP_FAILURE_CORE_DUMP;
-        else
-                assert_not_reached("Unknown code");
-
-        if (f != SWAP_SUCCESS)
-                s->result = f;
+        success = is_clean_exit(code, status);
+        s->failure = s->failure || !success;
 
         if (s->control_command) {
                 exec_status_exit(&s->control_command->exec_status, &s->exec_context, pid, code, status);
-
                 s->control_command = NULL;
                 s->control_command_id = _SWAP_EXEC_COMMAND_INVALID;
         }
 
-        log_full(f == SWAP_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
-                 "%s swap process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status);
+        log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                 "%s swap process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
 
         switch (s->state) {
 
@@ -971,20 +955,20 @@ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         case SWAP_ACTIVATING_SIGTERM:
         case SWAP_ACTIVATING_SIGKILL:
 
-                if (f == SWAP_SUCCESS)
-                        swap_enter_active(s, f);
+                if (success)
+                        swap_enter_active(s, true);
                 else
-                        swap_enter_dead(s, f);
+                        swap_enter_dead(s, false);
                 break;
 
         case SWAP_DEACTIVATING:
         case SWAP_DEACTIVATING_SIGKILL:
         case SWAP_DEACTIVATING_SIGTERM:
 
-                if (f == SWAP_SUCCESS)
-                        swap_enter_dead(s, f);
+                if (success)
+                        swap_enter_dead(s, true);
                 else
-                        swap_enter_dead(s, f);
+                        swap_enter_dead(s, false);
                 break;
 
         default:
@@ -996,7 +980,7 @@ static void swap_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
         /* Request a reload of /proc/swaps, so that following units
          * can follow our state change */
-        u->manager->request_reload = true;
+        u->meta.manager->request_reload = true;
 }
 
 static void swap_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
@@ -1009,39 +993,39 @@ static void swap_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
         switch (s->state) {
 
         case SWAP_ACTIVATING:
-                log_warning("%s activation timed out. Stopping.", u->id);
-                swap_enter_signal(s, SWAP_ACTIVATING_SIGTERM, SWAP_FAILURE_TIMEOUT);
+                log_warning("%s activation timed out. Stopping.", u->meta.id);
+                swap_enter_signal(s, SWAP_ACTIVATING_SIGTERM, false);
                 break;
 
         case SWAP_DEACTIVATING:
-                log_warning("%s deactivation timed out. Stopping.", u->id);
-                swap_enter_signal(s, SWAP_DEACTIVATING_SIGTERM, SWAP_FAILURE_TIMEOUT);
+                log_warning("%s deactivation timed out. Stopping.", u->meta.id);
+                swap_enter_signal(s, SWAP_DEACTIVATING_SIGTERM, false);
                 break;
 
         case SWAP_ACTIVATING_SIGTERM:
                 if (s->exec_context.send_sigkill) {
-                        log_warning("%s activation timed out. Killing.", u->id);
-                        swap_enter_signal(s, SWAP_ACTIVATING_SIGKILL, SWAP_FAILURE_TIMEOUT);
+                        log_warning("%s activation timed out. Killing.", u->meta.id);
+                        swap_enter_signal(s, SWAP_ACTIVATING_SIGKILL, false);
                 } else {
-                        log_warning("%s activation timed out. Skipping SIGKILL. Ignoring.", u->id);
-                        swap_enter_dead(s, SWAP_FAILURE_TIMEOUT);
+                        log_warning("%s activation timed out. Skipping SIGKILL. Ignoring.", u->meta.id);
+                        swap_enter_dead(s, false);
                 }
                 break;
 
         case SWAP_DEACTIVATING_SIGTERM:
                 if (s->exec_context.send_sigkill) {
-                        log_warning("%s deactivation timed out. Killing.", u->id);
-                        swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_FAILURE_TIMEOUT);
+                        log_warning("%s deactivation timed out. Killing.", u->meta.id);
+                        swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, false);
                 } else {
-                        log_warning("%s deactivation timed out. Skipping SIGKILL. Ignoring.", u->id);
-                        swap_enter_dead(s, SWAP_FAILURE_TIMEOUT);
+                        log_warning("%s deactivation timed out. Skipping SIGKILL. Ignoring.", u->meta.id);
+                        swap_enter_dead(s, false);
                 }
                 break;
 
         case SWAP_ACTIVATING_SIGKILL:
         case SWAP_DEACTIVATING_SIGKILL:
-                log_warning("%s swap process still around after SIGKILL. Ignoring.", u->id);
-                swap_enter_dead(s, SWAP_FAILURE_TIMEOUT);
+                log_warning("%s swap process still around after SIGKILL. Ignoring.", u->meta.id);
+                swap_enter_dead(s, false);
                 break;
 
         default:
@@ -1107,7 +1091,7 @@ int swap_dispatch_reload(Manager *m) {
 }
 
 int swap_fd_event(Manager *m, int events) {
-        Unit *u;
+        Meta *meta;
         int r;
 
         assert(m);
@@ -1117,8 +1101,8 @@ int swap_fd_event(Manager *m, int events) {
                 log_error("Failed to reread /proc/swaps: %s", strerror(-r));
 
                 /* Reset flags, just in case, for late calls */
-                LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_SWAP]) {
-                        Swap *swap = SWAP(u);
+                LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_SWAP]) {
+                        Swap *swap = (Swap*) meta;
 
                         swap->is_active = swap->just_activated = false;
                 }
@@ -1128,8 +1112,8 @@ int swap_fd_event(Manager *m, int events) {
 
         manager_dispatch_load_queue(m);
 
-        LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_SWAP]) {
-                Swap *swap = SWAP(u);
+        LIST_FOREACH(units_by_type, meta, m->units_by_type[UNIT_SWAP]) {
+                Swap *swap = (Swap*) meta;
 
                 if (!swap->is_active) {
                         /* This has just been deactivated */
@@ -1140,7 +1124,7 @@ int swap_fd_event(Manager *m, int events) {
                         switch (swap->state) {
 
                         case SWAP_ACTIVE:
-                                swap_enter_dead(swap, SWAP_SUCCESS);
+                                swap_enter_dead(swap, true);
                                 break;
 
                         default:
@@ -1156,7 +1140,7 @@ int swap_fd_event(Manager *m, int events) {
 
                         case SWAP_DEAD:
                         case SWAP_FAILED:
-                                swap_enter_active(swap, SWAP_SUCCESS);
+                                swap_enter_active(swap, true);
                                 break;
 
                         default:
@@ -1283,7 +1267,7 @@ static void swap_reset_failed(Unit *u) {
         if (s->state == SWAP_FAILED)
                 swap_set_state(s, SWAP_DEAD);
 
-        s->result = SWAP_SUCCESS;
+        s->failure = false;
 }
 
 static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
@@ -1321,7 +1305,7 @@ static int swap_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *
                                 goto finish;
                         }
 
-                if ((q = cgroup_bonding_kill_list(UNIT(s)->cgroup_bondings, signo, false, pid_set)) < 0)
+                if ((q = cgroup_bonding_kill_list(s->meta.cgroup_bondings, signo, false, pid_set)) < 0)
                         if (q != -EAGAIN && q != -ESRCH && q != -ENOENT)
                                 r = q;
         }
@@ -1354,20 +1338,8 @@ static const char* const swap_exec_command_table[_SWAP_EXEC_COMMAND_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(swap_exec_command, SwapExecCommand);
 
-static const char* const swap_result_table[_SWAP_RESULT_MAX] = {
-        [SWAP_SUCCESS] = "success",
-        [SWAP_FAILURE_RESOURCES] = "resources",
-        [SWAP_FAILURE_TIMEOUT] = "timeout",
-        [SWAP_FAILURE_EXIT_CODE] = "exit-code",
-        [SWAP_FAILURE_SIGNAL] = "signal",
-        [SWAP_FAILURE_CORE_DUMP] = "core-dump"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(swap_result, SwapResult);
-
 const UnitVTable swap_vtable = {
         .suffix = ".swap",
-        .object_size = sizeof(Swap),
         .sections =
                 "Unit\0"
                 "Swap\0"
index 62d08da..0d5c9a2 100644 (file)
@@ -56,19 +56,8 @@ typedef struct SwapParameters {
         bool handle:1;
 } SwapParameters;
 
-typedef enum SwapResult {
-        SWAP_SUCCESS,
-        SWAP_FAILURE_RESOURCES,
-        SWAP_FAILURE_TIMEOUT,
-        SWAP_FAILURE_EXIT_CODE,
-        SWAP_FAILURE_SIGNAL,
-        SWAP_FAILURE_CORE_DUMP,
-        _SWAP_RESULT_MAX,
-        _SWAP_RESULT_INVALID = -1
-} SwapResult;
-
 struct Swap {
-        Unit meta;
+        Meta meta;
 
         char *what;
 
@@ -80,13 +69,13 @@ struct Swap {
         bool from_proc_swaps:1;
         bool from_fragment:1;
 
+        bool failure:1;
+
         /* Used while looking for swaps that vanished or got added
          * from/to /proc/swaps */
         bool is_active:1;
         bool just_activated:1;
 
-        SwapResult result;
-
         usec_t timeout_usec;
 
         ExecCommand exec_command[_SWAP_EXEC_COMMAND_MAX];
@@ -122,7 +111,4 @@ SwapState swap_state_from_string(const char *s);
 const char* swap_exec_command_to_string(SwapExecCommand i);
 SwapExecCommand swap_exec_command_from_string(const char *s);
 
-const char* swap_result_to_string(SwapResult i);
-SwapResult swap_result_from_string(const char *s);
-
 #endif
similarity index 100%
rename from src/login/sysfs-show.c
rename to src/sysfs-show.c
index 33d09bc..230336d 100644 (file)
@@ -8,8 +8,8 @@
 # See systemd.conf(5) for details
 
 [Manager]
-#LogLevel=info
-#LogTarget=journal-or-kmsg
+LogLevel=notice
+#LogTarget=syslog-or-kmsg
 #LogColor=yes
 #LogLocation=no
 #DumpCore=yes
@@ -21,6 +21,6 @@
 #MountAuto=yes
 #SwapAuto=yes
 #DefaultControllers=cpu
-#DefaultStandardOutput=journal
+#DefaultStandardOutput=syslog
 #DefaultStandardError=inherit
 #JoinControllers=cpu,cpuacct
diff --git a/src/systemadm.c b/src/systemadm.c
deleted file mode 100644 (file)
index f065c61..0000000
+++ /dev/null
@@ -1,7822 +0,0 @@
-/* systemadm.c generated by valac 0.15.1, the Vala compiler
- * generated from systemadm.vala, do not modify */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <gtk/gtk.h>
-#include <float.h>
-#include <math.h>
-#include <gee.h>
-#include <gio/gio.h>
-#include <stdio.h>
-
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-#define TYPE_LEFT_LABEL (left_label_get_type ())
-#define LEFT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LEFT_LABEL, LeftLabel))
-#define LEFT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LEFT_LABEL, LeftLabelClass))
-#define IS_LEFT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_LEFT_LABEL))
-#define IS_LEFT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LEFT_LABEL))
-#define LEFT_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LEFT_LABEL, LeftLabelClass))
-
-typedef struct _LeftLabel LeftLabel;
-typedef struct _LeftLabelClass LeftLabelClass;
-typedef struct _LeftLabelPrivate LeftLabelPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
-
-#define TYPE_WRAP_LABEL (wrap_label_get_type ())
-#define WRAP_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WRAP_LABEL, WrapLabel))
-#define WRAP_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WRAP_LABEL, WrapLabelClass))
-#define IS_WRAP_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WRAP_LABEL))
-#define IS_WRAP_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_WRAP_LABEL))
-#define WRAP_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_WRAP_LABEL, WrapLabelClass))
-
-typedef struct _WrapLabel WrapLabel;
-typedef struct _WrapLabelClass WrapLabelClass;
-typedef struct _WrapLabelPrivate WrapLabelPrivate;
-
-#define TYPE_RIGHT_LABEL (right_label_get_type ())
-#define RIGHT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RIGHT_LABEL, RightLabel))
-#define RIGHT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RIGHT_LABEL, RightLabelClass))
-#define IS_RIGHT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RIGHT_LABEL))
-#define IS_RIGHT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RIGHT_LABEL))
-#define RIGHT_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RIGHT_LABEL, RightLabelClass))
-
-typedef struct _RightLabel RightLabel;
-typedef struct _RightLabelClass RightLabelClass;
-typedef struct _RightLabelPrivate RightLabelPrivate;
-
-#define TYPE_MAIN_WINDOW (main_window_get_type ())
-#define MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MAIN_WINDOW, MainWindow))
-#define MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MAIN_WINDOW, MainWindowClass))
-#define IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MAIN_WINDOW))
-#define IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MAIN_WINDOW))
-#define MAIN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_MAIN_WINDOW, MainWindowClass))
-
-typedef struct _MainWindow MainWindow;
-typedef struct _MainWindowClass MainWindowClass;
-typedef struct _MainWindowPrivate MainWindowPrivate;
-
-#define TYPE_UNIT (unit_get_type ())
-#define UNIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UNIT, Unit))
-#define IS_UNIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UNIT))
-#define UNIT_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_UNIT, UnitIface))
-
-typedef struct _Unit Unit;
-typedef struct _UnitIface UnitIface;
-
-#define TYPE_UNIT_PROXY (unit_proxy_get_type ())
-
-#define UNIT_TYPE_JOB_LINK (unit_job_link_get_type ())
-typedef struct _UnitJobLink UnitJobLink;
-
-#define TYPE_MANAGER (manager_get_type ())
-#define MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MANAGER, Manager))
-#define IS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MANAGER))
-#define MANAGER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_MANAGER, ManagerIface))
-
-typedef struct _Manager Manager;
-typedef struct _ManagerIface ManagerIface;
-
-#define TYPE_MANAGER_PROXY (manager_proxy_get_type ())
-
-#define MANAGER_TYPE_UNIT_INFO (manager_unit_info_get_type ())
-typedef struct _ManagerUnitInfo ManagerUnitInfo;
-
-#define MANAGER_TYPE_JOB_INFO (manager_job_info_get_type ())
-typedef struct _ManagerJobInfo ManagerJobInfo;
-
-#define TYPE_JOB (job_get_type ())
-#define JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_JOB, Job))
-#define IS_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_JOB))
-#define JOB_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_JOB, JobIface))
-
-typedef struct _Job Job;
-typedef struct _JobIface JobIface;
-
-#define TYPE_JOB_PROXY (job_proxy_get_type ())
-
-#define JOB_TYPE_UNIT_LINK (job_unit_link_get_type ())
-typedef struct _JobUnitLink JobUnitLink;
-
-#define TYPE_PROPERTIES (properties_get_type ())
-#define PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROPERTIES, Properties))
-#define IS_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROPERTIES))
-#define PROPERTIES_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_PROPERTIES, PropertiesIface))
-
-typedef struct _Properties Properties;
-typedef struct _PropertiesIface PropertiesIface;
-
-#define TYPE_PROPERTIES_PROXY (properties_proxy_get_type ())
-#define _gtk_tree_path_free0(var) ((var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-
-struct _LeftLabel {
-       GtkLabel parent_instance;
-       LeftLabelPrivate * priv;
-};
-
-struct _LeftLabelClass {
-       GtkLabelClass parent_class;
-};
-
-struct _WrapLabel {
-       GtkLabel parent_instance;
-       WrapLabelPrivate * priv;
-};
-
-struct _WrapLabelClass {
-       GtkLabelClass parent_class;
-};
-
-struct _RightLabel {
-       WrapLabel parent_instance;
-       RightLabelPrivate * priv;
-};
-
-struct _RightLabelClass {
-       WrapLabelClass parent_class;
-};
-
-struct _MainWindow {
-       GtkWindow parent_instance;
-       MainWindowPrivate * priv;
-};
-
-struct _MainWindowClass {
-       GtkWindowClass parent_class;
-};
-
-struct _UnitJobLink {
-       guint32 id;
-       char* path;
-};
-
-struct _UnitIface {
-       GTypeInterface parent_iface;
-       char* (*start) (Unit* self, const gchar* mode, GError** error);
-       char* (*stop) (Unit* self, const gchar* mode, GError** error);
-       char* (*reload) (Unit* self, const gchar* mode, GError** error);
-       char* (*restart) (Unit* self, const gchar* mode, GError** error);
-       char* (*try_restart) (Unit* self, const gchar* mode, GError** error);
-       char* (*reload_or_restart) (Unit* self, const gchar* mode, GError** error);
-       char* (*reload_or_try_restart) (Unit* self, const gchar* mode, GError** error);
-       void (*reset_failed) (Unit* self, GError** error);
-       gchar* (*get_id) (Unit* self);
-       gchar** (*get_names) (Unit* self, int* result_length1);
-       gchar* (*get_following) (Unit* self);
-       gchar** (*get_requires) (Unit* self, int* result_length1);
-       gchar** (*get_requires_overridable) (Unit* self, int* result_length1);
-       gchar** (*get_requisite) (Unit* self, int* result_length1);
-       gchar** (*get_requisite_overridable) (Unit* self, int* result_length1);
-       gchar** (*get_wants) (Unit* self, int* result_length1);
-       gchar** (*get_required_by) (Unit* self, int* result_length1);
-       gchar** (*get_required_by_overridable) (Unit* self, int* result_length1);
-       gchar** (*get_wanted_by) (Unit* self, int* result_length1);
-       gchar** (*get_conflicts) (Unit* self, int* result_length1);
-       gchar** (*get_conflicted_by) (Unit* self, int* result_length1);
-       gchar** (*get_before) (Unit* self, int* result_length1);
-       gchar** (*get_after) (Unit* self, int* result_length1);
-       gchar** (*get_on_failure) (Unit* self, int* result_length1);
-       gchar* (*get_description) (Unit* self);
-       gchar* (*get_load_state) (Unit* self);
-       gchar* (*get_active_state) (Unit* self);
-       gchar* (*get_sub_state) (Unit* self);
-       gchar* (*get_fragment_path) (Unit* self);
-       guint64 (*get_inactive_exit_timestamp) (Unit* self);
-       guint64 (*get_active_enter_timestamp) (Unit* self);
-       guint64 (*get_active_exit_timestamp) (Unit* self);
-       guint64 (*get_inactive_enter_timestamp) (Unit* self);
-       gboolean (*get_can_start) (Unit* self);
-       gboolean (*get_can_stop) (Unit* self);
-       gboolean (*get_can_reload) (Unit* self);
-       void (*get_job) (Unit* self, UnitJobLink* value);
-       gboolean (*get_recursive_stop) (Unit* self);
-       gboolean (*get_stop_when_unneeded) (Unit* self);
-       gboolean (*get_refuse_manual_start) (Unit* self);
-       gboolean (*get_refuse_manual_stop) (Unit* self);
-       gboolean (*get_default_dependencies) (Unit* self);
-       gchar* (*get_default_control_group) (Unit* self);
-       gchar** (*get_control_groups) (Unit* self, int* result_length1);
-       gboolean (*get_need_daemon_reload) (Unit* self);
-       guint64 (*get_job_timeout_usec) (Unit* self);
-};
-
-struct _ManagerUnitInfo {
-       gchar* id;
-       gchar* description;
-       gchar* load_state;
-       gchar* active_state;
-       gchar* sub_state;
-       gchar* following;
-       char* unit_path;
-       guint32 job_id;
-       gchar* job_type;
-       char* job_path;
-};
-
-struct _ManagerJobInfo {
-       guint32 id;
-       gchar* name;
-       gchar* type;
-       gchar* state;
-       char* job_path;
-       char* unit_path;
-};
-
-struct _ManagerIface {
-       GTypeInterface parent_iface;
-       ManagerUnitInfo* (*list_units) (Manager* self, int* result_length1, GError** error);
-       ManagerJobInfo* (*list_jobs) (Manager* self, int* result_length1, GError** error);
-       char* (*get_unit) (Manager* self, const gchar* name, GError** error);
-       char* (*get_unit_by_pid) (Manager* self, guint32 pid, GError** error);
-       char* (*load_unit) (Manager* self, const gchar* name, GError** error);
-       char* (*get_job) (Manager* self, guint32 id, GError** error);
-       char* (*start_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*stop_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*reload_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*try_restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*reload_or_restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*reload_or_try_restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       void (*reset_failed_unit) (Manager* self, const gchar* name, GError** error);
-       void (*clear_jobs) (Manager* self, GError** error);
-       void (*subscribe) (Manager* self, GError** error);
-       void (*unsubscribe) (Manager* self, GError** error);
-       gchar* (*dump) (Manager* self, GError** error);
-       void (*reload) (Manager* self, GError** error);
-       void (*reexecute) (Manager* self, GError** error);
-       void (*exit) (Manager* self, GError** error);
-       void (*halt) (Manager* self, GError** error);
-       void (*power_off) (Manager* self, GError** error);
-       void (*reboot) (Manager* self, GError** error);
-       void (*kexec) (Manager* self, GError** error);
-       char* (*create_snapshot) (Manager* self, const gchar* name, gboolean cleanup, GError** error);
-       void (*set_environment) (Manager* self, gchar** names, int names_length1, GError** error);
-       void (*unset_environment) (Manager* self, gchar** names, int names_length1, GError** error);
-       gchar** (*get_environment) (Manager* self, int* result_length1);
-};
-
-struct _MainWindowPrivate {
-       gchar* current_unit_id;
-       guint32 current_job_id;
-       GtkTreeView* unit_view;
-       GtkTreeView* job_view;
-       GtkListStore* unit_model;
-       GtkListStore* job_model;
-       GeeHashMap* unit_map;
-       GtkButton* start_button;
-       GtkButton* stop_button;
-       GtkButton* restart_button;
-       GtkButton* reload_button;
-       GtkButton* cancel_button;
-       GtkEntry* unit_load_entry;
-       GtkButton* unit_load_button;
-       GtkButton* server_snapshot_button;
-       GtkButton* server_reload_button;
-       Manager* manager;
-       RightLabel* unit_id_label;
-       RightLabel* unit_dependency_label;
-       RightLabel* unit_description_label;
-       RightLabel* unit_load_state_label;
-       RightLabel* unit_active_state_label;
-       RightLabel* unit_sub_state_label;
-       RightLabel* unit_fragment_path_label;
-       RightLabel* unit_active_enter_timestamp_label;
-       RightLabel* unit_active_exit_timestamp_label;
-       RightLabel* unit_can_start_label;
-       RightLabel* unit_can_reload_label;
-       RightLabel* unit_cgroup_label;
-       RightLabel* job_id_label;
-       RightLabel* job_state_label;
-       RightLabel* job_type_label;
-       GtkComboBox* unit_type_combo_box;
-       GtkCheckButton* inactive_checkbox;
-};
-
-struct _JobUnitLink {
-       gchar* id;
-       char* path;
-};
-
-struct _JobIface {
-       GTypeInterface parent_iface;
-       void (*cancel) (Job* self, GError** error);
-       guint32 (*get_id) (Job* self);
-       gchar* (*get_state) (Job* self);
-       gchar* (*get_job_type) (Job* self);
-       void (*get_unit) (Job* self, JobUnitLink* value);
-};
-
-struct _PropertiesIface {
-       GTypeInterface parent_iface;
-       GVariant* (*get) (Properties* self, const gchar* iface, const gchar* property, GError** error);
-};
-
-
-extern gboolean user;
-gboolean user = FALSE;
-static gpointer left_label_parent_class = NULL;
-static gpointer right_label_parent_class = NULL;
-static gpointer main_window_parent_class = NULL;
-
-gchar* format_time (guint64 time_ns);
-void new_column (GtkTreeView* view, gint column_id, const gchar* title);
-GType left_label_get_type (void) G_GNUC_CONST;
-enum  {
-       LEFT_LABEL_DUMMY_PROPERTY
-};
-LeftLabel* left_label_new (const gchar* text);
-LeftLabel* left_label_construct (GType object_type, const gchar* text);
-GType wrap_label_get_type (void) G_GNUC_CONST;
-GType right_label_get_type (void) G_GNUC_CONST;
-enum  {
-       RIGHT_LABEL_DUMMY_PROPERTY
-};
-RightLabel* right_label_new (const gchar* text);
-RightLabel* right_label_construct (GType object_type, const gchar* text);
-WrapLabel* wrap_label_new (const gchar* text);
-WrapLabel* wrap_label_construct (GType object_type, const gchar* text);
-void right_label_set_text_or_na (RightLabel* self, const gchar* text);
-void wrap_label_set_markup (WrapLabel* self, const gchar* str);
-void wrap_label_set_text (WrapLabel* self, const gchar* str);
-void right_label_set_markup_or_na (RightLabel* self, const gchar* text);
-GType main_window_get_type (void) G_GNUC_CONST;
-GType unit_proxy_get_type (void) G_GNUC_CONST;
-guint unit_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType unit_job_link_get_type (void) G_GNUC_CONST;
-UnitJobLink* unit_job_link_dup (const UnitJobLink* self);
-void unit_job_link_free (UnitJobLink* self);
-void unit_job_link_copy (const UnitJobLink* self, UnitJobLink* dest);
-void unit_job_link_destroy (UnitJobLink* self);
-GType unit_get_type (void) G_GNUC_CONST;
-GType manager_proxy_get_type (void) G_GNUC_CONST;
-guint manager_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType manager_unit_info_get_type (void) G_GNUC_CONST;
-ManagerUnitInfo* manager_unit_info_dup (const ManagerUnitInfo* self);
-void manager_unit_info_free (ManagerUnitInfo* self);
-void manager_unit_info_copy (const ManagerUnitInfo* self, ManagerUnitInfo* dest);
-void manager_unit_info_destroy (ManagerUnitInfo* self);
-GType manager_job_info_get_type (void) G_GNUC_CONST;
-ManagerJobInfo* manager_job_info_dup (const ManagerJobInfo* self);
-void manager_job_info_free (ManagerJobInfo* self);
-void manager_job_info_copy (const ManagerJobInfo* self, ManagerJobInfo* dest);
-void manager_job_info_destroy (ManagerJobInfo* self);
-GType manager_get_type (void) G_GNUC_CONST;
-#define MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_MAIN_WINDOW, MainWindowPrivate))
-enum  {
-       MAIN_WINDOW_DUMMY_PROPERTY
-};
-MainWindow* main_window_new (GError** error);
-MainWindow* main_window_construct (GType object_type, GError** error);
-static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self);
-void main_window_unit_type_changed (MainWindow* self);
-static void _main_window_unit_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void _main_window_unit_type_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
-void main_window_on_unit_load_entry_changed (MainWindow* self);
-static void _main_window_on_unit_load_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-void main_window_on_unit_load (MainWindow* self);
-static void _main_window_on_unit_load_gtk_entry_activate (GtkEntry* _sender, gpointer self);
-static void _main_window_on_unit_load_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_server_snapshot (MainWindow* self);
-static void _main_window_on_server_snapshot_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_server_reload (MainWindow* self);
-static void _main_window_on_server_reload_gtk_button_clicked (GtkButton* _sender, gpointer self);
-GType job_proxy_get_type (void) G_GNUC_CONST;
-guint job_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType job_unit_link_get_type (void) G_GNUC_CONST;
-JobUnitLink* job_unit_link_dup (const JobUnitLink* self);
-void job_unit_link_free (JobUnitLink* self);
-void job_unit_link_copy (const JobUnitLink* self, JobUnitLink* dest);
-void job_unit_link_destroy (JobUnitLink* self);
-GType job_get_type (void) G_GNUC_CONST;
-gboolean main_window_unit_filter (MainWindow* self, GtkTreeModel* model, GtkTreeIter* iter);
-static gboolean _main_window_unit_filter_gtk_tree_model_filter_visible_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
-void main_window_unit_changed (MainWindow* self);
-static void _main_window_unit_changed_gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self);
-void main_window_job_changed (MainWindow* self);
-static void _main_window_job_changed_gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self);
-gboolean main_window_on_activate_link (MainWindow* self, const gchar* uri);
-static gboolean _main_window_on_activate_link_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self);
-void main_window_on_start (MainWindow* self);
-static void _main_window_on_start_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_stop (MainWindow* self);
-static void _main_window_on_stop_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_reload (MainWindow* self);
-static void _main_window_on_reload_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_restart (MainWindow* self);
-static void _main_window_on_restart_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_cancel (MainWindow* self);
-static void _main_window_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self);
-void main_window_on_unit_new (MainWindow* self, const gchar* id, const char* path);
-static void _main_window_on_unit_new_manager_unit_new (Manager* _sender, const gchar* id, const char* path, gpointer self);
-void main_window_on_job_new (MainWindow* self, guint32 id, const char* path);
-static void _main_window_on_job_new_manager_job_new (Manager* _sender, guint32 id, const char* path, gpointer self);
-void main_window_on_unit_removed (MainWindow* self, const gchar* id, const char* path);
-static void _main_window_on_unit_removed_manager_unit_removed (Manager* _sender, const gchar* id, const char* path, gpointer self);
-void main_window_on_job_removed (MainWindow* self, guint32 id, const char* path, const gchar* res);
-static void _main_window_on_job_removed_manager_job_removed (Manager* _sender, guint32 id, const char* path, const gchar* res, gpointer self);
-void manager_subscribe (Manager* self, GError** error);
-void main_window_clear_unit (MainWindow* self);
-void main_window_clear_job (MainWindow* self);
-void main_window_populate_unit_model (MainWindow* self, GError** error);
-void main_window_populate_job_model (MainWindow* self, GError** error);
-ManagerUnitInfo* manager_list_units (Manager* self, int* result_length1, GError** error);
-GType properties_proxy_get_type (void) G_GNUC_CONST;
-guint properties_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType properties_get_type (void) G_GNUC_CONST;
-static void _vala_ManagerUnitInfo_array_free (ManagerUnitInfo* array, gint array_length);
-void main_window_on_unit_changed (MainWindow* self, Properties* p, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1);
-static void _main_window_on_unit_changed_properties_properties_changed (Properties* _sender, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1, gpointer self);
-ManagerJobInfo* manager_list_jobs (Manager* self, int* result_length1, GError** error);
-static void _vala_ManagerJobInfo_array_free (ManagerJobInfo* array, gint array_length);
-void main_window_on_job_changed (MainWindow* self, Properties* p, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1);
-static void _main_window_on_job_changed_properties_properties_changed (Properties* _sender, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1, gpointer self);
-Unit* main_window_get_current_unit (MainWindow* self);
-Unit* main_window_get_unit (MainWindow* self, const gchar* id);
-void main_window_show_unit (MainWindow* self, Unit* unit);
-gchar* main_window_format_unit_link (MainWindow* self, const gchar* i, gboolean link);
-gchar* unit_get_sub_state (Unit* self);
-gchar* main_window_make_dependency_string (MainWindow* self, const gchar* prefix, const gchar* word, gchar** dependencies, int dependencies_length1);
-gchar* unit_get_id (Unit* self);
-gchar** unit_get_names (Unit* self, int* result_length1);
-gchar** unit_get_requires (Unit* self, int* result_length1);
-gchar** unit_get_requires_overridable (Unit* self, int* result_length1);
-gchar** unit_get_requisite (Unit* self, int* result_length1);
-gchar** unit_get_requisite_overridable (Unit* self, int* result_length1);
-gchar** unit_get_wants (Unit* self, int* result_length1);
-gchar** unit_get_required_by (Unit* self, int* result_length1);
-gchar** unit_get_required_by_overridable (Unit* self, int* result_length1);
-gchar** unit_get_wanted_by (Unit* self, int* result_length1);
-gchar** unit_get_conflicts (Unit* self, int* result_length1);
-gchar** unit_get_before (Unit* self, int* result_length1);
-gchar** unit_get_after (Unit* self, int* result_length1);
-gchar* unit_get_description (Unit* self);
-gchar* unit_get_load_state (Unit* self);
-gchar* unit_get_active_state (Unit* self);
-gchar* unit_get_fragment_path (Unit* self);
-guint64 unit_get_active_enter_timestamp (Unit* self);
-guint64 unit_get_active_exit_timestamp (Unit* self);
-gboolean unit_get_can_start (Unit* self);
-gboolean unit_get_can_reload (Unit* self);
-gchar* unit_get_default_control_group (Unit* self);
-Job* main_window_get_current_job (MainWindow* self);
-void main_window_show_job (MainWindow* self, Job* job);
-guint32 job_get_id (Job* self);
-gchar* job_get_state (Job* self);
-gchar* job_get_job_type (Job* self);
-char* unit_start (Unit* self, const gchar* mode, GError** error);
-void main_window_show_error (MainWindow* self, const gchar* e);
-char* unit_stop (Unit* self, const gchar* mode, GError** error);
-char* unit_reload (Unit* self, const gchar* mode, GError** error);
-char* unit_restart (Unit* self, const gchar* mode, GError** error);
-void job_cancel (Job* self, GError** error);
-void main_window_update_unit_iter (MainWindow* self, GtkTreeIter* iter, const gchar* id, Unit* u);
-void unit_get_job (Unit* self, UnitJobLink* result);
-void main_window_update_job_iter (MainWindow* self, GtkTreeIter* iter, guint32 id, Job* j);
-void job_get_unit (Job* self, JobUnitLink* result);
-void manager_reload (Manager* self, GError** error);
-char* manager_create_snapshot (Manager* self, const gchar* name, gboolean cleanup, GError** error);
-char* manager_load_unit (Manager* self, const gchar* name, GError** error);
-char* manager_get_unit (Manager* self, const gchar* name, GError** error);
-static void main_window_finalize (GObject* obj);
-void show_error (const gchar* e);
-gint _vala_main (gchar** args, int args_length1);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-const GOptionEntry entries[3] = {{"user", (gchar) 0, 0, G_OPTION_ARG_NONE, &user, "Connect to user service manager", NULL}, {"system", (gchar) 0, (gint) G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &user, "Connect to system manager", NULL}, {NULL}};
-
-static void g_time_local (time_t time, struct tm* result) {
-       struct tm _result_ = {0};
-       struct tm _tmp0_ = {0};
-#line 2491 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       localtime_r (&time, &_tmp0_);
-#line 2491 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _result_ = _tmp0_;
-#line 2492 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       *result = _result_;
-#line 2492 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       return;
-#line 506 "systemadm.c"
-}
-
-
-static gchar* g_time_format (struct tm *self, const gchar* format) {
-       gchar* result = NULL;
-       gchar* _tmp0_ = NULL;
-       gchar* buffer;
-       gint buffer_length1;
-       gint _buffer_size_;
-       gchar* _tmp1_;
-       gint _tmp1__length1;
-       const gchar* _tmp2_;
-       gchar* _tmp3_;
-       gint _tmp3__length1;
-       gchar* _tmp4_;
-#line 2499 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       g_return_val_if_fail (format != NULL, NULL);
-#line 2500 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp0_ = g_new0 (gchar, 64);
-#line 2500 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       buffer = _tmp0_;
-#line 2500 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       buffer_length1 = 64;
-#line 2500 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _buffer_size_ = buffer_length1;
-#line 2501 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp1_ = buffer;
-#line 2501 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp1__length1 = buffer_length1;
-#line 2501 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp2_ = format;
-#line 2501 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2502 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp3_ = buffer;
-#line 2502 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp3__length1 = buffer_length1;
-#line 2502 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       _tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2502 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       result = _tmp4_;
-#line 2502 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       buffer = (g_free (buffer), NULL);
-#line 2502 "/usr/share/vala-0.16/vapi/glib-2.0.vapi"
-       return result;
-#line 552 "systemadm.c"
-}
-
-
-gchar* format_time (guint64 time_ns) {
-       gchar* result = NULL;
-       guint64 _tmp0_;
-       guint64 _tmp2_;
-       struct tm _tmp3_ = {0};
-       struct tm timestamp;
-       gchar* _tmp4_ = NULL;
-#line 27 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = time_ns;
-#line 27 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp0_ <= ((guint64) 0)) {
-#line 567 "systemadm.c"
-               gchar* _tmp1_;
-#line 28 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = g_strdup ("");
-#line 28 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = _tmp1_;
-#line 28 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 575 "systemadm.c"
-       }
-#line 29 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = time_ns;
-#line 29 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_time_local ((time_t) (_tmp2_ / 1000000), &_tmp3_);
-#line 29 "/home/lennart/projects/systemd/src/systemadm.vala"
-       timestamp = _tmp3_;
-#line 30 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = g_time_format (&timestamp, "%a, %d %b %Y %H:%M:%S");
-#line 30 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = _tmp4_;
-#line 30 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 589 "systemadm.c"
-}
-
-
-void new_column (GtkTreeView* view, gint column_id, const gchar* title) {
-       GtkTreeViewColumn* col = NULL;
-       const gchar* _tmp0_;
-       GtkCellRendererText* _tmp1_;
-       GtkCellRendererText* _tmp2_;
-       gint _tmp3_;
-       GtkTreeViewColumn* _tmp4_;
-       GtkTreeViewColumn* _tmp5_;
-       gint _tmp6_;
-       GtkTreeView* _tmp7_;
-#line 33 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (view != NULL);
-#line 33 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (title != NULL);
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = title;
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = g_object_ref_sink (_tmp1_);
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = column_id;
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = gtk_tree_view_column_new_with_attributes (_tmp0_, (GtkCellRenderer*) _tmp2_, "text", _tmp3_, NULL);
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = g_object_ref_sink (_tmp4_);
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (col);
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       col = _tmp5_;
-#line 35 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp2_);
-#line 36 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = column_id;
-#line 36 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_view_column_set_sort_column_id (col, _tmp6_);
-#line 37 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = view;
-#line 37 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_view_insert_column (_tmp7_, col, -1);
-#line 33 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (col);
-#line 635 "systemadm.c"
-}
-
-
-LeftLabel* left_label_construct (GType object_type, const gchar* text) {
-       LeftLabel * self = NULL;
-       const gchar* _tmp0_;
-#line 41 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self = (LeftLabel*) g_object_new (object_type, NULL);
-#line 42 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = text;
-#line 42 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp0_ != NULL) {
-#line 648 "systemadm.c"
-               const gchar* _tmp1_;
-               gchar* _tmp2_ = NULL;
-               gchar* _tmp3_;
-#line 43 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = text;
-#line 43 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = g_strdup_printf ("<b>%s</b>", _tmp1_);
-#line 43 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = _tmp2_;
-#line 43 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_label_set_markup ((GtkLabel*) self, _tmp3_);
-#line 43 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp3_);
-#line 662 "systemadm.c"
-       }
-#line 44 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_misc_set_alignment ((GtkMisc*) self, (gfloat) 0, (gfloat) 0);
-#line 45 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_misc_set_padding ((GtkMisc*) self, 6, 0);
-#line 41 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return self;
-#line 670 "systemadm.c"
-}
-
-
-LeftLabel* left_label_new (const gchar* text) {
-#line 41 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return left_label_construct (TYPE_LEFT_LABEL, text);
-#line 677 "systemadm.c"
-}
-
-
-static void left_label_class_init (LeftLabelClass * klass) {
-#line 40 "/home/lennart/projects/systemd/src/systemadm.vala"
-       left_label_parent_class = g_type_class_peek_parent (klass);
-#line 684 "systemadm.c"
-}
-
-
-static void left_label_instance_init (LeftLabel * self) {
-}
-
-
-GType left_label_get_type (void) {
-       static volatile gsize left_label_type_id__volatile = 0;
-       if (g_once_init_enter (&left_label_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (LeftLabelClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) left_label_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LeftLabel), 0, (GInstanceInitFunc) left_label_instance_init, NULL };
-               GType left_label_type_id;
-               left_label_type_id = g_type_register_static (GTK_TYPE_LABEL, "LeftLabel", &g_define_type_info, 0);
-               g_once_init_leave (&left_label_type_id__volatile, left_label_type_id);
-       }
-       return left_label_type_id__volatile;
-}
-
-
-RightLabel* right_label_construct (GType object_type, const gchar* text) {
-       RightLabel * self = NULL;
-       const gchar* _tmp0_;
-#line 51 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self = (RightLabel*) wrap_label_construct (object_type, NULL);
-#line 52 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_label_set_selectable ((GtkLabel*) self, TRUE);
-#line 53 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = text;
-#line 53 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (self, _tmp0_);
-#line 51 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return self;
-#line 717 "systemadm.c"
-}
-
-
-RightLabel* right_label_new (const gchar* text) {
-#line 51 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return right_label_construct (TYPE_RIGHT_LABEL, text);
-#line 724 "systemadm.c"
-}
-
-
-void right_label_set_text_or_na (RightLabel* self, const gchar* text) {
-       gboolean _tmp0_ = FALSE;
-       const gchar* _tmp1_;
-       gboolean _tmp3_;
-#line 56 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = text;
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = TRUE;
-#line 740 "systemadm.c"
-       } else {
-               const gchar* _tmp2_;
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = text;
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = g_strcmp0 (_tmp2_, "") == 0;
-#line 747 "systemadm.c"
-       }
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = _tmp0_;
-#line 57 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp3_) {
-#line 58 "/home/lennart/projects/systemd/src/systemadm.vala"
-               wrap_label_set_markup ((WrapLabel*) self, "<i>n/a</i>");
-#line 755 "systemadm.c"
-       } else {
-               const gchar* _tmp4_;
-#line 60 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = text;
-#line 60 "/home/lennart/projects/systemd/src/systemadm.vala"
-               wrap_label_set_text ((WrapLabel*) self, _tmp4_);
-#line 762 "systemadm.c"
-       }
-}
-
-
-void right_label_set_markup_or_na (RightLabel* self, const gchar* text) {
-       gboolean _tmp0_ = FALSE;
-       const gchar* _tmp1_;
-       gboolean _tmp3_;
-#line 63 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = text;
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = TRUE;
-#line 779 "systemadm.c"
-       } else {
-               const gchar* _tmp2_;
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = text;
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = g_strcmp0 (_tmp2_, "") == 0;
-#line 786 "systemadm.c"
-       }
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = _tmp0_;
-#line 64 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp3_) {
-#line 65 "/home/lennart/projects/systemd/src/systemadm.vala"
-               wrap_label_set_markup ((WrapLabel*) self, "<i>n/a</i>");
-#line 794 "systemadm.c"
-       } else {
-               const gchar* _tmp4_;
-#line 67 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = text;
-#line 67 "/home/lennart/projects/systemd/src/systemadm.vala"
-               wrap_label_set_markup ((WrapLabel*) self, _tmp4_);
-#line 801 "systemadm.c"
-       }
-}
-
-
-static void right_label_class_init (RightLabelClass * klass) {
-#line 49 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_parent_class = g_type_class_peek_parent (klass);
-#line 809 "systemadm.c"
-}
-
-
-static void right_label_instance_init (RightLabel * self) {
-}
-
-
-GType right_label_get_type (void) {
-       static volatile gsize right_label_type_id__volatile = 0;
-       if (g_once_init_enter (&right_label_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (RightLabelClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) right_label_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RightLabel), 0, (GInstanceInitFunc) right_label_instance_init, NULL };
-               GType right_label_type_id;
-               right_label_type_id = g_type_register_static (TYPE_WRAP_LABEL, "RightLabel", &g_define_type_info, 0);
-               g_once_init_leave (&right_label_type_id__volatile, right_label_type_id);
-       }
-       return right_label_type_id__volatile;
-}
-
-
-static void _gtk_main_quit_gtk_object_destroy (GtkObject* _sender, gpointer self) {
-#line 123 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_main_quit ();
-#line 832 "systemadm.c"
-}
-
-
-static void _main_window_unit_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 153 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_unit_type_changed (self);
-#line 839 "systemadm.c"
-}
-
-
-static void _main_window_unit_type_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 156 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_unit_type_changed (self);
-#line 846 "systemadm.c"
-}
-
-
-static void _main_window_on_unit_load_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 163 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_unit_load_entry_changed (self);
-#line 853 "systemadm.c"
-}
-
-
-static void _main_window_on_unit_load_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
-#line 164 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_unit_load (self);
-#line 860 "systemadm.c"
-}
-
-
-static void _main_window_on_unit_load_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 165 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_unit_load (self);
-#line 867 "systemadm.c"
-}
-
-
-static void _main_window_on_server_snapshot_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 174 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_server_snapshot (self);
-#line 874 "systemadm.c"
-}
-
-
-static void _main_window_on_server_reload_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 175 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_server_reload (self);
-#line 881 "systemadm.c"
-}
-
-
-static gboolean _main_window_unit_filter_gtk_tree_model_filter_visible_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
-       gboolean result;
-       result = main_window_unit_filter (self, model, iter);
-#line 188 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 890 "systemadm.c"
-}
-
-
-static void _main_window_unit_changed_gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self) {
-#line 195 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_unit_changed (self);
-#line 897 "systemadm.c"
-}
-
-
-static void _main_window_job_changed_gtk_tree_view_cursor_changed (GtkTreeView* _sender, gpointer self) {
-#line 196 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_job_changed (self);
-#line 904 "systemadm.c"
-}
-
-
-static gboolean _main_window_on_activate_link_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
-       gboolean result;
-       result = main_window_on_activate_link (self, uri);
-#line 240 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 913 "systemadm.c"
-}
-
-
-static void _main_window_on_start_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 299 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_start (self);
-#line 920 "systemadm.c"
-}
-
-
-static void _main_window_on_stop_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 300 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_stop (self);
-#line 927 "systemadm.c"
-}
-
-
-static void _main_window_on_reload_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 301 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_reload (self);
-#line 934 "systemadm.c"
-}
-
-
-static void _main_window_on_restart_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 302 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_restart (self);
-#line 941 "systemadm.c"
-}
-
-
-static void _main_window_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 316 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_cancel (self);
-#line 948 "systemadm.c"
-}
-
-
-static void _main_window_on_unit_new_manager_unit_new (Manager* _sender, const gchar* id, const char* path, gpointer self) {
-#line 325 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_unit_new (self, id, path);
-#line 955 "systemadm.c"
-}
-
-
-static void _main_window_on_job_new_manager_job_new (Manager* _sender, guint32 id, const char* path, gpointer self) {
-#line 326 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_job_new (self, id, path);
-#line 962 "systemadm.c"
-}
-
-
-static void _main_window_on_unit_removed_manager_unit_removed (Manager* _sender, const gchar* id, const char* path, gpointer self) {
-#line 327 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_unit_removed (self, id, path);
-#line 969 "systemadm.c"
-}
-
-
-static void _main_window_on_job_removed_manager_job_removed (Manager* _sender, guint32 id, const char* path, const gchar* res, gpointer self) {
-#line 328 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_job_removed (self, id, path, res);
-#line 976 "systemadm.c"
-}
-
-
-MainWindow* main_window_construct (GType object_type, GError** error) {
-       MainWindow * self = NULL;
-       const gchar* _tmp0_ = NULL;
-       gboolean _tmp1_;
-       const gchar* _tmp2_;
-       GtkNotebook* _tmp3_;
-       GtkNotebook* _tmp4_;
-       GtkNotebook* notebook;
-       GtkNotebook* _tmp5_;
-       GtkVBox* _tmp6_;
-       GtkBox* _tmp7_;
-       GtkBox* unit_vbox;
-       GtkNotebook* _tmp8_;
-       GtkBox* _tmp9_;
-       GtkLabel* _tmp10_;
-       GtkLabel* _tmp11_;
-       GtkBox* _tmp12_;
-       GtkVBox* _tmp13_;
-       GtkBox* _tmp14_;
-       GtkBox* job_vbox;
-       GtkNotebook* _tmp15_;
-       GtkBox* _tmp16_;
-       GtkLabel* _tmp17_;
-       GtkLabel* _tmp18_;
-       GtkBox* _tmp19_;
-       GtkComboBox* _tmp20_;
-       GtkComboBox* _tmp21_;
-       GtkHBox* _tmp22_;
-       GtkBox* _tmp23_;
-       GtkBox* type_hbox;
-       GtkBox* _tmp24_;
-       GtkComboBox* _tmp25_;
-       GtkBox* _tmp26_;
-       GtkBox* _tmp27_;
-       GtkComboBox* _tmp28_;
-       GtkComboBox* _tmp29_;
-       GtkComboBox* _tmp30_;
-       GtkComboBox* _tmp31_;
-       GtkComboBox* _tmp32_;
-       GtkComboBox* _tmp33_;
-       GtkComboBox* _tmp34_;
-       GtkComboBox* _tmp35_;
-       GtkComboBox* _tmp36_;
-       GtkComboBox* _tmp37_;
-       GtkComboBox* _tmp38_;
-       GtkComboBox* _tmp39_;
-       GtkComboBox* _tmp40_;
-       GtkCheckButton* _tmp41_;
-       GtkCheckButton* _tmp42_;
-       GtkCheckButton* _tmp43_;
-       GtkBox* _tmp44_;
-       GtkCheckButton* _tmp45_;
-       GtkEntry* _tmp46_;
-       GtkEntry* _tmp47_;
-       GtkButton* _tmp48_;
-       GtkButton* _tmp49_;
-       GtkButton* _tmp50_;
-       GtkEntry* _tmp51_;
-       GtkEntry* _tmp52_;
-       GtkButton* _tmp53_;
-       GtkHBox* _tmp54_;
-       GtkBox* _tmp55_;
-       GtkBox* unit_load_hbox;
-       GtkBox* _tmp56_;
-       GtkEntry* _tmp57_;
-       GtkBox* _tmp58_;
-       GtkButton* _tmp59_;
-       GtkButton* _tmp60_;
-       GtkButton* _tmp61_;
-       GtkButton* _tmp62_;
-       GtkButton* _tmp63_;
-       GtkButton* _tmp64_;
-       GtkButton* _tmp65_;
-       GtkBox* _tmp66_;
-       GtkButton* _tmp67_;
-       GtkBox* _tmp68_;
-       GtkButton* _tmp69_;
-       GtkBox* _tmp70_;
-       GtkBox* _tmp71_;
-       GtkListStore* _tmp72_;
-       GtkListStore* _tmp73_;
-       GeeHashMap* _tmp74_;
-       GtkTreeModelFilter* unit_model_filter = NULL;
-       GtkListStore* _tmp75_;
-       GtkTreeModelFilter* _tmp76_;
-       GtkTreeModelFilter* _tmp77_;
-       GtkTreeModelFilter* _tmp78_;
-       GtkTreeModelSort* _tmp79_;
-       GtkTreeModelSort* unit_model_sort;
-       GtkTreeModelSort* _tmp80_;
-       GtkTreeView* _tmp81_;
-       GtkTreeView* _tmp82_;
-       GtkListStore* _tmp83_;
-       GtkTreeView* _tmp84_;
-       GtkTreeView* _tmp85_;
-       GtkTreeView* _tmp86_;
-       GtkTreeView* _tmp87_;
-       GtkTreeView* _tmp88_;
-       GtkTreeView* _tmp89_;
-       GtkTreeView* _tmp90_;
-       GtkTreeView* _tmp91_;
-       GtkTreeView* _tmp92_;
-       GtkTreeView* _tmp93_;
-       GtkTreeView* _tmp94_;
-       GtkTreeView* _tmp95_;
-       GtkTreeView* _tmp96_;
-       GtkScrolledWindow* _tmp97_;
-       GtkScrolledWindow* _tmp98_;
-       GtkScrolledWindow* scroll;
-       GtkScrolledWindow* _tmp99_;
-       GtkScrolledWindow* _tmp100_;
-       GtkScrolledWindow* _tmp101_;
-       GtkTreeView* _tmp102_;
-       GtkBox* _tmp103_;
-       GtkScrolledWindow* _tmp104_;
-       GtkScrolledWindow* _tmp105_;
-       GtkScrolledWindow* _tmp106_;
-       GtkScrolledWindow* _tmp107_;
-       GtkScrolledWindow* _tmp108_;
-       GtkScrolledWindow* _tmp109_;
-       GtkTreeView* _tmp110_;
-       GtkBox* _tmp111_;
-       GtkScrolledWindow* _tmp112_;
-       RightLabel* _tmp113_;
-       RightLabel* _tmp114_;
-       RightLabel* _tmp115_;
-       RightLabel* _tmp116_;
-       RightLabel* _tmp117_;
-       RightLabel* _tmp118_;
-       RightLabel* _tmp119_;
-       RightLabel* _tmp120_;
-       RightLabel* _tmp121_;
-       RightLabel* _tmp122_;
-       RightLabel* _tmp123_;
-       RightLabel* _tmp124_;
-       RightLabel* _tmp125_;
-       RightLabel* _tmp126_;
-       RightLabel* _tmp127_;
-       RightLabel* _tmp128_;
-       RightLabel* _tmp129_;
-       RightLabel* _tmp130_;
-       RightLabel* _tmp131_;
-       RightLabel* _tmp132_;
-       RightLabel* _tmp133_;
-       RightLabel* _tmp134_;
-       RightLabel* _tmp135_;
-       RightLabel* _tmp136_;
-       RightLabel* _tmp137_;
-       RightLabel* _tmp138_;
-       RightLabel* _tmp139_;
-       RightLabel* _tmp140_;
-       RightLabel* _tmp141_;
-       RightLabel* _tmp142_;
-       RightLabel* _tmp143_;
-       RightLabel* _tmp144_;
-       RightLabel* _tmp145_;
-       RightLabel* _tmp146_;
-       GtkTable* _tmp147_;
-       GtkTable* _tmp148_;
-       GtkTable* unit_table;
-       GtkTable* _tmp149_;
-       GtkTable* _tmp150_;
-       GtkBox* _tmp151_;
-       GtkTable* _tmp152_;
-       GtkTable* _tmp153_;
-       GtkTable* _tmp154_;
-       GtkTable* job_table;
-       GtkTable* _tmp155_;
-       GtkTable* _tmp156_;
-       GtkBox* _tmp157_;
-       GtkTable* _tmp158_;
-       GtkTable* _tmp159_;
-       LeftLabel* _tmp160_;
-       LeftLabel* _tmp161_;
-       GtkTable* _tmp162_;
-       RightLabel* _tmp163_;
-       GtkTable* _tmp164_;
-       LeftLabel* _tmp165_;
-       LeftLabel* _tmp166_;
-       GtkTable* _tmp167_;
-       RightLabel* _tmp168_;
-       GtkTable* _tmp169_;
-       LeftLabel* _tmp170_;
-       LeftLabel* _tmp171_;
-       GtkTable* _tmp172_;
-       RightLabel* _tmp173_;
-       GtkTable* _tmp174_;
-       LeftLabel* _tmp175_;
-       LeftLabel* _tmp176_;
-       GtkTable* _tmp177_;
-       RightLabel* _tmp178_;
-       GtkTable* _tmp179_;
-       LeftLabel* _tmp180_;
-       LeftLabel* _tmp181_;
-       GtkTable* _tmp182_;
-       RightLabel* _tmp183_;
-       GtkTable* _tmp184_;
-       LeftLabel* _tmp185_;
-       LeftLabel* _tmp186_;
-       GtkTable* _tmp187_;
-       RightLabel* _tmp188_;
-       GtkTable* _tmp189_;
-       LeftLabel* _tmp190_;
-       LeftLabel* _tmp191_;
-       GtkTable* _tmp192_;
-       RightLabel* _tmp193_;
-       GtkTable* _tmp194_;
-       LeftLabel* _tmp195_;
-       LeftLabel* _tmp196_;
-       GtkTable* _tmp197_;
-       RightLabel* _tmp198_;
-       GtkTable* _tmp199_;
-       LeftLabel* _tmp200_;
-       LeftLabel* _tmp201_;
-       GtkTable* _tmp202_;
-       RightLabel* _tmp203_;
-       GtkTable* _tmp204_;
-       LeftLabel* _tmp205_;
-       LeftLabel* _tmp206_;
-       GtkTable* _tmp207_;
-       RightLabel* _tmp208_;
-       GtkTable* _tmp209_;
-       LeftLabel* _tmp210_;
-       LeftLabel* _tmp211_;
-       GtkTable* _tmp212_;
-       RightLabel* _tmp213_;
-       GtkTable* _tmp214_;
-       LeftLabel* _tmp215_;
-       LeftLabel* _tmp216_;
-       GtkTable* _tmp217_;
-       RightLabel* _tmp218_;
-       GtkTable* _tmp219_;
-       LeftLabel* _tmp220_;
-       LeftLabel* _tmp221_;
-       GtkTable* _tmp222_;
-       RightLabel* _tmp223_;
-       GtkTable* _tmp224_;
-       LeftLabel* _tmp225_;
-       LeftLabel* _tmp226_;
-       GtkTable* _tmp227_;
-       RightLabel* _tmp228_;
-       GtkTable* _tmp229_;
-       LeftLabel* _tmp230_;
-       LeftLabel* _tmp231_;
-       GtkTable* _tmp232_;
-       RightLabel* _tmp233_;
-       GtkHButtonBox* _tmp234_;
-       GtkButtonBox* _tmp235_;
-       GtkButtonBox* bbox;
-       GtkButtonBox* _tmp236_;
-       GtkButtonBox* _tmp237_;
-       GtkBox* _tmp238_;
-       GtkButtonBox* _tmp239_;
-       GtkButton* _tmp240_;
-       GtkButton* _tmp241_;
-       GtkButton* _tmp242_;
-       GtkButton* _tmp243_;
-       GtkButton* _tmp244_;
-       GtkButton* _tmp245_;
-       GtkButton* _tmp246_;
-       GtkButton* _tmp247_;
-       GtkButton* _tmp248_;
-       GtkButton* _tmp249_;
-       GtkButton* _tmp250_;
-       GtkButton* _tmp251_;
-       GtkButtonBox* _tmp252_;
-       GtkButton* _tmp253_;
-       GtkButtonBox* _tmp254_;
-       GtkButton* _tmp255_;
-       GtkButtonBox* _tmp256_;
-       GtkButton* _tmp257_;
-       GtkButtonBox* _tmp258_;
-       GtkButton* _tmp259_;
-       GtkHButtonBox* _tmp260_;
-       GtkButtonBox* _tmp261_;
-       GtkButtonBox* _tmp262_;
-       GtkButtonBox* _tmp263_;
-       GtkBox* _tmp264_;
-       GtkButtonBox* _tmp265_;
-       GtkButton* _tmp266_;
-       GtkButton* _tmp267_;
-       GtkButton* _tmp268_;
-       GtkButtonBox* _tmp269_;
-       GtkButton* _tmp270_;
-       GBusType _tmp271_ = 0;
-       gboolean _tmp272_;
-       GBusType _tmp273_;
-       Manager* _tmp274_ = NULL;
-       Manager* _tmp275_;
-       Manager* _tmp276_;
-       Manager* _tmp277_;
-       Manager* _tmp278_;
-       Manager* _tmp279_;
-       Manager* _tmp280_;
-       GError * _inner_error_ = NULL;
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self = (MainWindow*) g_object_new (object_type, NULL);
-#line 119 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = user;
-#line 119 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_) {
-#line 119 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = "systemd User Service Manager";
-#line 1283 "systemadm.c"
-       } else {
-#line 119 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = "systemd System Manager";
-#line 1287 "systemadm.c"
-       }
-#line 119 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = _tmp0_;
-#line 119 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_window_set_title ((GtkWindow*) self, _tmp2_);
-#line 120 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER);
-#line 121 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_window_set_default_size ((GtkWindow*) self, 1000, 700);
-#line 122 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_set_border_width ((GtkContainer*) self, (guint) 12);
-#line 123 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect ((GtkObject*) self, "destroy", (GCallback) _gtk_main_quit_gtk_object_destroy, NULL);
-#line 125 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = (GtkNotebook*) gtk_notebook_new ();
-#line 125 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = g_object_ref_sink (_tmp3_);
-#line 125 "/home/lennart/projects/systemd/src/systemadm.vala"
-       notebook = _tmp4_;
-#line 126 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = notebook;
-#line 126 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_add ((GtkContainer*) self, (GtkWidget*) _tmp5_);
-#line 128 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = (GtkVBox*) gtk_vbox_new (FALSE, 12);
-#line 128 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = (GtkBox*) g_object_ref_sink (_tmp6_);
-#line 128 "/home/lennart/projects/systemd/src/systemadm.vala"
-       unit_vbox = _tmp7_;
-#line 129 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp8_ = notebook;
-#line 129 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = unit_vbox;
-#line 129 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = (GtkLabel*) gtk_label_new ("Units");
-#line 129 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = g_object_ref_sink (_tmp10_);
-#line 129 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_notebook_append_page (_tmp8_, (GtkWidget*) _tmp9_, (GtkWidget*) _tmp11_);
-#line 129 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp11_);
-#line 130 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp12_ = unit_vbox;
-#line 130 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_set_border_width ((GtkContainer*) _tmp12_, (guint) 12);
-#line 132 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp13_ = (GtkVBox*) gtk_vbox_new (FALSE, 12);
-#line 132 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp14_ = (GtkBox*) g_object_ref_sink (_tmp13_);
-#line 132 "/home/lennart/projects/systemd/src/systemadm.vala"
-       job_vbox = _tmp14_;
-#line 133 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp15_ = notebook;
-#line 133 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp16_ = job_vbox;
-#line 133 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp17_ = (GtkLabel*) gtk_label_new ("Jobs");
-#line 133 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp18_ = g_object_ref_sink (_tmp17_);
-#line 133 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_notebook_append_page (_tmp15_, (GtkWidget*) _tmp16_, (GtkWidget*) _tmp18_);
-#line 133 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp18_);
-#line 134 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp19_ = job_vbox;
-#line 134 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_set_border_width ((GtkContainer*) _tmp19_, (guint) 12);
-#line 136 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp20_ = (GtkComboBox*) gtk_combo_box_new_text ();
-#line 136 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp21_ = g_object_ref_sink (_tmp20_);
-#line 136 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_type_combo_box);
-#line 136 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_type_combo_box = _tmp21_;
-#line 137 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp22_ = (GtkHBox*) gtk_hbox_new (FALSE, 6);
-#line 137 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp23_ = (GtkBox*) g_object_ref_sink (_tmp22_);
-#line 137 "/home/lennart/projects/systemd/src/systemadm.vala"
-       type_hbox = _tmp23_;
-#line 138 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp24_ = type_hbox;
-#line 138 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp25_ = self->priv->unit_type_combo_box;
-#line 138 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
-#line 139 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp26_ = unit_vbox;
-#line 139 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp27_ = type_hbox;
-#line 139 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp26_, (GtkWidget*) _tmp27_, FALSE, FALSE, (guint) 0);
-#line 141 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp28_ = self->priv->unit_type_combo_box;
-#line 141 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp28_, "All unit types");
-#line 142 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp29_ = self->priv->unit_type_combo_box;
-#line 142 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp29_, "Targets");
-#line 143 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp30_ = self->priv->unit_type_combo_box;
-#line 143 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp30_, "Services");
-#line 144 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp31_ = self->priv->unit_type_combo_box;
-#line 144 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp31_, "Devices");
-#line 145 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp32_ = self->priv->unit_type_combo_box;
-#line 145 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp32_, "Mounts");
-#line 146 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp33_ = self->priv->unit_type_combo_box;
-#line 146 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp33_, "Automounts");
-#line 147 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp34_ = self->priv->unit_type_combo_box;
-#line 147 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp34_, "Swaps");
-#line 148 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp35_ = self->priv->unit_type_combo_box;
-#line 148 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp35_, "Sockets");
-#line 149 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp36_ = self->priv->unit_type_combo_box;
-#line 149 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp36_, "Paths");
-#line 150 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp37_ = self->priv->unit_type_combo_box;
-#line 150 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp37_, "Timers");
-#line 151 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp38_ = self->priv->unit_type_combo_box;
-#line 151 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_append_text (_tmp38_, "Snapshots");
-#line 152 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp39_ = self->priv->unit_type_combo_box;
-#line 152 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_combo_box_set_active (_tmp39_, 0);
-#line 153 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp40_ = self->priv->unit_type_combo_box;
-#line 153 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp40_, "changed", (GCallback) _main_window_unit_type_changed_gtk_combo_box_changed, self, 0);
-#line 155 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp41_ = (GtkCheckButton*) gtk_check_button_new_with_label ("inactive too");
-#line 155 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp42_ = g_object_ref_sink (_tmp41_);
-#line 155 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->inactive_checkbox);
-#line 155 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->inactive_checkbox = _tmp42_;
-#line 156 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp43_ = self->priv->inactive_checkbox;
-#line 156 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object ((GtkToggleButton*) _tmp43_, "toggled", (GCallback) _main_window_unit_type_changed_gtk_toggle_button_toggled, self, 0);
-#line 157 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp44_ = type_hbox;
-#line 157 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp45_ = self->priv->inactive_checkbox;
-#line 157 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp44_, (GtkWidget*) _tmp45_, FALSE, FALSE, (guint) 0);
-#line 159 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp46_ = (GtkEntry*) gtk_entry_new ();
-#line 159 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp47_ = g_object_ref_sink (_tmp46_);
-#line 159 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_load_entry);
-#line 159 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_load_entry = _tmp47_;
-#line 160 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp48_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Load");
-#line 160 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp49_ = g_object_ref_sink (_tmp48_);
-#line 160 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_load_button);
-#line 160 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_load_button = _tmp49_;
-#line 161 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp50_ = self->priv->unit_load_button;
-#line 161 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp50_, FALSE);
-#line 163 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp51_ = self->priv->unit_load_entry;
-#line 163 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object ((GtkEditable*) _tmp51_, "changed", (GCallback) _main_window_on_unit_load_entry_changed_gtk_editable_changed, self, 0);
-#line 164 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp52_ = self->priv->unit_load_entry;
-#line 164 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp52_, "activate", (GCallback) _main_window_on_unit_load_gtk_entry_activate, self, 0);
-#line 165 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp53_ = self->priv->unit_load_button;
-#line 165 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp53_, "clicked", (GCallback) _main_window_on_unit_load_gtk_button_clicked, self, 0);
-#line 167 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp54_ = (GtkHBox*) gtk_hbox_new (FALSE, 6);
-#line 167 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp55_ = (GtkBox*) g_object_ref_sink (_tmp54_);
-#line 167 "/home/lennart/projects/systemd/src/systemadm.vala"
-       unit_load_hbox = _tmp55_;
-#line 168 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp56_ = unit_load_hbox;
-#line 168 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp57_ = self->priv->unit_load_entry;
-#line 168 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp56_, (GtkWidget*) _tmp57_, FALSE, TRUE, (guint) 0);
-#line 169 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp58_ = unit_load_hbox;
-#line 169 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp59_ = self->priv->unit_load_button;
-#line 169 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp58_, (GtkWidget*) _tmp59_, FALSE, TRUE, (guint) 0);
-#line 171 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp60_ = (GtkButton*) gtk_button_new_with_mnemonic ("Take S_napshot");
-#line 171 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp61_ = g_object_ref_sink (_tmp60_);
-#line 171 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->server_snapshot_button);
-#line 171 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->server_snapshot_button = _tmp61_;
-#line 172 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp62_ = (GtkButton*) gtk_button_new_with_mnemonic ("Reload _Configuration");
-#line 172 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp63_ = g_object_ref_sink (_tmp62_);
-#line 172 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->server_reload_button);
-#line 172 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->server_reload_button = _tmp63_;
-#line 174 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp64_ = self->priv->server_snapshot_button;
-#line 174 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp64_, "clicked", (GCallback) _main_window_on_server_snapshot_gtk_button_clicked, self, 0);
-#line 175 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp65_ = self->priv->server_reload_button;
-#line 175 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp65_, "clicked", (GCallback) _main_window_on_server_reload_gtk_button_clicked, self, 0);
-#line 177 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp66_ = type_hbox;
-#line 177 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp67_ = self->priv->server_snapshot_button;
-#line 177 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_end (_tmp66_, (GtkWidget*) _tmp67_, FALSE, TRUE, (guint) 0);
-#line 178 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp68_ = type_hbox;
-#line 178 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp69_ = self->priv->server_reload_button;
-#line 178 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_end (_tmp68_, (GtkWidget*) _tmp69_, FALSE, TRUE, (guint) 0);
-#line 179 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp70_ = type_hbox;
-#line 179 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp71_ = unit_load_hbox;
-#line 179 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_end (_tmp70_, (GtkWidget*) _tmp71_, FALSE, TRUE, (guint) 24);
-#line 181 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp72_ = gtk_list_store_new (7, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, TYPE_UNIT);
-#line 181 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_model);
-#line 181 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_model = _tmp72_;
-#line 182 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp73_ = gtk_list_store_new (6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, TYPE_JOB, G_TYPE_UINT);
-#line 182 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_model);
-#line 182 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->job_model = _tmp73_;
-#line 184 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp74_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_UNIT, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 184 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_map);
-#line 184 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_map = _tmp74_;
-#line 187 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp75_ = self->priv->unit_model;
-#line 187 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp76_ = (GtkTreeModelFilter*) gtk_tree_model_filter_new ((GtkTreeModel*) _tmp75_, NULL);
-#line 187 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (unit_model_filter);
-#line 187 "/home/lennart/projects/systemd/src/systemadm.vala"
-       unit_model_filter = _tmp76_;
-#line 188 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp77_ = unit_model_filter;
-#line 188 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_filter_set_visible_func (_tmp77_, _main_window_unit_filter_gtk_tree_model_filter_visible_func, g_object_ref (self), g_object_unref);
-#line 190 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp78_ = unit_model_filter;
-#line 190 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp79_ = (GtkTreeModelSort*) gtk_tree_model_sort_new_with_model ((GtkTreeModel*) _tmp78_);
-#line 190 "/home/lennart/projects/systemd/src/systemadm.vala"
-       unit_model_sort = _tmp79_;
-#line 192 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp80_ = unit_model_sort;
-#line 192 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp81_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp80_);
-#line 192 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp82_ = g_object_ref_sink (_tmp81_);
-#line 192 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_view);
-#line 192 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_view = _tmp82_;
-#line 193 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp83_ = self->priv->job_model;
-#line 193 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp84_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp83_);
-#line 193 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp85_ = g_object_ref_sink (_tmp84_);
-#line 193 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_view);
-#line 193 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->job_view = _tmp85_;
-#line 195 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp86_ = self->priv->unit_view;
-#line 195 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp86_, "cursor-changed", (GCallback) _main_window_unit_changed_gtk_tree_view_cursor_changed, self, 0);
-#line 196 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp87_ = self->priv->job_view;
-#line 196 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp87_, "cursor-changed", (GCallback) _main_window_job_changed_gtk_tree_view_cursor_changed, self, 0);
-#line 198 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp88_ = self->priv->unit_view;
-#line 198 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp88_, 2, "Load State");
-#line 199 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp89_ = self->priv->unit_view;
-#line 199 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp89_, 3, "Active State");
-#line 200 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp90_ = self->priv->unit_view;
-#line 200 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp90_, 4, "Unit State");
-#line 201 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp91_ = self->priv->unit_view;
-#line 201 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp91_, 0, "Unit");
-#line 202 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp92_ = self->priv->unit_view;
-#line 202 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp92_, 5, "Job");
-#line 204 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp93_ = self->priv->job_view;
-#line 204 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp93_, 0, "Job");
-#line 205 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp94_ = self->priv->job_view;
-#line 205 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp94_, 1, "Unit");
-#line 206 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp95_ = self->priv->job_view;
-#line 206 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp95_, 2, "Type");
-#line 207 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp96_ = self->priv->job_view;
-#line 207 "/home/lennart/projects/systemd/src/systemadm.vala"
-       new_column (_tmp96_, 3, "State");
-#line 209 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp97_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 209 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp98_ = g_object_ref_sink (_tmp97_);
-#line 209 "/home/lennart/projects/systemd/src/systemadm.vala"
-       scroll = _tmp98_;
-#line 210 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp99_ = scroll;
-#line 210 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_scrolled_window_set_policy (_tmp99_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 211 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp100_ = scroll;
-#line 211 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_scrolled_window_set_shadow_type (_tmp100_, GTK_SHADOW_IN);
-#line 212 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp101_ = scroll;
-#line 212 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp102_ = self->priv->unit_view;
-#line 212 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_add ((GtkContainer*) _tmp101_, (GtkWidget*) _tmp102_);
-#line 213 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp103_ = unit_vbox;
-#line 213 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp104_ = scroll;
-#line 213 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp103_, (GtkWidget*) _tmp104_, TRUE, TRUE, (guint) 0);
-#line 215 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp105_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 215 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp106_ = g_object_ref_sink (_tmp105_);
-#line 215 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (scroll);
-#line 215 "/home/lennart/projects/systemd/src/systemadm.vala"
-       scroll = _tmp106_;
-#line 216 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp107_ = scroll;
-#line 216 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_scrolled_window_set_policy (_tmp107_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 217 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp108_ = scroll;
-#line 217 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_scrolled_window_set_shadow_type (_tmp108_, GTK_SHADOW_IN);
-#line 218 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp109_ = scroll;
-#line 218 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp110_ = self->priv->job_view;
-#line 218 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_add ((GtkContainer*) _tmp109_, (GtkWidget*) _tmp110_);
-#line 219 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp111_ = job_vbox;
-#line 219 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp112_ = scroll;
-#line 219 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp111_, (GtkWidget*) _tmp112_, TRUE, TRUE, (guint) 0);
-#line 221 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp113_ = right_label_new (NULL);
-#line 221 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp114_ = g_object_ref_sink (_tmp113_);
-#line 221 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_id_label);
-#line 221 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_id_label = _tmp114_;
-#line 222 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp115_ = right_label_new (NULL);
-#line 222 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp116_ = g_object_ref_sink (_tmp115_);
-#line 222 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_dependency_label);
-#line 222 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_dependency_label = _tmp116_;
-#line 223 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp117_ = right_label_new (NULL);
-#line 223 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp118_ = g_object_ref_sink (_tmp117_);
-#line 223 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_description_label);
-#line 223 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_description_label = _tmp118_;
-#line 224 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp119_ = right_label_new (NULL);
-#line 224 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp120_ = g_object_ref_sink (_tmp119_);
-#line 224 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_load_state_label);
-#line 224 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_load_state_label = _tmp120_;
-#line 225 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp121_ = right_label_new (NULL);
-#line 225 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp122_ = g_object_ref_sink (_tmp121_);
-#line 225 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_active_state_label);
-#line 225 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_active_state_label = _tmp122_;
-#line 226 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp123_ = right_label_new (NULL);
-#line 226 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp124_ = g_object_ref_sink (_tmp123_);
-#line 226 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_sub_state_label);
-#line 226 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_sub_state_label = _tmp124_;
-#line 227 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp125_ = right_label_new (NULL);
-#line 227 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp126_ = g_object_ref_sink (_tmp125_);
-#line 227 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_fragment_path_label);
-#line 227 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_fragment_path_label = _tmp126_;
-#line 228 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp127_ = right_label_new (NULL);
-#line 228 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp128_ = g_object_ref_sink (_tmp127_);
-#line 228 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_active_enter_timestamp_label);
-#line 228 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_active_enter_timestamp_label = _tmp128_;
-#line 229 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp129_ = right_label_new (NULL);
-#line 229 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp130_ = g_object_ref_sink (_tmp129_);
-#line 229 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_active_exit_timestamp_label);
-#line 229 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_active_exit_timestamp_label = _tmp130_;
-#line 230 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp131_ = right_label_new (NULL);
-#line 230 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp132_ = g_object_ref_sink (_tmp131_);
-#line 230 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_can_start_label);
-#line 230 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_can_start_label = _tmp132_;
-#line 231 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp133_ = right_label_new (NULL);
-#line 231 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp134_ = g_object_ref_sink (_tmp133_);
-#line 231 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_can_reload_label);
-#line 231 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_can_reload_label = _tmp134_;
-#line 232 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp135_ = right_label_new (NULL);
-#line 232 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp136_ = g_object_ref_sink (_tmp135_);
-#line 232 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_cgroup_label);
-#line 232 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->unit_cgroup_label = _tmp136_;
-#line 234 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp137_ = right_label_new (NULL);
-#line 234 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp138_ = g_object_ref_sink (_tmp137_);
-#line 234 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_id_label);
-#line 234 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->job_id_label = _tmp138_;
-#line 235 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp139_ = right_label_new (NULL);
-#line 235 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp140_ = g_object_ref_sink (_tmp139_);
-#line 235 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_state_label);
-#line 235 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->job_state_label = _tmp140_;
-#line 236 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp141_ = right_label_new (NULL);
-#line 236 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp142_ = g_object_ref_sink (_tmp141_);
-#line 236 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_type_label);
-#line 236 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->job_type_label = _tmp142_;
-#line 238 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp143_ = self->priv->unit_dependency_label;
-#line 238 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_label_set_track_visited_links ((GtkLabel*) _tmp143_, FALSE);
-#line 239 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp144_ = self->priv->unit_dependency_label;
-#line 239 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_label_set_selectable ((GtkLabel*) _tmp144_, TRUE);
-#line 240 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp145_ = self->priv->unit_dependency_label;
-#line 240 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object ((GtkLabel*) _tmp145_, "activate-link", (GCallback) _main_window_on_activate_link_gtk_label_activate_link, self, 0);
-#line 242 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp146_ = self->priv->unit_fragment_path_label;
-#line 242 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_label_set_track_visited_links ((GtkLabel*) _tmp146_, FALSE);
-#line 244 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp147_ = (GtkTable*) gtk_table_new ((guint) 8, (guint) 6, FALSE);
-#line 244 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp148_ = g_object_ref_sink (_tmp147_);
-#line 244 "/home/lennart/projects/systemd/src/systemadm.vala"
-       unit_table = _tmp148_;
-#line 245 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp149_ = unit_table;
-#line 245 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_set_row_spacings (_tmp149_, (guint) 6);
-#line 246 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp150_ = unit_table;
-#line 246 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_set_border_width ((GtkContainer*) _tmp150_, (guint) 0);
-#line 247 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp151_ = unit_vbox;
-#line 247 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp152_ = unit_table;
-#line 247 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp151_, (GtkWidget*) _tmp152_, FALSE, TRUE, (guint) 0);
-#line 249 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp153_ = (GtkTable*) gtk_table_new ((guint) 2, (guint) 2, FALSE);
-#line 249 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp154_ = g_object_ref_sink (_tmp153_);
-#line 249 "/home/lennart/projects/systemd/src/systemadm.vala"
-       job_table = _tmp154_;
-#line 250 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp155_ = job_table;
-#line 250 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_set_row_spacings (_tmp155_, (guint) 6);
-#line 251 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp156_ = job_table;
-#line 251 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_container_set_border_width ((GtkContainer*) _tmp156_, (guint) 0);
-#line 252 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp157_ = job_vbox;
-#line 252 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp158_ = job_table;
-#line 252 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp157_, (GtkWidget*) _tmp158_, FALSE, TRUE, (guint) 0);
-#line 254 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp159_ = unit_table;
-#line 254 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp160_ = left_label_new ("Id:");
-#line 254 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp161_ = g_object_ref_sink (_tmp160_);
-#line 254 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp159_, (GtkWidget*) _tmp161_, (guint) 0, (guint) 1, (guint) 0, (guint) 1, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 254 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp161_);
-#line 255 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp162_ = unit_table;
-#line 255 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp163_ = self->priv->unit_id_label;
-#line 255 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp162_, (GtkWidget*) _tmp163_, (guint) 1, (guint) 6, (guint) 0, (guint) 1, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 256 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp164_ = unit_table;
-#line 256 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp165_ = left_label_new ("Description:");
-#line 256 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp166_ = g_object_ref_sink (_tmp165_);
-#line 256 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp164_, (GtkWidget*) _tmp166_, (guint) 0, (guint) 1, (guint) 1, (guint) 2, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 256 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp166_);
-#line 257 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp167_ = unit_table;
-#line 257 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp168_ = self->priv->unit_description_label;
-#line 257 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp167_, (GtkWidget*) _tmp168_, (guint) 1, (guint) 6, (guint) 1, (guint) 2, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 258 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp169_ = unit_table;
-#line 258 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp170_ = left_label_new ("Dependencies:");
-#line 258 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp171_ = g_object_ref_sink (_tmp170_);
-#line 258 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp169_, (GtkWidget*) _tmp171_, (guint) 0, (guint) 1, (guint) 2, (guint) 3, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 258 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp171_);
-#line 259 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp172_ = unit_table;
-#line 259 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp173_ = self->priv->unit_dependency_label;
-#line 259 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp172_, (GtkWidget*) _tmp173_, (guint) 1, (guint) 6, (guint) 2, (guint) 3, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 260 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp174_ = unit_table;
-#line 260 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp175_ = left_label_new ("Fragment Path:");
-#line 260 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp176_ = g_object_ref_sink (_tmp175_);
-#line 260 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp174_, (GtkWidget*) _tmp176_, (guint) 0, (guint) 1, (guint) 3, (guint) 4, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 260 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp176_);
-#line 261 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp177_ = unit_table;
-#line 261 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp178_ = self->priv->unit_fragment_path_label;
-#line 261 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp177_, (GtkWidget*) _tmp178_, (guint) 1, (guint) 6, (guint) 3, (guint) 4, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 262 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp179_ = unit_table;
-#line 262 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp180_ = left_label_new ("Control Group:");
-#line 262 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp181_ = g_object_ref_sink (_tmp180_);
-#line 262 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp179_, (GtkWidget*) _tmp181_, (guint) 0, (guint) 1, (guint) 4, (guint) 5, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 262 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp181_);
-#line 263 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp182_ = unit_table;
-#line 263 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp183_ = self->priv->unit_cgroup_label;
-#line 263 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp182_, (GtkWidget*) _tmp183_, (guint) 1, (guint) 6, (guint) 4, (guint) 5, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 265 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp184_ = unit_table;
-#line 265 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp185_ = left_label_new ("Load State:");
-#line 265 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp186_ = g_object_ref_sink (_tmp185_);
-#line 265 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp184_, (GtkWidget*) _tmp186_, (guint) 0, (guint) 1, (guint) 5, (guint) 6, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 265 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp186_);
-#line 266 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp187_ = unit_table;
-#line 266 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp188_ = self->priv->unit_load_state_label;
-#line 266 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp187_, (GtkWidget*) _tmp188_, (guint) 1, (guint) 2, (guint) 5, (guint) 6, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 267 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp189_ = unit_table;
-#line 267 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp190_ = left_label_new ("Active State:");
-#line 267 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp191_ = g_object_ref_sink (_tmp190_);
-#line 267 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp189_, (GtkWidget*) _tmp191_, (guint) 0, (guint) 1, (guint) 6, (guint) 7, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 267 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp191_);
-#line 268 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp192_ = unit_table;
-#line 268 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp193_ = self->priv->unit_active_state_label;
-#line 268 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp192_, (GtkWidget*) _tmp193_, (guint) 1, (guint) 2, (guint) 6, (guint) 7, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 269 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp194_ = unit_table;
-#line 269 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp195_ = left_label_new ("Unit State:");
-#line 269 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp196_ = g_object_ref_sink (_tmp195_);
-#line 269 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp194_, (GtkWidget*) _tmp196_, (guint) 0, (guint) 1, (guint) 7, (guint) 8, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 269 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp196_);
-#line 270 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp197_ = unit_table;
-#line 270 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp198_ = self->priv->unit_sub_state_label;
-#line 270 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp197_, (GtkWidget*) _tmp198_, (guint) 1, (guint) 2, (guint) 7, (guint) 8, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 272 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp199_ = unit_table;
-#line 272 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp200_ = left_label_new ("Activated:");
-#line 272 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp201_ = g_object_ref_sink (_tmp200_);
-#line 272 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp199_, (GtkWidget*) _tmp201_, (guint) 2, (guint) 3, (guint) 6, (guint) 7, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 272 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp201_);
-#line 273 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp202_ = unit_table;
-#line 273 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp203_ = self->priv->unit_active_enter_timestamp_label;
-#line 273 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp202_, (GtkWidget*) _tmp203_, (guint) 3, (guint) 4, (guint) 6, (guint) 7, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 274 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp204_ = unit_table;
-#line 274 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp205_ = left_label_new ("Deactivated:");
-#line 274 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp206_ = g_object_ref_sink (_tmp205_);
-#line 274 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp204_, (GtkWidget*) _tmp206_, (guint) 2, (guint) 3, (guint) 7, (guint) 8, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 274 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp206_);
-#line 275 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp207_ = unit_table;
-#line 275 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp208_ = self->priv->unit_active_exit_timestamp_label;
-#line 275 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp207_, (GtkWidget*) _tmp208_, (guint) 3, (guint) 4, (guint) 7, (guint) 8, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 277 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp209_ = unit_table;
-#line 277 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp210_ = left_label_new ("Can Start/Stop:");
-#line 277 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp211_ = g_object_ref_sink (_tmp210_);
-#line 277 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp209_, (GtkWidget*) _tmp211_, (guint) 4, (guint) 5, (guint) 6, (guint) 7, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 277 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp211_);
-#line 278 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp212_ = unit_table;
-#line 278 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp213_ = self->priv->unit_can_start_label;
-#line 278 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp212_, (GtkWidget*) _tmp213_, (guint) 5, (guint) 6, (guint) 6, (guint) 7, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 279 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp214_ = unit_table;
-#line 279 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp215_ = left_label_new ("Can Reload:");
-#line 279 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp216_ = g_object_ref_sink (_tmp215_);
-#line 279 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp214_, (GtkWidget*) _tmp216_, (guint) 4, (guint) 5, (guint) 7, (guint) 8, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 279 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp216_);
-#line 280 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp217_ = unit_table;
-#line 280 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp218_ = self->priv->unit_can_reload_label;
-#line 280 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp217_, (GtkWidget*) _tmp218_, (guint) 5, (guint) 6, (guint) 7, (guint) 8, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 282 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp219_ = job_table;
-#line 282 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp220_ = left_label_new ("Id:");
-#line 282 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp221_ = g_object_ref_sink (_tmp220_);
-#line 282 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp219_, (GtkWidget*) _tmp221_, (guint) 0, (guint) 1, (guint) 0, (guint) 1, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 282 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp221_);
-#line 283 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp222_ = job_table;
-#line 283 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp223_ = self->priv->job_id_label;
-#line 283 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp222_, (GtkWidget*) _tmp223_, (guint) 1, (guint) 2, (guint) 0, (guint) 1, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 284 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp224_ = job_table;
-#line 284 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp225_ = left_label_new ("State:");
-#line 284 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp226_ = g_object_ref_sink (_tmp225_);
-#line 284 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp224_, (GtkWidget*) _tmp226_, (guint) 0, (guint) 1, (guint) 1, (guint) 2, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 284 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp226_);
-#line 285 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp227_ = job_table;
-#line 285 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp228_ = self->priv->job_state_label;
-#line 285 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp227_, (GtkWidget*) _tmp228_, (guint) 1, (guint) 2, (guint) 1, (guint) 2, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 286 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp229_ = job_table;
-#line 286 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp230_ = left_label_new ("Type:");
-#line 286 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp231_ = g_object_ref_sink (_tmp230_);
-#line 286 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp229_, (GtkWidget*) _tmp231_, (guint) 0, (guint) 1, (guint) 2, (guint) 3, GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 286 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (_tmp231_);
-#line 287 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp232_ = job_table;
-#line 287 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp233_ = self->priv->job_type_label;
-#line 287 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_table_attach (_tmp232_, (GtkWidget*) _tmp233_, (guint) 1, (guint) 2, (guint) 2, (guint) 3, GTK_EXPAND | GTK_FILL, GTK_FILL, (guint) 0, (guint) 0);
-#line 289 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp234_ = (GtkHButtonBox*) gtk_hbutton_box_new ();
-#line 289 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp235_ = (GtkButtonBox*) g_object_ref_sink (_tmp234_);
-#line 289 "/home/lennart/projects/systemd/src/systemadm.vala"
-       bbox = _tmp235_;
-#line 290 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp236_ = bbox;
-#line 290 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_button_box_set_layout (_tmp236_, GTK_BUTTONBOX_START);
-#line 291 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp237_ = bbox;
-#line 291 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_set_spacing ((GtkBox*) _tmp237_, 6);
-#line 292 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp238_ = unit_vbox;
-#line 292 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp239_ = bbox;
-#line 292 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp238_, (GtkWidget*) _tmp239_, FALSE, TRUE, (guint) 0);
-#line 294 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp240_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Start");
-#line 294 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp241_ = g_object_ref_sink (_tmp240_);
-#line 294 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->start_button);
-#line 294 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->start_button = _tmp241_;
-#line 295 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp242_ = (GtkButton*) gtk_button_new_with_mnemonic ("Sto_p");
-#line 295 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp243_ = g_object_ref_sink (_tmp242_);
-#line 295 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->stop_button);
-#line 295 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->stop_button = _tmp243_;
-#line 296 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp244_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Reload");
-#line 296 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp245_ = g_object_ref_sink (_tmp244_);
-#line 296 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->reload_button);
-#line 296 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->reload_button = _tmp245_;
-#line 297 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp246_ = (GtkButton*) gtk_button_new_with_mnemonic ("Res_tart");
-#line 297 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp247_ = g_object_ref_sink (_tmp246_);
-#line 297 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->restart_button);
-#line 297 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->restart_button = _tmp247_;
-#line 299 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp248_ = self->priv->start_button;
-#line 299 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp248_, "clicked", (GCallback) _main_window_on_start_gtk_button_clicked, self, 0);
-#line 300 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp249_ = self->priv->stop_button;
-#line 300 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp249_, "clicked", (GCallback) _main_window_on_stop_gtk_button_clicked, self, 0);
-#line 301 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp250_ = self->priv->reload_button;
-#line 301 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp250_, "clicked", (GCallback) _main_window_on_reload_gtk_button_clicked, self, 0);
-#line 302 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp251_ = self->priv->restart_button;
-#line 302 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp251_, "clicked", (GCallback) _main_window_on_restart_gtk_button_clicked, self, 0);
-#line 304 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp252_ = bbox;
-#line 304 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp253_ = self->priv->start_button;
-#line 304 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start ((GtkBox*) _tmp252_, (GtkWidget*) _tmp253_, FALSE, TRUE, (guint) 0);
-#line 305 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp254_ = bbox;
-#line 305 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp255_ = self->priv->stop_button;
-#line 305 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start ((GtkBox*) _tmp254_, (GtkWidget*) _tmp255_, FALSE, TRUE, (guint) 0);
-#line 306 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp256_ = bbox;
-#line 306 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp257_ = self->priv->restart_button;
-#line 306 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start ((GtkBox*) _tmp256_, (GtkWidget*) _tmp257_, FALSE, TRUE, (guint) 0);
-#line 307 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp258_ = bbox;
-#line 307 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp259_ = self->priv->reload_button;
-#line 307 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start ((GtkBox*) _tmp258_, (GtkWidget*) _tmp259_, FALSE, TRUE, (guint) 0);
-#line 309 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp260_ = (GtkHButtonBox*) gtk_hbutton_box_new ();
-#line 309 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp261_ = (GtkButtonBox*) g_object_ref_sink (_tmp260_);
-#line 309 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (bbox);
-#line 309 "/home/lennart/projects/systemd/src/systemadm.vala"
-       bbox = _tmp261_;
-#line 310 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp262_ = bbox;
-#line 310 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_button_box_set_layout (_tmp262_, GTK_BUTTONBOX_START);
-#line 311 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp263_ = bbox;
-#line 311 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_set_spacing ((GtkBox*) _tmp263_, 6);
-#line 312 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp264_ = job_vbox;
-#line 312 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp265_ = bbox;
-#line 312 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start (_tmp264_, (GtkWidget*) _tmp265_, FALSE, TRUE, (guint) 0);
-#line 314 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp266_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 314 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp267_ = g_object_ref_sink (_tmp266_);
-#line 314 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->cancel_button);
-#line 314 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->cancel_button = _tmp267_;
-#line 316 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp268_ = self->priv->cancel_button;
-#line 316 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp268_, "clicked", (GCallback) _main_window_on_cancel_gtk_button_clicked, self, 0);
-#line 318 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp269_ = bbox;
-#line 318 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp270_ = self->priv->cancel_button;
-#line 318 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_box_pack_start ((GtkBox*) _tmp269_, (GtkWidget*) _tmp270_, FALSE, TRUE, (guint) 0);
-#line 321 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp272_ = user;
-#line 321 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp272_) {
-#line 321 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp271_ = G_BUS_TYPE_SESSION;
-#line 2251 "systemadm.c"
-       } else {
-#line 321 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp271_ = G_BUS_TYPE_SYSTEM;
-#line 2255 "systemadm.c"
-       }
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp273_ = _tmp271_;
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp274_ = g_initable_new (TYPE_MANAGER_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp273_, "g-object-path", "/org/freedesktop/systemd1", "g-interface-name", "org.freedesktop.systemd1.Manager", NULL);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp275_ = (Manager*) _tmp274_;
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_->domain == G_IO_ERROR) {
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (self);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2295 "systemadm.c"
-               } else {
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_clear_error (&_inner_error_);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2325 "systemadm.c"
-               }
-       }
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->manager);
-#line 320 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->manager = _tmp275_;
-#line 325 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp276_ = self->priv->manager;
-#line 325 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp276_, "unit-new", (GCallback) _main_window_on_unit_new_manager_unit_new, self, 0);
-#line 326 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp277_ = self->priv->manager;
-#line 326 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp277_, "job-new", (GCallback) _main_window_on_job_new_manager_job_new, self, 0);
-#line 327 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp278_ = self->priv->manager;
-#line 327 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp278_, "unit-removed", (GCallback) _main_window_on_unit_removed_manager_unit_removed, self, 0);
-#line 328 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp279_ = self->priv->manager;
-#line 328 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_signal_connect_object (_tmp279_, "job-removed", (GCallback) _main_window_on_job_removed_manager_job_removed, self, 0);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp280_ = self->priv->manager;
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-       manager_subscribe (_tmp280_, &_inner_error_);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_->domain == G_IO_ERROR) {
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (self);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2384 "systemadm.c"
-               } else {
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_clear_error (&_inner_error_);
-#line 330 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2414 "systemadm.c"
-               }
-       }
-#line 332 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_clear_unit (self);
-#line 333 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_clear_job (self);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_populate_unit_model (self, &_inner_error_);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_->domain == G_IO_ERROR) {
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (self);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2455 "systemadm.c"
-               } else {
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_clear_error (&_inner_error_);
-#line 334 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2485 "systemadm.c"
-               }
-       }
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_populate_job_model (self, &_inner_error_);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_->domain == G_IO_ERROR) {
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (self);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2522 "systemadm.c"
-               } else {
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (bbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_table);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_table);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (scroll);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_sort);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_model_filter);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_load_hbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (type_hbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (job_vbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (unit_vbox);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (notebook);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_clear_error (&_inner_error_);
-#line 335 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return NULL;
-#line 2552 "systemadm.c"
-               }
-       }
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (bbox);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (job_table);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (unit_table);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (scroll);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (unit_model_sort);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (unit_model_filter);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (unit_load_hbox);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (type_hbox);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (job_vbox);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (unit_vbox);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (notebook);
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return self;
-#line 2579 "systemadm.c"
-}
-
-
-MainWindow* main_window_new (GError** error) {
-#line 118 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return main_window_construct (TYPE_MAIN_WINDOW, error);
-#line 2586 "systemadm.c"
-}
-
-
-static void _vala_ManagerUnitInfo_array_free (ManagerUnitInfo* array, gint array_length) {
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (array != NULL) {
-#line 2593 "systemadm.c"
-               int i;
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-               for (i = 0; i < array_length; i = i + 1) {
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       manager_unit_info_destroy (&array[i]);
-#line 2599 "systemadm.c"
-               }
-       }
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_free (array);
-#line 2604 "systemadm.c"
-}
-
-
-static void _main_window_on_unit_changed_properties_properties_changed (Properties* _sender, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1, gpointer self) {
-#line 351 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_unit_changed (self, _sender, iface, changed_properties, invalidated_properties, invalidated_properties_length1);
-#line 2611 "systemadm.c"
-}
-
-
-void main_window_populate_unit_model (MainWindow* self, GError** error) {
-       GtkListStore* _tmp0_;
-       Manager* _tmp1_;
-       gint _tmp2_ = 0;
-       ManagerUnitInfo* _tmp3_ = NULL;
-       ManagerUnitInfo* list;
-       gint list_length1;
-       gint _list_size_;
-       ManagerUnitInfo* _tmp4_;
-       gint _tmp4__length1;
-       GError * _inner_error_ = NULL;
-#line 338 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 339 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_model;
-#line 339 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_list_store_clear (_tmp0_);
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = self->priv->manager;
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = manager_list_units (_tmp1_, &_tmp2_, &_inner_error_);
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-       list = _tmp3_;
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-       list_length1 = _tmp2_;
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _list_size_ = list_length1;
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_->domain == G_IO_ERROR) {
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return;
-#line 2650 "systemadm.c"
-               } else {
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_clear_error (&_inner_error_);
-#line 341 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return;
-#line 2658 "systemadm.c"
-               }
-       }
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = list;
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4__length1 = list_length1;
-#line 2665 "systemadm.c"
-       {
-               ManagerUnitInfo* i_collection = NULL;
-               gint i_collection_length1 = 0;
-               gint _i_collection_size_ = 0;
-               gint i_it = 0;
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection = _tmp4_;
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection_length1 = _tmp4__length1;
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-               for (i_it = 0; i_it < _tmp4__length1; i_it = i_it + 1) {
-#line 2677 "systemadm.c"
-                       ManagerUnitInfo _tmp5_ = {0};
-                       ManagerUnitInfo i = {0};
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       manager_unit_info_copy (&i_collection[i_it], &_tmp5_);
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       i = _tmp5_;
-#line 2684 "systemadm.c"
-                       {
-                               GtkTreeIter iter = {0};
-                               GBusType _tmp6_ = 0;
-                               gboolean _tmp7_;
-                               GBusType _tmp8_;
-                               ManagerUnitInfo _tmp9_;
-                               const char* _tmp10_;
-                               Properties* _tmp11_ = NULL;
-                               Properties* p;
-                               Properties* _tmp12_;
-                               GBusType _tmp13_ = 0;
-                               gboolean _tmp14_;
-                               GBusType _tmp15_;
-                               ManagerUnitInfo _tmp16_;
-                               const char* _tmp17_;
-                               Unit* _tmp18_ = NULL;
-                               Unit* u;
-                               GeeHashMap* _tmp19_;
-                               ManagerUnitInfo _tmp20_;
-                               const gchar* _tmp21_;
-                               Unit* _tmp22_;
-                               GtkListStore* _tmp23_;
-                               GtkTreeIter _tmp24_ = {0};
-                               gchar* _tmp25_ = NULL;
-                               ManagerUnitInfo _tmp26_;
-                               const gchar* _tmp27_;
-                               GtkListStore* _tmp32_;
-                               GtkTreeIter _tmp33_;
-                               ManagerUnitInfo _tmp34_;
-                               const gchar* _tmp35_;
-                               ManagerUnitInfo _tmp36_;
-                               const gchar* _tmp37_;
-                               ManagerUnitInfo _tmp38_;
-                               const gchar* _tmp39_;
-                               ManagerUnitInfo _tmp40_;
-                               const gchar* _tmp41_;
-                               ManagerUnitInfo _tmp42_;
-                               const gchar* _tmp43_;
-                               const gchar* _tmp44_;
-                               Unit* _tmp45_;
-#line 347 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp7_ = user;
-#line 347 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp7_) {
-#line 347 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp6_ = G_BUS_TYPE_SESSION;
-#line 2731 "systemadm.c"
-                               } else {
-#line 347 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp6_ = G_BUS_TYPE_SYSTEM;
-#line 2735 "systemadm.c"
-                               }
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp8_ = _tmp6_;
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp9_ = i;
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp10_ = _tmp9_.unit_path;
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp11_ = g_initable_new (TYPE_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp8_, "g-object-path", (const gchar*) _tmp10_, "g-interface-name", "org.freedesktop.Properties", NULL);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               p = (Properties*) _tmp11_;
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_inner_error_ != NULL) {
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (_inner_error_->domain == G_IO_ERROR) {
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_propagate_error (error, _inner_error_);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_unit_info_destroy (&i);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerUnitInfo_array_free (list, list_length1), NULL);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 2759 "systemadm.c"
-                                       } else {
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_unit_info_destroy (&i);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerUnitInfo_array_free (list, list_length1), NULL);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_clear_error (&_inner_error_);
-#line 346 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 2771 "systemadm.c"
-                                       }
-                               }
-#line 351 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp12_ = p;
-#line 351 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               g_signal_connect_object (_tmp12_, "properties-changed", (GCallback) _main_window_on_unit_changed_properties_properties_changed, self, 0);
-#line 354 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = user;
-#line 354 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp14_) {
-#line 354 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp13_ = G_BUS_TYPE_SESSION;
-#line 2784 "systemadm.c"
-                               } else {
-#line 354 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp13_ = G_BUS_TYPE_SYSTEM;
-#line 2788 "systemadm.c"
-                               }
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp15_ = _tmp13_;
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp16_ = i;
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp17_ = _tmp16_.unit_path;
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp18_ = g_initable_new (TYPE_UNIT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp15_, "g-object-path", (const gchar*) _tmp17_, "g-interface-name", "org.freedesktop.systemd1.Unit", NULL);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               u = (Unit*) _tmp18_;
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_inner_error_ != NULL) {
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (_inner_error_->domain == G_IO_ERROR) {
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_propagate_error (error, _inner_error_);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               _g_object_unref0 (p);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_unit_info_destroy (&i);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerUnitInfo_array_free (list, list_length1), NULL);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 2814 "systemadm.c"
-                                       } else {
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               _g_object_unref0 (p);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_unit_info_destroy (&i);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerUnitInfo_array_free (list, list_length1), NULL);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_clear_error (&_inner_error_);
-#line 353 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 2828 "systemadm.c"
-                                       }
-                               }
-#line 358 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp19_ = self->priv->unit_map;
-#line 358 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp20_ = i;
-#line 358 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp21_ = _tmp20_.id;
-#line 358 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp22_ = u;
-#line 358 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gee_abstract_map_set ((GeeAbstractMap*) _tmp19_, _tmp21_, _tmp22_);
-#line 360 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp23_ = self->priv->unit_model;
-#line 360 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_list_store_append (_tmp23_, &_tmp24_);
-#line 360 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               iter = _tmp24_;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp26_ = i;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp27_ = _tmp26_.job_type;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 2853 "systemadm.c"
-                                       ManagerUnitInfo _tmp28_;
-                                       const gchar* _tmp29_;
-                                       gchar* _tmp30_ = NULL;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp28_ = i;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp29_ = _tmp28_.job_type;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp30_ = g_strdup_printf ("→ %s", _tmp29_);
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _g_free0 (_tmp25_);
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp25_ = _tmp30_;
-#line 2867 "systemadm.c"
-                               } else {
-                                       gchar* _tmp31_;
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp31_ = g_strdup ("");
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _g_free0 (_tmp25_);
-#line 367 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp25_ = _tmp31_;
-#line 2876 "systemadm.c"
-                               }
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp32_ = self->priv->unit_model;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp33_ = iter;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp34_ = i;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp35_ = _tmp34_.id;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp36_ = i;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp37_ = _tmp36_.description;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp38_ = i;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp39_ = _tmp38_.load_state;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp40_ = i;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp41_ = _tmp40_.active_state;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp42_ = i;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp43_ = _tmp42_.sub_state;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp44_ = _tmp25_;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp45_ = u;
-#line 361 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_list_store_set (_tmp32_, &_tmp33_, 0, _tmp35_, 1, _tmp37_, 2, _tmp39_, 3, _tmp41_, 4, _tmp43_, 5, _tmp44_, 6, _tmp45_, -1);
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (_tmp25_);
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_object_unref0 (u);
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_object_unref0 (p);
-#line 343 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               manager_unit_info_destroy (&i);
-#line 2916 "systemadm.c"
-                       }
-               }
-       }
-#line 338 "/home/lennart/projects/systemd/src/systemadm.vala"
-       list = (_vala_ManagerUnitInfo_array_free (list, list_length1), NULL);
-#line 2922 "systemadm.c"
-}
-
-
-static void _vala_ManagerJobInfo_array_free (ManagerJobInfo* array, gint array_length) {
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (array != NULL) {
-#line 2929 "systemadm.c"
-               int i;
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-               for (i = 0; i < array_length; i = i + 1) {
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       manager_job_info_destroy (&array[i]);
-#line 2935 "systemadm.c"
-               }
-       }
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_free (array);
-#line 2940 "systemadm.c"
-}
-
-
-static void _main_window_on_job_changed_properties_properties_changed (Properties* _sender, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1, gpointer self) {
-#line 385 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_on_job_changed (self, _sender, iface, changed_properties, invalidated_properties, invalidated_properties_length1);
-#line 2947 "systemadm.c"
-}
-
-
-void main_window_populate_job_model (MainWindow* self, GError** error) {
-       GtkListStore* _tmp0_;
-       Manager* _tmp1_;
-       gint _tmp2_ = 0;
-       ManagerJobInfo* _tmp3_ = NULL;
-       ManagerJobInfo* list;
-       gint list_length1;
-       gint _list_size_;
-       ManagerJobInfo* _tmp4_;
-       gint _tmp4__length1;
-       GError * _inner_error_ = NULL;
-#line 372 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 373 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->job_model;
-#line 373 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_list_store_clear (_tmp0_);
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = self->priv->manager;
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = manager_list_jobs (_tmp1_, &_tmp2_, &_inner_error_);
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-       list = _tmp3_;
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-       list_length1 = _tmp2_;
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _list_size_ = list_length1;
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_->domain == G_IO_ERROR) {
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_propagate_error (error, _inner_error_);
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return;
-#line 2986 "systemadm.c"
-               } else {
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_clear_error (&_inner_error_);
-#line 375 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return;
-#line 2994 "systemadm.c"
-               }
-       }
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = list;
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4__length1 = list_length1;
-#line 3001 "systemadm.c"
-       {
-               ManagerJobInfo* i_collection = NULL;
-               gint i_collection_length1 = 0;
-               gint _i_collection_size_ = 0;
-               gint i_it = 0;
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection = _tmp4_;
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection_length1 = _tmp4__length1;
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-               for (i_it = 0; i_it < _tmp4__length1; i_it = i_it + 1) {
-#line 3013 "systemadm.c"
-                       ManagerJobInfo _tmp5_ = {0};
-                       ManagerJobInfo i = {0};
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       manager_job_info_copy (&i_collection[i_it], &_tmp5_);
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       i = _tmp5_;
-#line 3020 "systemadm.c"
-                       {
-                               GtkTreeIter iter = {0};
-                               GBusType _tmp6_ = 0;
-                               gboolean _tmp7_;
-                               GBusType _tmp8_;
-                               ManagerJobInfo _tmp9_;
-                               const char* _tmp10_;
-                               Properties* _tmp11_ = NULL;
-                               Properties* p;
-                               Properties* _tmp12_;
-                               GBusType _tmp13_ = 0;
-                               gboolean _tmp14_;
-                               GBusType _tmp15_;
-                               ManagerJobInfo _tmp16_;
-                               const char* _tmp17_;
-                               Job* _tmp18_ = NULL;
-                               Job* j;
-                               GtkListStore* _tmp19_;
-                               GtkTreeIter _tmp20_ = {0};
-                               GtkListStore* _tmp21_;
-                               GtkTreeIter _tmp22_;
-                               ManagerJobInfo _tmp23_;
-                               guint32 _tmp24_;
-                               gchar* _tmp25_ = NULL;
-                               gchar* _tmp26_;
-                               ManagerJobInfo _tmp27_;
-                               const gchar* _tmp28_;
-                               ManagerJobInfo _tmp29_;
-                               const gchar* _tmp30_;
-                               gchar* _tmp31_ = NULL;
-                               gchar* _tmp32_;
-                               ManagerJobInfo _tmp33_;
-                               const gchar* _tmp34_;
-                               Job* _tmp35_;
-                               ManagerJobInfo _tmp36_;
-                               guint32 _tmp37_;
-#line 381 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp7_ = user;
-#line 381 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp7_) {
-#line 381 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp6_ = G_BUS_TYPE_SESSION;
-#line 3063 "systemadm.c"
-                               } else {
-#line 381 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp6_ = G_BUS_TYPE_SYSTEM;
-#line 3067 "systemadm.c"
-                               }
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp8_ = _tmp6_;
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp9_ = i;
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp10_ = _tmp9_.job_path;
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp11_ = g_initable_new (TYPE_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp8_, "g-object-path", (const gchar*) _tmp10_, "g-interface-name", "org.freedesktop.Properties", NULL);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               p = (Properties*) _tmp11_;
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_inner_error_ != NULL) {
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (_inner_error_->domain == G_IO_ERROR) {
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_propagate_error (error, _inner_error_);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_job_info_destroy (&i);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerJobInfo_array_free (list, list_length1), NULL);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 3091 "systemadm.c"
-                                       } else {
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_job_info_destroy (&i);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerJobInfo_array_free (list, list_length1), NULL);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_clear_error (&_inner_error_);
-#line 380 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 3103 "systemadm.c"
-                                       }
-                               }
-#line 385 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp12_ = p;
-#line 385 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               g_signal_connect_object (_tmp12_, "properties-changed", (GCallback) _main_window_on_job_changed_properties_properties_changed, self, 0);
-#line 388 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = user;
-#line 388 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp14_) {
-#line 388 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp13_ = G_BUS_TYPE_SESSION;
-#line 3116 "systemadm.c"
-                               } else {
-#line 388 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp13_ = G_BUS_TYPE_SYSTEM;
-#line 3120 "systemadm.c"
-                               }
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp15_ = _tmp13_;
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp16_ = i;
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp17_ = _tmp16_.job_path;
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp18_ = g_initable_new (TYPE_JOB_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp15_, "g-object-path", (const gchar*) _tmp17_, "g-interface-name", "org.freedesktop.systemd1.Job", NULL);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               j = (Job*) _tmp18_;
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_inner_error_ != NULL) {
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (_inner_error_->domain == G_IO_ERROR) {
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_propagate_error (error, _inner_error_);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               _g_object_unref0 (p);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_job_info_destroy (&i);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerJobInfo_array_free (list, list_length1), NULL);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 3146 "systemadm.c"
-                                       } else {
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               _g_object_unref0 (p);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               manager_job_info_destroy (&i);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               list = (_vala_ManagerJobInfo_array_free (list, list_length1), NULL);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               g_clear_error (&_inner_error_);
-#line 387 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               return;
-#line 3160 "systemadm.c"
-                                       }
-                               }
-#line 392 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp19_ = self->priv->job_model;
-#line 392 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_list_store_append (_tmp19_, &_tmp20_);
-#line 392 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               iter = _tmp20_;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp21_ = self->priv->job_model;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp22_ = iter;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp23_ = i;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp24_ = _tmp23_.id;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp25_ = g_strdup_printf ("%u", (guint) _tmp24_);
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp26_ = _tmp25_;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp27_ = i;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp28_ = _tmp27_.name;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp29_ = i;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp30_ = _tmp29_.type;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp31_ = g_strdup_printf ("→ %s", _tmp30_);
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp32_ = _tmp31_;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp33_ = i;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp34_ = _tmp33_.state;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp35_ = j;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp36_ = i;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp37_ = _tmp36_.id;
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_list_store_set (_tmp21_, &_tmp22_, 0, _tmp26_, 1, _tmp28_, 2, _tmp32_, 3, _tmp34_, 4, _tmp35_, 5, _tmp37_, -1);
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (_tmp32_);
-#line 393 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (_tmp26_);
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_object_unref0 (j);
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_object_unref0 (p);
-#line 377 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               manager_job_info_destroy (&i);
-#line 3215 "systemadm.c"
-                       }
-               }
-       }
-#line 372 "/home/lennart/projects/systemd/src/systemadm.vala"
-       list = (_vala_ManagerJobInfo_array_free (list, list_length1), NULL);
-#line 3221 "systemadm.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 410 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return self ? g_object_ref (self) : NULL;
-#line 3228 "systemadm.c"
-}
-
-
-Unit* main_window_get_current_unit (MainWindow* self) {
-       Unit* result = NULL;
-       GtkTreePath* p = NULL;
-       GtkTreeView* _tmp0_;
-       GtkTreePath* _tmp1_ = NULL;
-       GtkTreePath* _tmp2_;
-       GtkTreeView* _tmp3_;
-       GtkTreeModel* _tmp4_ = NULL;
-       GtkTreeModel* _tmp5_;
-       GtkTreeModel* model;
-       GtkTreeIter iter = {0};
-       Unit* u = NULL;
-       GtkTreeModel* _tmp6_;
-       GtkTreePath* _tmp7_;
-       GtkTreeIter _tmp8_ = {0};
-       GtkTreeModel* _tmp9_;
-       GtkTreeIter _tmp10_;
-#line 403 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 405 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_view;
-#line 405 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_view_get_cursor (_tmp0_, &_tmp1_, NULL);
-#line 405 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _gtk_tree_path_free0 (p);
-#line 405 "/home/lennart/projects/systemd/src/systemadm.vala"
-       p = _tmp1_;
-#line 407 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = p;
-#line 407 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp2_ == NULL) {
-#line 408 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = NULL;
-#line 408 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _gtk_tree_path_free0 (p);
-#line 408 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 3269 "systemadm.c"
-       }
-#line 410 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = self->priv->unit_view;
-#line 410 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = gtk_tree_view_get_model (_tmp3_);
-#line 410 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = _g_object_ref0 (_tmp4_);
-#line 410 "/home/lennart/projects/systemd/src/systemadm.vala"
-       model = _tmp5_;
-#line 414 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = model;
-#line 414 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = p;
-#line 414 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_get_iter (_tmp6_, &_tmp8_, _tmp7_);
-#line 414 "/home/lennart/projects/systemd/src/systemadm.vala"
-       iter = _tmp8_;
-#line 415 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = model;
-#line 415 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = iter;
-#line 415 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_get (_tmp9_, &_tmp10_, 6, &u, -1);
-#line 417 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = u;
-#line 417 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (model);
-#line 417 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _gtk_tree_path_free0 (p);
-#line 417 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 3301 "systemadm.c"
-}
-
-
-Unit* main_window_get_unit (MainWindow* self, const gchar* id) {
-       Unit* result = NULL;
-       GeeHashMap* _tmp0_;
-       const gchar* _tmp1_;
-       gpointer _tmp2_ = NULL;
-#line 420 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 420 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (id != NULL, NULL);
-#line 421 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_map;
-#line 421 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = id;
-#line 421 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp0_, _tmp1_);
-#line 421 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = (Unit*) _tmp2_;
-#line 421 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 3324 "systemadm.c"
-}
-
-
-void main_window_unit_changed (MainWindow* self) {
-       Unit* _tmp0_ = NULL;
-       Unit* u;
-       Unit* _tmp1_;
-#line 424 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 425 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_unit (self);
-#line 425 "/home/lennart/projects/systemd/src/systemadm.vala"
-       u = _tmp0_;
-#line 427 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = u;
-#line 427 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 428 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_clear_unit (self);
-#line 3344 "systemadm.c"
-       } else {
-               Unit* _tmp2_;
-#line 430 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = u;
-#line 430 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_unit (self, _tmp2_);
-#line 3351 "systemadm.c"
-       }
-#line 424 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (u);
-#line 3355 "systemadm.c"
-}
-
-
-void main_window_clear_unit (MainWindow* self) {
-       GtkButton* _tmp0_;
-       GtkButton* _tmp1_;
-       GtkButton* _tmp2_;
-       GtkButton* _tmp3_;
-       RightLabel* _tmp4_;
-       RightLabel* _tmp5_;
-       RightLabel* _tmp6_;
-       RightLabel* _tmp7_;
-       RightLabel* _tmp8_;
-       RightLabel* _tmp9_;
-       RightLabel* _tmp10_;
-       RightLabel* _tmp11_;
-       RightLabel* _tmp12_;
-       RightLabel* _tmp13_;
-       RightLabel* _tmp14_;
-       RightLabel* _tmp15_;
-#line 433 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 434 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (self->priv->current_unit_id);
-#line 434 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->current_unit_id = NULL;
-#line 436 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->start_button;
-#line 436 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, FALSE);
-#line 437 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = self->priv->stop_button;
-#line 437 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, FALSE);
-#line 438 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = self->priv->reload_button;
-#line 438 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 439 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = self->priv->restart_button;
-#line 439 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 441 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = self->priv->unit_id_label;
-#line 441 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp4_, NULL);
-#line 442 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = self->priv->unit_description_label;
-#line 442 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp5_, NULL);
-#line 443 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = self->priv->unit_description_label;
-#line 443 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp6_, NULL);
-#line 444 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = self->priv->unit_load_state_label;
-#line 444 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp7_, NULL);
-#line 445 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp8_ = self->priv->unit_active_state_label;
-#line 445 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp8_, NULL);
-#line 446 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = self->priv->unit_sub_state_label;
-#line 446 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp9_, NULL);
-#line 447 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = self->priv->unit_fragment_path_label;
-#line 447 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp10_, NULL);
-#line 448 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = self->priv->unit_active_enter_timestamp_label;
-#line 448 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp11_, NULL);
-#line 449 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp12_ = self->priv->unit_active_exit_timestamp_label;
-#line 449 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp12_, NULL);
-#line 450 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp13_ = self->priv->unit_can_reload_label;
-#line 450 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp13_, NULL);
-#line 451 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp14_ = self->priv->unit_can_start_label;
-#line 451 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp14_, NULL);
-#line 452 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp15_ = self->priv->unit_cgroup_label;
-#line 452 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp15_, NULL);
-#line 3446 "systemadm.c"
-}
-
-
-gchar* main_window_format_unit_link (MainWindow* self, const gchar* i, gboolean link) {
-       gchar* result = NULL;
-       const gchar* _tmp0_;
-       Unit* _tmp1_ = NULL;
-       Unit* u;
-       Unit* _tmp2_;
-       gchar* color = NULL;
-       Unit* _tmp8_;
-       gchar* _tmp9_;
-       gchar* _tmp10_;
-       gchar* _tmp11_;
-       GQuark _tmp13_ = 0U;
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       static GQuark _tmp12_label0 = 0;
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       static GQuark _tmp12_label1 = 0;
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       static GQuark _tmp12_label2 = 0;
-#line 3468 "systemadm.c"
-       const gchar* _tmp18_;
-       gchar* _tmp19_;
-       gchar* _tmp20_;
-       gchar* _tmp21_;
-       gchar* _tmp22_;
-       const gchar* _tmp23_;
-       gchar* _tmp24_;
-       gchar* _tmp25_;
-       gchar* _tmp26_;
-       gchar* _tmp27_;
-       Unit* _tmp28_;
-       gchar* _tmp29_;
-       gchar* _tmp30_;
-       gchar* _tmp31_;
-       gchar* _tmp32_;
-       gchar* _tmp33_;
-       gchar* _tmp34_;
-       gchar* _tmp35_;
-       gchar* _tmp36_;
-       gchar* _tmp37_;
-       gchar* span;
-       gboolean _tmp38_;
-#line 455 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 455 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (i != NULL, NULL);
-#line 456 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = i;
-#line 456 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = main_window_get_unit (self, _tmp0_);
-#line 456 "/home/lennart/projects/systemd/src/systemadm.vala"
-       u = _tmp1_;
-#line 457 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = u;
-#line 457 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp2_ == NULL) {
-#line 3505 "systemadm.c"
-               const gchar* _tmp3_;
-               gchar* _tmp4_;
-               gchar* _tmp5_;
-               gchar* _tmp6_;
-               gchar* _tmp7_;
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = i;
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = g_strconcat ("<span color='grey'>", _tmp3_, NULL);
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = _tmp4_;
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = g_strconcat (_tmp5_, "</span", NULL);
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = _tmp6_;
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp5_);
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = _tmp7_;
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 458 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 3529 "systemadm.c"
-       }
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp8_ = u;
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = unit_get_sub_state (_tmp8_);
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = _tmp9_;
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = _tmp10_;
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp13_ = (NULL == _tmp11_) ? 0 : g_quark_from_string (_tmp11_);
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_free (_tmp11_);
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp13_ == ((0 != _tmp12_label0) ? _tmp12_label0 : (_tmp12_label0 = g_quark_from_static_string ("active")))) {
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-               switch (0) {
-#line 3547 "systemadm.c"
-                       default:
-                       {
-                               gchar* _tmp14_;
-#line 462 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = g_strdup ("blue");
-#line 462 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (color);
-#line 462 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               color = _tmp14_;
-#line 462 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 3559 "systemadm.c"
-                       }
-               }
-       } else if (_tmp13_ == ((0 != _tmp12_label1) ? _tmp12_label1 : (_tmp12_label1 = g_quark_from_static_string ("dead")))) {
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-               switch (0) {
-#line 3565 "systemadm.c"
-                       default:
-                       {
-                               gchar* _tmp15_;
-#line 463 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp15_ = g_strdup ("red");
-#line 463 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (color);
-#line 463 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               color = _tmp15_;
-#line 463 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 3577 "systemadm.c"
-                       }
-               }
-       } else if (_tmp13_ == ((0 != _tmp12_label2) ? _tmp12_label2 : (_tmp12_label2 = g_quark_from_static_string ("running")))) {
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-               switch (0) {
-#line 3583 "systemadm.c"
-                       default:
-                       {
-                               gchar* _tmp16_;
-#line 464 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp16_ = g_strdup ("green");
-#line 464 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (color);
-#line 464 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               color = _tmp16_;
-#line 464 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 3595 "systemadm.c"
-                       }
-               }
-       } else {
-#line 461 "/home/lennart/projects/systemd/src/systemadm.vala"
-               switch (0) {
-#line 3601 "systemadm.c"
-                       default:
-                       {
-                               gchar* _tmp17_;
-#line 465 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp17_ = g_strdup ("black");
-#line 465 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (color);
-#line 465 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               color = _tmp17_;
-#line 465 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 3613 "systemadm.c"
-                       }
-               }
-       }
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp18_ = color;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp19_ = g_strconcat ("<span underline='none' color='", _tmp18_, NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp20_ = _tmp19_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp21_ = g_strconcat (_tmp20_, "'>", NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp22_ = _tmp21_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp23_ = i;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp25_ = _tmp24_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp26_ = g_strconcat (_tmp25_, "(", NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp27_ = _tmp26_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp28_ = u;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp29_ = unit_get_sub_state (_tmp28_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp30_ = _tmp29_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp31_ = _tmp30_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp32_ = g_strconcat (_tmp27_, _tmp31_, NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp33_ = _tmp32_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp34_ = g_strconcat (_tmp33_, ")", NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp35_ = _tmp34_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp36_ = g_strconcat (_tmp35_, "</span>", NULL);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp37_ = _tmp36_;
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp35_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp33_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp31_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp27_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp25_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp22_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp20_);
-#line 467 "/home/lennart/projects/systemd/src/systemadm.vala"
-       span = _tmp37_;
-#line 470 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp38_ = link;
-#line 470 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp38_) {
-#line 3677 "systemadm.c"
-               const gchar* _tmp39_;
-               gchar* _tmp40_;
-               gchar* _tmp41_;
-               gchar* _tmp42_;
-               gchar* _tmp43_;
-               const gchar* _tmp44_;
-               gchar* _tmp45_;
-               gchar* _tmp46_;
-               gchar* _tmp47_;
-               gchar* _tmp48_;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp39_ = i;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp40_ = g_strconcat (" <a href='", _tmp39_, NULL);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp41_ = _tmp40_;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp42_ = g_strconcat (_tmp41_, "'>", NULL);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp43_ = _tmp42_;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp44_ = span;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp45_ = g_strconcat (_tmp43_, _tmp44_, NULL);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp46_ = _tmp45_;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp47_ = g_strconcat (_tmp46_, "</a>", NULL);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp48_ = _tmp47_;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp46_);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp43_);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp41_);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = _tmp48_;
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (span);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (color);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 471 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 3724 "systemadm.c"
-       } else {
-#line 473 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = span;
-#line 473 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (color);
-#line 473 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 473 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 3734 "systemadm.c"
-       }
-#line 455 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (span);
-#line 455 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (color);
-#line 455 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (u);
-#line 3742 "systemadm.c"
-}
-
-
-gchar* main_window_make_dependency_string (MainWindow* self, const gchar* prefix, const gchar* word, gchar** dependencies, int dependencies_length1) {
-       gchar* result = NULL;
-       GeeTreeSet* _tmp0_;
-       GeeCollection* sorted;
-       gchar** _tmp1_;
-       gint _tmp1__length1;
-       gboolean first;
-       gchar* r = NULL;
-       const gchar* _tmp5_;
-#line 477 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 477 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (word != NULL, NULL);
-#line 478 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL);
-#line 478 "/home/lennart/projects/systemd/src/systemadm.vala"
-       sorted = (GeeCollection*) _tmp0_;
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = dependencies;
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1__length1 = dependencies_length1;
-#line 3767 "systemadm.c"
-       {
-               gchar** i_collection = NULL;
-               gint i_collection_length1 = 0;
-               gint _i_collection_size_ = 0;
-               gint i_it = 0;
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection = _tmp1_;
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection_length1 = _tmp1__length1;
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-               for (i_it = 0; i_it < _tmp1__length1; i_it = i_it + 1) {
-#line 3779 "systemadm.c"
-                       gchar* _tmp2_;
-                       gchar* i = NULL;
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp2_ = g_strdup (i_collection[i_it]);
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       i = _tmp2_;
-#line 3786 "systemadm.c"
-                       {
-                               GeeCollection* _tmp3_;
-                               const gchar* _tmp4_;
-#line 480 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp3_ = sorted;
-#line 480 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp4_ = i;
-#line 480 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gee_collection_add (_tmp3_, _tmp4_);
-#line 479 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (i);
-#line 3798 "systemadm.c"
-                       }
-               }
-       }
-#line 482 "/home/lennart/projects/systemd/src/systemadm.vala"
-       first = TRUE;
-#line 485 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = prefix;
-#line 485 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp5_ == NULL) {
-#line 3808 "systemadm.c"
-               gchar* _tmp6_;
-#line 486 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = g_strdup ("");
-#line 486 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (r);
-#line 486 "/home/lennart/projects/systemd/src/systemadm.vala"
-               r = _tmp6_;
-#line 3816 "systemadm.c"
-       } else {
-               const gchar* _tmp7_;
-               gchar* _tmp8_;
-#line 488 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = prefix;
-#line 488 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp8_ = g_strdup (_tmp7_);
-#line 488 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (r);
-#line 488 "/home/lennart/projects/systemd/src/systemadm.vala"
-               r = _tmp8_;
-#line 3828 "systemadm.c"
-       }
-       {
-               GeeCollection* _tmp9_;
-               GeeIterator* _tmp10_ = NULL;
-               GeeIterator* _i_it;
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp9_ = sorted;
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = gee_iterable_iterator ((GeeIterable*) _tmp9_);
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _i_it = _tmp10_;
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-               while (TRUE) {
-#line 3842 "systemadm.c"
-                       GeeIterator* _tmp11_;
-                       gboolean _tmp12_ = FALSE;
-                       GeeIterator* _tmp13_;
-                       gpointer _tmp14_ = NULL;
-                       gchar* _tmp15_;
-                       gchar* i;
-                       const gchar* _tmp16_;
-                       gboolean _tmp22_;
-                       const gchar* _tmp30_;
-                       const gchar* _tmp31_;
-                       gchar* _tmp32_ = NULL;
-                       gchar* _tmp33_;
-                       gchar* _tmp34_;
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp11_ = _i_it;
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp12_ = gee_iterator_next (_tmp11_);
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (!_tmp12_) {
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 3864 "systemadm.c"
-                       }
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp13_ = _i_it;
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp14_ = gee_iterator_get (_tmp13_);
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp15_ = g_strdup ((const gchar*) _tmp14_);
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       i = _tmp15_;
-#line 491 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp16_ = r;
-#line 491 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (g_strcmp0 (_tmp16_, "") != 0) {
-#line 3878 "systemadm.c"
-                               const gchar* _tmp17_ = NULL;
-                               gboolean _tmp18_;
-                               const gchar* _tmp19_;
-                               const gchar* _tmp20_;
-                               gchar* _tmp21_;
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp18_ = first;
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp18_) {
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp17_ = "\n";
-#line 3890 "systemadm.c"
-                               } else {
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp17_ = ",";
-#line 3894 "systemadm.c"
-                               }
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp19_ = r;
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp20_ = _tmp17_;
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp21_ = g_strconcat (_tmp19_, _tmp20_, NULL);
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (r);
-#line 492 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               r = _tmp21_;
-#line 3906 "systemadm.c"
-                       }
-#line 494 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp22_ = first;
-#line 494 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (_tmp22_) {
-#line 3912 "systemadm.c"
-                               const gchar* _tmp23_;
-                               const gchar* _tmp24_;
-                               gchar* _tmp25_;
-                               gchar* _tmp26_;
-                               gchar* _tmp27_;
-                               gchar* _tmp28_;
-                               gchar* _tmp29_;
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp23_ = r;
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp24_ = word;
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp25_ = g_strconcat ("<b>", _tmp24_, NULL);
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp26_ = _tmp25_;
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp27_ = g_strconcat (_tmp26_, ":</b>", NULL);
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp28_ = _tmp27_;
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp29_ = g_strconcat (_tmp23_, _tmp28_, NULL);
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (r);
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               r = _tmp29_;
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (_tmp28_);
-#line 495 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (_tmp26_);
-#line 496 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               first = FALSE;
-#line 3944 "systemadm.c"
-                       }
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp30_ = r;
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp31_ = i;
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp32_ = main_window_format_unit_link (self, _tmp31_, TRUE);
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp33_ = _tmp32_;
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp34_ = g_strconcat (_tmp30_, _tmp33_, NULL);
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (r);
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       r = _tmp34_;
-#line 499 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (_tmp33_);
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (i);
-#line 3964 "systemadm.c"
-               }
-#line 490 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (_i_it);
-#line 3968 "systemadm.c"
-       }
-#line 502 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = r;
-#line 502 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (sorted);
-#line 502 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 3976 "systemadm.c"
-}
-
-
-void main_window_show_unit (MainWindow* self, Unit* unit) {
-       Unit* _tmp0_;
-       gchar* _tmp1_;
-       gchar* _tmp2_;
-       const gchar* _tmp3_;
-       gchar* _tmp4_ = NULL;
-       gchar* id_display;
-       gboolean has_alias;
-       Unit* _tmp5_;
-       gchar** _tmp6_;
-       gint _tmp6__length1;
-       gchar** _tmp7_;
-       gint _tmp7__length1;
-       gboolean _tmp19_;
-       RightLabel* _tmp22_;
-       const gchar* _tmp23_;
-       Unit* _tmp24_;
-       gchar** _tmp25_;
-       gint _tmp25__length1;
-       gchar** _tmp26_;
-       gint _tmp26__length1;
-       gchar** requires;
-       gint requires_length1;
-       gint _requires_size_;
-       Unit* _tmp27_;
-       gchar** _tmp28_;
-       gint _tmp28__length1;
-       gchar** _tmp29_;
-       gint _tmp29__length1;
-       gchar** requires_overridable;
-       gint requires_overridable_length1;
-       gint _requires_overridable_size_;
-       Unit* _tmp30_;
-       gchar** _tmp31_;
-       gint _tmp31__length1;
-       gchar** _tmp32_;
-       gint _tmp32__length1;
-       gchar** requisite;
-       gint requisite_length1;
-       gint _requisite_size_;
-       Unit* _tmp33_;
-       gchar** _tmp34_;
-       gint _tmp34__length1;
-       gchar** _tmp35_;
-       gint _tmp35__length1;
-       gchar** requisite_overridable;
-       gint requisite_overridable_length1;
-       gint _requisite_overridable_size_;
-       Unit* _tmp36_;
-       gchar** _tmp37_;
-       gint _tmp37__length1;
-       gchar** _tmp38_;
-       gint _tmp38__length1;
-       gchar** wants;
-       gint wants_length1;
-       gint _wants_size_;
-       Unit* _tmp39_;
-       gchar** _tmp40_;
-       gint _tmp40__length1;
-       gchar** _tmp41_;
-       gint _tmp41__length1;
-       gchar** required_by;
-       gint required_by_length1;
-       gint _required_by_size_;
-       Unit* _tmp42_;
-       gchar** _tmp43_;
-       gint _tmp43__length1;
-       gchar** _tmp44_;
-       gint _tmp44__length1;
-       gchar** required_by_overridable;
-       gint required_by_overridable_length1;
-       gint _required_by_overridable_size_;
-       Unit* _tmp45_;
-       gchar** _tmp46_;
-       gint _tmp46__length1;
-       gchar** _tmp47_;
-       gint _tmp47__length1;
-       gchar** wanted_by;
-       gint wanted_by_length1;
-       gint _wanted_by_size_;
-       Unit* _tmp48_;
-       gchar** _tmp49_;
-       gint _tmp49__length1;
-       gchar** _tmp50_;
-       gint _tmp50__length1;
-       gchar** conflicts;
-       gint conflicts_length1;
-       gint _conflicts_size_;
-       Unit* _tmp51_;
-       gchar** _tmp52_;
-       gint _tmp52__length1;
-       gchar** _tmp53_;
-       gint _tmp53__length1;
-       gchar** before;
-       gint before_length1;
-       gint _before_size_;
-       Unit* _tmp54_;
-       gchar** _tmp55_;
-       gint _tmp55__length1;
-       gchar** _tmp56_;
-       gint _tmp56__length1;
-       gchar** after;
-       gint after_length1;
-       gint _after_size_;
-       RightLabel* _tmp57_;
-       gchar** _tmp58_;
-       gint _tmp58__length1;
-       gchar* _tmp59_ = NULL;
-       gchar* _tmp60_;
-       gchar** _tmp61_;
-       gint _tmp61__length1;
-       gchar* _tmp62_ = NULL;
-       gchar* _tmp63_;
-       gchar** _tmp64_;
-       gint _tmp64__length1;
-       gchar* _tmp65_ = NULL;
-       gchar* _tmp66_;
-       gchar** _tmp67_;
-       gint _tmp67__length1;
-       gchar* _tmp68_ = NULL;
-       gchar* _tmp69_;
-       gchar** _tmp70_;
-       gint _tmp70__length1;
-       gchar* _tmp71_ = NULL;
-       gchar* _tmp72_;
-       gchar** _tmp73_;
-       gint _tmp73__length1;
-       gchar* _tmp74_ = NULL;
-       gchar* _tmp75_;
-       gchar** _tmp76_;
-       gint _tmp76__length1;
-       gchar* _tmp77_ = NULL;
-       gchar* _tmp78_;
-       gchar** _tmp79_;
-       gint _tmp79__length1;
-       gchar* _tmp80_ = NULL;
-       gchar* _tmp81_;
-       gchar** _tmp82_;
-       gint _tmp82__length1;
-       gchar* _tmp83_ = NULL;
-       gchar* _tmp84_;
-       gchar** _tmp85_;
-       gint _tmp85__length1;
-       gchar* _tmp86_ = NULL;
-       gchar* _tmp87_;
-       gchar** _tmp88_;
-       gint _tmp88__length1;
-       gchar* _tmp89_ = NULL;
-       gchar* _tmp90_;
-       RightLabel* _tmp91_;
-       Unit* _tmp92_;
-       gchar* _tmp93_;
-       gchar* _tmp94_;
-       gchar* _tmp95_;
-       RightLabel* _tmp96_;
-       Unit* _tmp97_;
-       gchar* _tmp98_;
-       gchar* _tmp99_;
-       gchar* _tmp100_;
-       RightLabel* _tmp101_;
-       Unit* _tmp102_;
-       gchar* _tmp103_;
-       gchar* _tmp104_;
-       gchar* _tmp105_;
-       RightLabel* _tmp106_;
-       Unit* _tmp107_;
-       gchar* _tmp108_;
-       gchar* _tmp109_;
-       gchar* _tmp110_;
-       Unit* _tmp111_;
-       gchar* _tmp112_;
-       gchar* _tmp113_;
-       gchar* fp;
-       const gchar* _tmp114_;
-       RightLabel* _tmp129_;
-       Unit* _tmp130_;
-       guint64 _tmp131_;
-       guint64 _tmp132_;
-       gchar* _tmp133_ = NULL;
-       gchar* _tmp134_;
-       RightLabel* _tmp135_;
-       Unit* _tmp136_;
-       guint64 _tmp137_;
-       guint64 _tmp138_;
-       gchar* _tmp139_ = NULL;
-       gchar* _tmp140_;
-       Unit* _tmp141_;
-       gboolean _tmp142_;
-       gboolean _tmp143_;
-       gboolean b;
-       GtkButton* _tmp144_;
-       gboolean _tmp145_;
-       GtkButton* _tmp146_;
-       gboolean _tmp147_;
-       GtkButton* _tmp148_;
-       gboolean _tmp149_;
-       const gchar* _tmp150_ = NULL;
-       gboolean _tmp151_;
-       RightLabel* _tmp152_;
-       const gchar* _tmp153_;
-       Unit* _tmp154_;
-       gboolean _tmp155_;
-       gboolean _tmp156_;
-       GtkButton* _tmp157_;
-       gboolean _tmp158_;
-       const gchar* _tmp159_ = NULL;
-       gboolean _tmp160_;
-       RightLabel* _tmp161_;
-       const gchar* _tmp162_;
-       RightLabel* _tmp163_;
-       Unit* _tmp164_;
-       gchar* _tmp165_;
-       gchar* _tmp166_;
-       gchar* _tmp167_;
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (unit != NULL);
-#line 506 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = unit;
-#line 506 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = unit_get_id (_tmp0_);
-#line 506 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = _tmp1_;
-#line 506 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (self->priv->current_unit_id);
-#line 506 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->current_unit_id = _tmp2_;
-#line 508 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = self->priv->current_unit_id;
-#line 508 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = main_window_format_unit_link (self, _tmp3_, FALSE);
-#line 508 "/home/lennart/projects/systemd/src/systemadm.vala"
-       id_display = _tmp4_;
-#line 509 "/home/lennart/projects/systemd/src/systemadm.vala"
-       has_alias = FALSE;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = unit;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = unit_get_names (_tmp5_, &_tmp6__length1);
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = _tmp6_;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7__length1 = _tmp6__length1;
-#line 4224 "systemadm.c"
-       {
-               gchar** i_collection = NULL;
-               gint i_collection_length1 = 0;
-               gint _i_collection_size_ = 0;
-               gint i_it = 0;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection = _tmp7_;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection_length1 = _tmp7__length1;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-               for (i_it = 0; i_it < _tmp7__length1; i_it = i_it + 1) {
-#line 4236 "systemadm.c"
-                       gchar* _tmp8_;
-                       gchar* i = NULL;
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = g_strdup (i_collection[i_it]);
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       i = _tmp8_;
-#line 4243 "systemadm.c"
-                       {
-                               const gchar* _tmp9_;
-                               const gchar* _tmp10_;
-                               gboolean _tmp11_;
-                               const gchar* _tmp14_;
-                               const gchar* _tmp15_;
-                               gchar* _tmp16_;
-                               gchar* _tmp17_;
-                               gchar* _tmp18_;
-#line 511 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp9_ = i;
-#line 511 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp10_ = self->priv->current_unit_id;
-#line 511 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (g_strcmp0 (_tmp9_, _tmp10_) == 0) {
-#line 512 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _g_free0 (i);
-#line 512 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       continue;
-#line 4263 "systemadm.c"
-                               }
-#line 514 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp11_ = has_alias;
-#line 514 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (!_tmp11_) {
-#line 4269 "systemadm.c"
-                                       const gchar* _tmp12_;
-                                       gchar* _tmp13_;
-#line 515 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp12_ = id_display;
-#line 515 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp13_ = g_strconcat (_tmp12_, " (aliases:", NULL);
-#line 515 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _g_free0 (id_display);
-#line 515 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       id_display = _tmp13_;
-#line 516 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       has_alias = TRUE;
-#line 4282 "systemadm.c"
-                               }
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = id_display;
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp15_ = i;
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp16_ = g_strconcat (" ", _tmp15_, NULL);
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp17_ = _tmp16_;
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp18_ = g_strconcat (_tmp14_, _tmp17_, NULL);
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (id_display);
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               id_display = _tmp18_;
-#line 519 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (_tmp17_);
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (i);
-#line 4302 "systemadm.c"
-                       }
-               }
-#line 510 "/home/lennart/projects/systemd/src/systemadm.vala"
-               i_collection = (_vala_array_free (i_collection, i_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 4307 "systemadm.c"
-       }
-#line 521 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp19_ = has_alias;
-#line 521 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp19_) {
-#line 4313 "systemadm.c"
-               const gchar* _tmp20_;
-               gchar* _tmp21_;
-#line 522 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp20_ = id_display;
-#line 522 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp21_ = g_strconcat (_tmp20_, ")", NULL);
-#line 522 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (id_display);
-#line 522 "/home/lennart/projects/systemd/src/systemadm.vala"
-               id_display = _tmp21_;
-#line 4324 "systemadm.c"
-       }
-#line 524 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp22_ = self->priv->unit_id_label;
-#line 524 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp23_ = id_display;
-#line 524 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_markup_or_na (_tmp22_, _tmp23_);
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp24_ = unit;
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp25_ = unit_get_requires (_tmp24_, &_tmp25__length1);
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp26_ = _tmp25_;
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp26__length1 = _tmp25__length1;
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requires = _tmp26_;
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requires_length1 = _tmp26__length1;
-#line 527 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _requires_size_ = requires_length1;
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp27_ = unit;
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp28_ = unit_get_requires_overridable (_tmp27_, &_tmp28__length1);
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp29_ = _tmp28_;
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp29__length1 = _tmp28__length1;
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requires_overridable = _tmp29_;
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requires_overridable_length1 = _tmp29__length1;
-#line 528 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _requires_overridable_size_ = requires_overridable_length1;
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp30_ = unit;
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp31_ = unit_get_requisite (_tmp30_, &_tmp31__length1);
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp32_ = _tmp31_;
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp32__length1 = _tmp31__length1;
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requisite = _tmp32_;
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requisite_length1 = _tmp32__length1;
-#line 529 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _requisite_size_ = requisite_length1;
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp33_ = unit;
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp34_ = unit_get_requisite_overridable (_tmp33_, &_tmp34__length1);
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp35_ = _tmp34_;
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp35__length1 = _tmp34__length1;
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requisite_overridable = _tmp35_;
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requisite_overridable_length1 = _tmp35__length1;
-#line 530 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _requisite_overridable_size_ = requisite_overridable_length1;
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp36_ = unit;
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp37_ = unit_get_wants (_tmp36_, &_tmp37__length1);
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp38_ = _tmp37_;
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp38__length1 = _tmp37__length1;
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       wants = _tmp38_;
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       wants_length1 = _tmp38__length1;
-#line 531 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _wants_size_ = wants_length1;
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp39_ = unit;
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp40_ = unit_get_required_by (_tmp39_, &_tmp40__length1);
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp41_ = _tmp40_;
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp41__length1 = _tmp40__length1;
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       required_by = _tmp41_;
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       required_by_length1 = _tmp41__length1;
-#line 532 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _required_by_size_ = required_by_length1;
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp42_ = unit;
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp43_ = unit_get_required_by_overridable (_tmp42_, &_tmp43__length1);
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp44_ = _tmp43_;
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp44__length1 = _tmp43__length1;
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       required_by_overridable = _tmp44_;
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       required_by_overridable_length1 = _tmp44__length1;
-#line 533 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _required_by_overridable_size_ = required_by_overridable_length1;
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp45_ = unit;
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp46_ = unit_get_wanted_by (_tmp45_, &_tmp46__length1);
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp47_ = _tmp46_;
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp47__length1 = _tmp46__length1;
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       wanted_by = _tmp47_;
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       wanted_by_length1 = _tmp47__length1;
-#line 534 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _wanted_by_size_ = wanted_by_length1;
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp48_ = unit;
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp49_ = unit_get_conflicts (_tmp48_, &_tmp49__length1);
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp50_ = _tmp49_;
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp50__length1 = _tmp49__length1;
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       conflicts = _tmp50_;
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       conflicts_length1 = _tmp50__length1;
-#line 535 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _conflicts_size_ = conflicts_length1;
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp51_ = unit;
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp52_ = unit_get_before (_tmp51_, &_tmp52__length1);
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp53_ = _tmp52_;
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp53__length1 = _tmp52__length1;
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       before = _tmp53_;
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       before_length1 = _tmp53__length1;
-#line 536 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _before_size_ = before_length1;
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp54_ = unit;
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp55_ = unit_get_after (_tmp54_, &_tmp55__length1);
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp56_ = _tmp55_;
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp56__length1 = _tmp55__length1;
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       after = _tmp56_;
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       after_length1 = _tmp56__length1;
-#line 537 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _after_size_ = after_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp57_ = self->priv->unit_dependency_label;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp58_ = requires;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp58__length1 = requires_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp59_ = main_window_make_dependency_string (self, NULL, "requires", _tmp58_, _tmp58__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp60_ = _tmp59_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp61_ = requires_overridable;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp61__length1 = requires_overridable_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp62_ = main_window_make_dependency_string (self, _tmp60_, "overridable requires", _tmp61_, _tmp61__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp63_ = _tmp62_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp64_ = requisite;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp64__length1 = requisite_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp65_ = main_window_make_dependency_string (self, _tmp63_, "requisite", _tmp64_, _tmp64__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp66_ = _tmp65_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp67_ = requisite_overridable;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp67__length1 = requisite_overridable_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp68_ = main_window_make_dependency_string (self, _tmp66_, "overridable requisite", _tmp67_, _tmp67__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp69_ = _tmp68_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp70_ = wants;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp70__length1 = wants_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp71_ = main_window_make_dependency_string (self, _tmp69_, "wants", _tmp70_, _tmp70__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp72_ = _tmp71_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp73_ = conflicts;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp73__length1 = conflicts_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp74_ = main_window_make_dependency_string (self, _tmp72_, "conflicts", _tmp73_, _tmp73__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp75_ = _tmp74_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp76_ = required_by;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp76__length1 = required_by_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp77_ = main_window_make_dependency_string (self, _tmp75_, "required by", _tmp76_, _tmp76__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp78_ = _tmp77_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp79_ = required_by_overridable;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp79__length1 = required_by_overridable_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp80_ = main_window_make_dependency_string (self, _tmp78_, "overridable required by", _tmp79_, _tmp79__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp81_ = _tmp80_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp82_ = wanted_by;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp82__length1 = wanted_by_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp83_ = main_window_make_dependency_string (self, _tmp81_, "wanted by", _tmp82_, _tmp82__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp84_ = _tmp83_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp85_ = after;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp85__length1 = after_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp86_ = main_window_make_dependency_string (self, _tmp84_, "after", _tmp85_, _tmp85__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp87_ = _tmp86_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp88_ = before;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp88__length1 = before_length1;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp89_ = main_window_make_dependency_string (self, _tmp87_, "before", _tmp88_, _tmp88__length1);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp90_ = _tmp89_;
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_markup_or_na (_tmp57_, _tmp90_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp90_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp87_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp84_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp81_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp78_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp75_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp72_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp69_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp66_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp63_);
-#line 539 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp60_);
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp91_ = self->priv->unit_description_label;
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp92_ = unit;
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp93_ = unit_get_description (_tmp92_);
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp94_ = _tmp93_;
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp95_ = _tmp94_;
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp91_, _tmp95_);
-#line 563 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp95_);
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp96_ = self->priv->unit_load_state_label;
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp97_ = unit;
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp98_ = unit_get_load_state (_tmp97_);
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp99_ = _tmp98_;
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp100_ = _tmp99_;
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp96_, _tmp100_);
-#line 564 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp100_);
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp101_ = self->priv->unit_active_state_label;
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp102_ = unit;
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp103_ = unit_get_active_state (_tmp102_);
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp104_ = _tmp103_;
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp105_ = _tmp104_;
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp101_, _tmp105_);
-#line 565 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp105_);
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp106_ = self->priv->unit_sub_state_label;
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp107_ = unit;
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp108_ = unit_get_sub_state (_tmp107_);
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp109_ = _tmp108_;
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp110_ = _tmp109_;
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp106_, _tmp110_);
-#line 566 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp110_);
-#line 568 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp111_ = unit;
-#line 568 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp112_ = unit_get_fragment_path (_tmp111_);
-#line 568 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp113_ = _tmp112_;
-#line 568 "/home/lennart/projects/systemd/src/systemadm.vala"
-       fp = _tmp113_;
-#line 569 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp114_ = fp;
-#line 569 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (g_strcmp0 (_tmp114_, "") != 0) {
-#line 4668 "systemadm.c"
-               RightLabel* _tmp115_;
-               const gchar* _tmp116_;
-               gchar* _tmp117_;
-               gchar* _tmp118_;
-               gchar* _tmp119_;
-               gchar* _tmp120_;
-               gchar* _tmp121_;
-               gchar* _tmp122_;
-               const gchar* _tmp123_;
-               gchar* _tmp124_;
-               gchar* _tmp125_;
-               gchar* _tmp126_;
-               gchar* _tmp127_;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp115_ = self->priv->unit_fragment_path_label;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp116_ = fp;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp117_ = g_strconcat ("<a href=\"file://", _tmp116_, NULL);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp118_ = _tmp117_;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp119_ = g_strconcat (_tmp118_, "\">", NULL);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp120_ = _tmp119_;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp121_ = g_strconcat (_tmp120_, "<span underline='none' color='black'>", NULL);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp122_ = _tmp121_;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp123_ = fp;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp124_ = g_strconcat (_tmp122_, _tmp123_, NULL);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp125_ = _tmp124_;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp126_ = g_strconcat (_tmp125_, "</span></a>", NULL);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp127_ = _tmp126_;
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               right_label_set_markup_or_na (_tmp115_, _tmp127_);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp127_);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp125_);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp122_);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp120_);
-#line 570 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp118_);
-#line 4720 "systemadm.c"
-       } else {
-               RightLabel* _tmp128_;
-#line 574 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp128_ = self->priv->unit_fragment_path_label;
-#line 574 "/home/lennart/projects/systemd/src/systemadm.vala"
-               right_label_set_text_or_na (_tmp128_, NULL);
-#line 4727 "systemadm.c"
-       }
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp129_ = self->priv->unit_active_enter_timestamp_label;
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp130_ = unit;
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp131_ = unit_get_active_enter_timestamp (_tmp130_);
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp132_ = _tmp131_;
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp133_ = format_time (_tmp132_);
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp134_ = _tmp133_;
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp129_, _tmp134_);
-#line 577 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp134_);
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp135_ = self->priv->unit_active_exit_timestamp_label;
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp136_ = unit;
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp137_ = unit_get_active_exit_timestamp (_tmp136_);
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp138_ = _tmp137_;
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp139_ = format_time (_tmp138_);
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp140_ = _tmp139_;
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp135_, _tmp140_);
-#line 579 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp140_);
-#line 581 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp141_ = unit;
-#line 581 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp142_ = unit_get_can_start (_tmp141_);
-#line 581 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp143_ = _tmp142_;
-#line 581 "/home/lennart/projects/systemd/src/systemadm.vala"
-       b = _tmp143_;
-#line 582 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp144_ = self->priv->start_button;
-#line 582 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp145_ = b;
-#line 582 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp144_, _tmp145_);
-#line 583 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp146_ = self->priv->stop_button;
-#line 583 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp147_ = b;
-#line 583 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp146_, _tmp147_);
-#line 584 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp148_ = self->priv->restart_button;
-#line 584 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp149_ = b;
-#line 584 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp148_, _tmp149_);
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp151_ = b;
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp151_) {
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp150_ = "Yes";
-#line 4793 "systemadm.c"
-       } else {
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp150_ = "No";
-#line 4797 "systemadm.c"
-       }
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp152_ = self->priv->unit_can_start_label;
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp153_ = _tmp150_;
-#line 585 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp152_, _tmp153_);
-#line 587 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp154_ = unit;
-#line 587 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp155_ = unit_get_can_reload (_tmp154_);
-#line 587 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp156_ = _tmp155_;
-#line 587 "/home/lennart/projects/systemd/src/systemadm.vala"
-       b = _tmp156_;
-#line 588 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp157_ = self->priv->reload_button;
-#line 588 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp158_ = b;
-#line 588 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp157_, _tmp158_);
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp160_ = b;
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp160_) {
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp159_ = "Yes";
-#line 4825 "systemadm.c"
-       } else {
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp159_ = "No";
-#line 4829 "systemadm.c"
-       }
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp161_ = self->priv->unit_can_reload_label;
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp162_ = _tmp159_;
-#line 589 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp161_, _tmp162_);
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp163_ = self->priv->unit_cgroup_label;
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp164_ = unit;
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp165_ = unit_get_default_control_group (_tmp164_);
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp166_ = _tmp165_;
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp167_ = _tmp166_;
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp163_, _tmp167_);
-#line 591 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp167_);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (fp);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       after = (_vala_array_free (after, after_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       before = (_vala_array_free (before, before_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       conflicts = (_vala_array_free (conflicts, conflicts_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       wanted_by = (_vala_array_free (wanted_by, wanted_by_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       required_by_overridable = (_vala_array_free (required_by_overridable, required_by_overridable_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       required_by = (_vala_array_free (required_by, required_by_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       wants = (_vala_array_free (wants, wants_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requisite_overridable = (_vala_array_free (requisite_overridable, requisite_overridable_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requisite = (_vala_array_free (requisite, requisite_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requires_overridable = (_vala_array_free (requires_overridable, requires_overridable_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       requires = (_vala_array_free (requires, requires_length1, (GDestroyNotify) g_free), NULL);
-#line 505 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (id_display);
-#line 4877 "systemadm.c"
-}
-
-
-Job* main_window_get_current_job (MainWindow* self) {
-       Job* result = NULL;
-       GtkTreePath* p = NULL;
-       GtkTreeView* _tmp0_;
-       GtkTreePath* _tmp1_ = NULL;
-       GtkTreePath* _tmp2_;
-       GtkTreeIter iter = {0};
-       GtkTreeView* _tmp3_;
-       GtkTreeModel* _tmp4_ = NULL;
-       GtkTreeModel* _tmp5_;
-       GtkTreeModel* model;
-       Job* j = NULL;
-       GtkTreeModel* _tmp6_;
-       GtkTreePath* _tmp7_;
-       GtkTreeIter _tmp8_ = {0};
-       GtkTreeModel* _tmp9_;
-       GtkTreeIter _tmp10_;
-       Job* _tmp11_;
-       Job* _tmp12_;
-#line 594 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 596 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->job_view;
-#line 596 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_view_get_cursor (_tmp0_, &_tmp1_, NULL);
-#line 596 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _gtk_tree_path_free0 (p);
-#line 596 "/home/lennart/projects/systemd/src/systemadm.vala"
-       p = _tmp1_;
-#line 598 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = p;
-#line 598 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp2_ == NULL) {
-#line 599 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = NULL;
-#line 599 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _gtk_tree_path_free0 (p);
-#line 599 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 4920 "systemadm.c"
-       }
-#line 602 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = self->priv->job_view;
-#line 602 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = gtk_tree_view_get_model (_tmp3_);
-#line 602 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = _g_object_ref0 (_tmp4_);
-#line 602 "/home/lennart/projects/systemd/src/systemadm.vala"
-       model = _tmp5_;
-#line 605 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = model;
-#line 605 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = p;
-#line 605 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_get_iter (_tmp6_, &_tmp8_, _tmp7_);
-#line 605 "/home/lennart/projects/systemd/src/systemadm.vala"
-       iter = _tmp8_;
-#line 606 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = model;
-#line 606 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = iter;
-#line 606 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_get (_tmp9_, &_tmp10_, 4, &j, -1);
-#line 608 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = j;
-#line 608 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp12_ = _g_object_ref0 (_tmp11_);
-#line 608 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = _tmp12_;
-#line 608 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (model);
-#line 608 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _gtk_tree_path_free0 (p);
-#line 608 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 4956 "systemadm.c"
-}
-
-
-void main_window_job_changed (MainWindow* self) {
-       Job* _tmp0_ = NULL;
-       Job* j;
-       Job* _tmp1_;
-#line 611 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 612 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_job (self);
-#line 612 "/home/lennart/projects/systemd/src/systemadm.vala"
-       j = _tmp0_;
-#line 614 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = j;
-#line 614 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 615 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_clear_job (self);
-#line 4976 "systemadm.c"
-       } else {
-               Job* _tmp2_;
-#line 617 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = j;
-#line 617 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_job (self, _tmp2_);
-#line 4983 "systemadm.c"
-       }
-#line 611 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (j);
-#line 4987 "systemadm.c"
-}
-
-
-void main_window_clear_job (MainWindow* self) {
-       RightLabel* _tmp0_;
-       RightLabel* _tmp1_;
-       RightLabel* _tmp2_;
-       GtkButton* _tmp3_;
-#line 620 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 621 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->current_job_id = (guint32) 0;
-#line 623 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->job_id_label;
-#line 623 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp0_, NULL);
-#line 624 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = self->priv->job_state_label;
-#line 624 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp1_, NULL);
-#line 625 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = self->priv->job_type_label;
-#line 625 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp2_, NULL);
-#line 627 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = self->priv->cancel_button;
-#line 627 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 5016 "systemadm.c"
-}
-
-
-void main_window_show_job (MainWindow* self, Job* job) {
-       Job* _tmp0_;
-       guint32 _tmp1_;
-       guint32 _tmp2_;
-       RightLabel* _tmp3_;
-       guint32 _tmp4_;
-       gchar* _tmp5_ = NULL;
-       gchar* _tmp6_;
-       RightLabel* _tmp7_;
-       Job* _tmp8_;
-       gchar* _tmp9_;
-       gchar* _tmp10_;
-       gchar* _tmp11_;
-       RightLabel* _tmp12_;
-       Job* _tmp13_;
-       gchar* _tmp14_;
-       gchar* _tmp15_;
-       gchar* _tmp16_;
-       GtkButton* _tmp17_;
-#line 630 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 630 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (job != NULL);
-#line 631 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = job;
-#line 631 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = job_get_id (_tmp0_);
-#line 631 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = _tmp1_;
-#line 631 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv->current_job_id = _tmp2_;
-#line 633 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = self->priv->job_id_label;
-#line 633 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = self->priv->current_job_id;
-#line 633 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = g_strdup_printf ("%u", (guint) _tmp4_);
-#line 633 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = _tmp5_;
-#line 633 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp3_, _tmp6_);
-#line 633 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp6_);
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = self->priv->job_state_label;
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp8_ = job;
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = job_get_state (_tmp8_);
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = _tmp9_;
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = _tmp10_;
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp7_, _tmp11_);
-#line 634 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp11_);
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp12_ = self->priv->job_type_label;
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp13_ = job;
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp14_ = job_get_job_type (_tmp13_);
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp15_ = _tmp14_;
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp16_ = _tmp15_;
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       right_label_set_text_or_na (_tmp12_, _tmp16_);
-#line 635 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp16_);
-#line 637 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp17_ = self->priv->cancel_button;
-#line 637 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp17_, TRUE);
-#line 5095 "systemadm.c"
-}
-
-
-void main_window_on_start (MainWindow* self) {
-       Unit* _tmp0_ = NULL;
-       Unit* u;
-       Unit* _tmp1_;
-       GError * _inner_error_ = NULL;
-#line 640 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 641 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_unit (self);
-#line 641 "/home/lennart/projects/systemd/src/systemadm.vala"
-       u = _tmp0_;
-#line 643 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = u;
-#line 643 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 644 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 644 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5118 "systemadm.c"
-       }
-       {
-               Unit* _tmp2_;
-               char* _tmp3_ = NULL;
-               char* _tmp4_;
-#line 647 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = u;
-#line 647 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = unit_start (_tmp2_, "replace", &_inner_error_);
-#line 647 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = _tmp3_;
-#line 647 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp4_);
-#line 647 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 5134 "systemadm.c"
-                       goto __catch0_g_error;
-               }
-       }
-       goto __finally0;
-       __catch0_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp5_;
-               const gchar* _tmp6_;
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 649 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = e;
-#line 649 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = _tmp5_->message;
-#line 649 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp6_);
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5156 "systemadm.c"
-       }
-       __finally0:
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 646 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5169 "systemadm.c"
-       }
-#line 640 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (u);
-#line 5173 "systemadm.c"
-}
-
-
-void main_window_on_stop (MainWindow* self) {
-       Unit* _tmp0_ = NULL;
-       Unit* u;
-       Unit* _tmp1_;
-       GError * _inner_error_ = NULL;
-#line 653 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 654 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_unit (self);
-#line 654 "/home/lennart/projects/systemd/src/systemadm.vala"
-       u = _tmp0_;
-#line 656 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = u;
-#line 656 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 657 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 657 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5196 "systemadm.c"
-       }
-       {
-               Unit* _tmp2_;
-               char* _tmp3_ = NULL;
-               char* _tmp4_;
-#line 660 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = u;
-#line 660 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = unit_stop (_tmp2_, "replace", &_inner_error_);
-#line 660 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = _tmp3_;
-#line 660 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp4_);
-#line 660 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 5212 "systemadm.c"
-                       goto __catch1_g_error;
-               }
-       }
-       goto __finally1;
-       __catch1_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp5_;
-               const gchar* _tmp6_;
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 662 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = e;
-#line 662 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = _tmp5_->message;
-#line 662 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp6_);
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5234 "systemadm.c"
-       }
-       __finally1:
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 659 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5247 "systemadm.c"
-       }
-#line 653 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (u);
-#line 5251 "systemadm.c"
-}
-
-
-void main_window_on_reload (MainWindow* self) {
-       Unit* _tmp0_ = NULL;
-       Unit* u;
-       Unit* _tmp1_;
-       GError * _inner_error_ = NULL;
-#line 666 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 667 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_unit (self);
-#line 667 "/home/lennart/projects/systemd/src/systemadm.vala"
-       u = _tmp0_;
-#line 669 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = u;
-#line 669 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 670 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 670 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5274 "systemadm.c"
-       }
-       {
-               Unit* _tmp2_;
-               char* _tmp3_ = NULL;
-               char* _tmp4_;
-#line 673 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = u;
-#line 673 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = unit_reload (_tmp2_, "replace", &_inner_error_);
-#line 673 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = _tmp3_;
-#line 673 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp4_);
-#line 673 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 5290 "systemadm.c"
-                       goto __catch2_g_error;
-               }
-       }
-       goto __finally2;
-       __catch2_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp5_;
-               const gchar* _tmp6_;
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 675 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = e;
-#line 675 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = _tmp5_->message;
-#line 675 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp6_);
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5312 "systemadm.c"
-       }
-       __finally2:
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 672 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5325 "systemadm.c"
-       }
-#line 666 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (u);
-#line 5329 "systemadm.c"
-}
-
-
-void main_window_on_restart (MainWindow* self) {
-       Unit* _tmp0_ = NULL;
-       Unit* u;
-       Unit* _tmp1_;
-       GError * _inner_error_ = NULL;
-#line 679 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 680 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_unit (self);
-#line 680 "/home/lennart/projects/systemd/src/systemadm.vala"
-       u = _tmp0_;
-#line 682 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = u;
-#line 682 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 683 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 683 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5352 "systemadm.c"
-       }
-       {
-               Unit* _tmp2_;
-               char* _tmp3_ = NULL;
-               char* _tmp4_;
-#line 686 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = u;
-#line 686 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = unit_restart (_tmp2_, "replace", &_inner_error_);
-#line 686 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = _tmp3_;
-#line 686 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp4_);
-#line 686 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 5368 "systemadm.c"
-                       goto __catch3_g_error;
-               }
-       }
-       goto __finally3;
-       __catch3_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp5_;
-               const gchar* _tmp6_;
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 688 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = e;
-#line 688 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = _tmp5_->message;
-#line 688 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp6_);
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5390 "systemadm.c"
-       }
-       __finally3:
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 685 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5403 "systemadm.c"
-       }
-#line 679 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (u);
-#line 5407 "systemadm.c"
-}
-
-
-void main_window_on_cancel (MainWindow* self) {
-       Job* _tmp0_ = NULL;
-       Job* j;
-       Job* _tmp1_;
-       GError * _inner_error_ = NULL;
-#line 692 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 693 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = main_window_get_current_job (self);
-#line 693 "/home/lennart/projects/systemd/src/systemadm.vala"
-       j = _tmp0_;
-#line 695 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = j;
-#line 695 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp1_ == NULL) {
-#line 696 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (j);
-#line 696 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5430 "systemadm.c"
-       }
-       {
-               Job* _tmp2_;
-#line 699 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = j;
-#line 699 "/home/lennart/projects/systemd/src/systemadm.vala"
-               job_cancel (_tmp2_, &_inner_error_);
-#line 699 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 5440 "systemadm.c"
-                       goto __catch4_g_error;
-               }
-       }
-       goto __finally4;
-       __catch4_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp3_;
-               const gchar* _tmp4_;
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 701 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = e;
-#line 701 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = _tmp3_->message;
-#line 701 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp4_);
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5462 "systemadm.c"
-       }
-       __finally4:
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (j);
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 698 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5475 "systemadm.c"
-       }
-#line 692 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (j);
-#line 5479 "systemadm.c"
-}
-
-
-void main_window_update_unit_iter (MainWindow* self, GtkTreeIter* iter, const gchar* id, Unit* u) {
-       GError * _inner_error_ = NULL;
-#line 705 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 705 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (iter != NULL);
-#line 705 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (id != NULL);
-#line 705 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (u != NULL);
-#line 5493 "systemadm.c"
-       {
-               gchar* _tmp0_;
-               gchar* t;
-               Unit* _tmp1_;
-               UnitJobLink _tmp2_;
-               UnitJobLink _tmp3_;
-               UnitJobLink jl;
-               UnitJobLink _tmp4_;
-               guint32 _tmp5_;
-               gchar* _tmp15_ = NULL;
-               const gchar* _tmp16_;
-               GtkListStore* _tmp20_;
-               GtkTreeIter _tmp21_;
-               const gchar* _tmp22_;
-               Unit* _tmp23_;
-               gchar* _tmp24_;
-               gchar* _tmp25_;
-               gchar* _tmp26_;
-               Unit* _tmp27_;
-               gchar* _tmp28_;
-               gchar* _tmp29_;
-               gchar* _tmp30_;
-               Unit* _tmp31_;
-               gchar* _tmp32_;
-               gchar* _tmp33_;
-               gchar* _tmp34_;
-               Unit* _tmp35_;
-               gchar* _tmp36_;
-               gchar* _tmp37_;
-               gchar* _tmp38_;
-               const gchar* _tmp39_;
-               Unit* _tmp40_;
-#line 708 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = g_strdup ("");
-#line 708 "/home/lennart/projects/systemd/src/systemadm.vala"
-               t = _tmp0_;
-#line 709 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = u;
-#line 709 "/home/lennart/projects/systemd/src/systemadm.vala"
-               unit_get_job (_tmp1_, &_tmp2_);
-#line 709 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = _tmp2_;
-#line 709 "/home/lennart/projects/systemd/src/systemadm.vala"
-               jl = _tmp3_;
-#line 711 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = jl;
-#line 711 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = _tmp4_.id;
-#line 711 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp5_ != ((guint32) 0)) {
-#line 5544 "systemadm.c"
-                       GBusType _tmp6_ = 0;
-                       gboolean _tmp7_;
-                       GBusType _tmp8_;
-                       UnitJobLink _tmp9_;
-                       const char* _tmp10_;
-                       Job* _tmp11_ = NULL;
-                       Job* j;
-                       Job* _tmp12_;
-                       gchar* _tmp13_;
-                       gchar* _tmp14_;
-#line 713 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp7_ = user;
-#line 713 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (_tmp7_) {
-#line 713 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp6_ = G_BUS_TYPE_SESSION;
-#line 5561 "systemadm.c"
-                       } else {
-#line 713 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp6_ = G_BUS_TYPE_SYSTEM;
-#line 5565 "systemadm.c"
-                       }
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = _tmp6_;
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp9_ = jl;
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp10_ = _tmp9_.path;
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp11_ = g_initable_new (TYPE_JOB_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp8_, "g-object-path", (const gchar*) _tmp10_, "g-interface-name", "org.freedesktop.systemd1.Job", NULL);
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       j = (Job*) _tmp11_;
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (_inner_error_ != NULL) {
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               unit_job_link_destroy (&jl);
-#line 712 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (t);
-#line 5583 "systemadm.c"
-                               goto __catch5_g_error;
-                       }
-#line 717 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp12_ = j;
-#line 717 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp13_ = job_get_job_type (_tmp12_);
-#line 717 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp14_ = _tmp13_;
-#line 717 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (t);
-#line 717 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       t = _tmp14_;
-#line 711 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (j);
-#line 5598 "systemadm.c"
-               }
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp16_ = t;
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (g_strcmp0 (_tmp16_, "") != 0) {
-#line 5604 "systemadm.c"
-                       const gchar* _tmp17_;
-                       gchar* _tmp18_ = NULL;
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp17_ = t;
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp18_ = g_strdup_printf ("→ %s", _tmp17_);
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (_tmp15_);
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp15_ = _tmp18_;
-#line 5615 "systemadm.c"
-               } else {
-                       gchar* _tmp19_;
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp19_ = g_strdup ("");
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (_tmp15_);
-#line 726 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp15_ = _tmp19_;
-#line 5624 "systemadm.c"
-               }
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp20_ = self->priv->unit_model;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp21_ = *iter;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp22_ = id;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp23_ = u;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp24_ = unit_get_description (_tmp23_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp25_ = _tmp24_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp26_ = _tmp25_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp27_ = u;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp28_ = unit_get_load_state (_tmp27_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp29_ = _tmp28_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp30_ = _tmp29_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp31_ = u;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp32_ = unit_get_active_state (_tmp31_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp33_ = _tmp32_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp34_ = _tmp33_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp35_ = u;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp36_ = unit_get_sub_state (_tmp35_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp37_ = _tmp36_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp38_ = _tmp37_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp39_ = _tmp15_;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp40_ = u;
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_list_store_set (_tmp20_, &_tmp21_, 0, _tmp22_, 1, _tmp26_, 2, _tmp30_, 3, _tmp34_, 4, _tmp38_, 5, _tmp39_, 6, _tmp40_, -1);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp38_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp34_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp30_);
-#line 720 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp26_);
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp15_);
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               unit_job_link_destroy (&jl);
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (t);
-#line 5684 "systemadm.c"
-       }
-       goto __finally5;
-       __catch5_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp41_;
-               const gchar* _tmp42_;
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 729 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp41_ = e;
-#line 729 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp42_ = _tmp41_->message;
-#line 729 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp42_);
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5704 "systemadm.c"
-       }
-       __finally5:
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 707 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5715 "systemadm.c"
-       }
-}
-
-
-void main_window_on_unit_new (MainWindow* self, const gchar* id, const char* path) {
-       GError * _inner_error_ = NULL;
-#line 733 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 733 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (id != NULL);
-#line 733 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (path != NULL);
-#line 5728 "systemadm.c"
-       {
-               GBusType _tmp0_ = 0;
-               gboolean _tmp1_;
-               GBusType _tmp2_;
-               const char* _tmp3_;
-               Properties* _tmp4_ = NULL;
-               Properties* p;
-               Properties* _tmp5_;
-               GtkTreeIter iter = {0};
-               GtkListStore* _tmp6_;
-               GtkTreeIter _tmp7_ = {0};
-               GBusType _tmp8_ = 0;
-               gboolean _tmp9_;
-               GBusType _tmp10_;
-               const char* _tmp11_;
-               Unit* _tmp12_ = NULL;
-               Unit* u;
-               GeeHashMap* _tmp13_;
-               const gchar* _tmp14_;
-               Unit* _tmp15_;
-               GtkTreeIter _tmp16_;
-               const gchar* _tmp17_;
-               Unit* _tmp18_;
-#line 737 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = user;
-#line 737 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp1_) {
-#line 737 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SESSION;
-#line 5758 "systemadm.c"
-               } else {
-#line 737 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SYSTEM;
-#line 5762 "systemadm.c"
-               }
-#line 736 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = _tmp0_;
-#line 736 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = path;
-#line 736 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = g_initable_new (TYPE_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp2_, "g-object-path", (const gchar*) _tmp3_, "g-interface-name", "org.freedesktop.Properties", NULL);
-#line 736 "/home/lennart/projects/systemd/src/systemadm.vala"
-               p = (Properties*) _tmp4_;
-#line 736 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 5774 "systemadm.c"
-                       goto __catch6_g_error;
-               }
-#line 741 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = p;
-#line 741 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_signal_connect_object (_tmp5_, "properties-changed", (GCallback) _main_window_on_unit_changed_properties_properties_changed, self, 0);
-#line 744 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = self->priv->unit_model;
-#line 744 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_list_store_append (_tmp6_, &_tmp7_);
-#line 744 "/home/lennart/projects/systemd/src/systemadm.vala"
-               iter = _tmp7_;
-#line 747 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp9_ = user;
-#line 747 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp9_) {
-#line 747 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = G_BUS_TYPE_SESSION;
-#line 5793 "systemadm.c"
-               } else {
-#line 747 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = G_BUS_TYPE_SYSTEM;
-#line 5797 "systemadm.c"
-               }
-#line 746 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = _tmp8_;
-#line 746 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp11_ = path;
-#line 746 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp12_ = g_initable_new (TYPE_UNIT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp10_, "g-object-path", (const gchar*) _tmp11_, "g-interface-name", "org.freedesktop.systemd1.Unit", NULL);
-#line 746 "/home/lennart/projects/systemd/src/systemadm.vala"
-               u = (Unit*) _tmp12_;
-#line 746 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 746 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (p);
-#line 5811 "systemadm.c"
-                       goto __catch6_g_error;
-               }
-#line 751 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp13_ = self->priv->unit_map;
-#line 751 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp14_ = id;
-#line 751 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp15_ = u;
-#line 751 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gee_abstract_map_set ((GeeAbstractMap*) _tmp13_, _tmp14_, _tmp15_);
-#line 753 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp16_ = iter;
-#line 753 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp17_ = id;
-#line 753 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp18_ = u;
-#line 753 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_update_unit_iter (self, &_tmp16_, _tmp17_, _tmp18_);
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (p);
-#line 5834 "systemadm.c"
-       }
-       goto __finally6;
-       __catch6_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp19_;
-               const gchar* _tmp20_;
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 755 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp19_ = e;
-#line 755 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp20_ = _tmp19_->message;
-#line 755 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp20_);
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 5854 "systemadm.c"
-       }
-       __finally6:
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 734 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 5865 "systemadm.c"
-       }
-}
-
-
-void main_window_update_job_iter (MainWindow* self, GtkTreeIter* iter, guint32 id, Job* j) {
-       GtkListStore* _tmp0_;
-       GtkTreeIter _tmp1_;
-       guint32 _tmp2_;
-       gchar* _tmp3_ = NULL;
-       gchar* _tmp4_;
-       Job* _tmp5_;
-       JobUnitLink _tmp6_;
-       JobUnitLink _tmp7_;
-       JobUnitLink _tmp8_;
-       const gchar* _tmp9_;
-       Job* _tmp10_;
-       gchar* _tmp11_;
-       gchar* _tmp12_;
-       gchar* _tmp13_;
-       gchar* _tmp14_ = NULL;
-       gchar* _tmp15_;
-       Job* _tmp16_;
-       gchar* _tmp17_;
-       gchar* _tmp18_;
-       gchar* _tmp19_;
-       Job* _tmp20_;
-       guint32 _tmp21_;
-#line 759 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 759 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (iter != NULL);
-#line 759 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (j != NULL);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->job_model;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = *iter;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = id;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = g_strdup_printf ("%u", (guint) _tmp2_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp4_ = _tmp3_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = j;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       job_get_unit (_tmp5_, &_tmp6_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp7_ = _tmp6_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp8_ = _tmp7_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp9_ = _tmp8_.id;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = j;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = job_get_job_type (_tmp10_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp12_ = _tmp11_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp13_ = _tmp12_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp14_ = g_strdup_printf ("→ %s", _tmp13_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp15_ = _tmp14_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp16_ = j;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp17_ = job_get_state (_tmp16_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp18_ = _tmp17_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp19_ = _tmp18_;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp20_ = j;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp21_ = id;
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_list_store_set (_tmp0_, &_tmp1_, 0, _tmp4_, 1, _tmp9_, 2, _tmp15_, 3, _tmp19_, 4, _tmp20_, 5, _tmp21_, -1);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp19_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp15_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp13_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       job_unit_link_destroy (&_tmp8_);
-#line 760 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (_tmp4_);
-#line 5955 "systemadm.c"
-}
-
-
-void main_window_on_job_new (MainWindow* self, guint32 id, const char* path) {
-       GError * _inner_error_ = NULL;
-#line 769 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 769 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (path != NULL);
-#line 5965 "systemadm.c"
-       {
-               GBusType _tmp0_ = 0;
-               gboolean _tmp1_;
-               GBusType _tmp2_;
-               const char* _tmp3_;
-               Properties* _tmp4_ = NULL;
-               Properties* p;
-               Properties* _tmp5_;
-               GtkTreeIter iter = {0};
-               GtkListStore* _tmp6_;
-               GtkTreeIter _tmp7_ = {0};
-               GBusType _tmp8_ = 0;
-               gboolean _tmp9_;
-               GBusType _tmp10_;
-               const char* _tmp11_;
-               Job* _tmp12_ = NULL;
-               Job* j;
-               GtkTreeIter _tmp13_;
-               guint32 _tmp14_;
-               Job* _tmp15_;
-#line 774 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = user;
-#line 774 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp1_) {
-#line 774 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SESSION;
-#line 5992 "systemadm.c"
-               } else {
-#line 774 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SYSTEM;
-#line 5996 "systemadm.c"
-               }
-#line 773 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = _tmp0_;
-#line 773 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = path;
-#line 773 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = g_initable_new (TYPE_PROPERTIES_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp2_, "g-object-path", (const gchar*) _tmp3_, "g-interface-name", "org.freedesktop.Properties", NULL);
-#line 773 "/home/lennart/projects/systemd/src/systemadm.vala"
-               p = (Properties*) _tmp4_;
-#line 773 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 6008 "systemadm.c"
-                       goto __catch7_g_error;
-               }
-#line 778 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = p;
-#line 778 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_signal_connect_object (_tmp5_, "properties-changed", (GCallback) _main_window_on_job_changed_properties_properties_changed, self, 0);
-#line 781 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = self->priv->job_model;
-#line 781 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_list_store_append (_tmp6_, &_tmp7_);
-#line 781 "/home/lennart/projects/systemd/src/systemadm.vala"
-               iter = _tmp7_;
-#line 784 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp9_ = user;
-#line 784 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp9_) {
-#line 784 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = G_BUS_TYPE_SESSION;
-#line 6027 "systemadm.c"
-               } else {
-#line 784 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = G_BUS_TYPE_SYSTEM;
-#line 6031 "systemadm.c"
-               }
-#line 783 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = _tmp8_;
-#line 783 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp11_ = path;
-#line 783 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp12_ = g_initable_new (TYPE_JOB_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp10_, "g-object-path", (const gchar*) _tmp11_, "g-interface-name", "org.freedesktop.systemd1.Job", NULL);
-#line 783 "/home/lennart/projects/systemd/src/systemadm.vala"
-               j = (Job*) _tmp12_;
-#line 783 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 783 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (p);
-#line 6045 "systemadm.c"
-                       goto __catch7_g_error;
-               }
-#line 788 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp13_ = iter;
-#line 788 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp14_ = id;
-#line 788 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp15_ = j;
-#line 788 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_update_job_iter (self, &_tmp13_, _tmp14_, _tmp15_);
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (j);
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (p);
-#line 6060 "systemadm.c"
-       }
-       goto __finally7;
-       __catch7_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp16_;
-               const gchar* _tmp17_;
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 791 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp16_ = e;
-#line 791 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp17_ = _tmp16_->message;
-#line 791 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp17_);
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 6080 "systemadm.c"
-       }
-       __finally7:
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 771 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 6091 "systemadm.c"
-       }
-}
-
-
-void main_window_on_unit_removed (MainWindow* self, const gchar* id, const char* path) {
-       GtkTreeIter iter = {0};
-       GtkListStore* _tmp0_;
-       GtkTreeIter _tmp1_ = {0};
-       gboolean _tmp2_ = FALSE;
-       GeeHashMap* _tmp15_;
-       const gchar* _tmp16_;
-#line 795 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 795 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (id != NULL);
-#line 795 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (path != NULL);
-#line 797 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_model;
-#line 797 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 797 "/home/lennart/projects/systemd/src/systemadm.vala"
-       iter = _tmp1_;
-#line 797 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (!_tmp2_) {
-#line 798 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 6119 "systemadm.c"
-       }
-       {
-               gboolean _tmp3_;
-#line 800 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = TRUE;
-#line 800 "/home/lennart/projects/systemd/src/systemadm.vala"
-               while (TRUE) {
-#line 6127 "systemadm.c"
-                       gboolean _tmp4_;
-                       gchar* name = NULL;
-                       GtkListStore* _tmp7_;
-                       GtkTreeIter _tmp8_;
-                       const gchar* _tmp9_;
-                       const gchar* _tmp10_;
-#line 800 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp4_ = _tmp3_;
-#line 800 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (!_tmp4_) {
-#line 6138 "systemadm.c"
-                               GtkListStore* _tmp5_;
-                               gboolean _tmp6_ = FALSE;
-#line 813 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp5_ = self->priv->unit_model;
-#line 813 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
-#line 813 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (!_tmp6_) {
-#line 813 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       break;
-#line 6149 "systemadm.c"
-                               }
-                       }
-#line 800 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp3_ = FALSE;
-#line 803 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp7_ = self->priv->unit_model;
-#line 803 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = iter;
-#line 803 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &name, -1);
-#line 805 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp9_ = id;
-#line 805 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp10_ = name;
-#line 805 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (g_strcmp0 (_tmp9_, _tmp10_) == 0) {
-#line 6166 "systemadm.c"
-                               const gchar* _tmp11_;
-                               const gchar* _tmp12_;
-                               GtkListStore* _tmp13_;
-                               GtkTreeIter _tmp14_;
-#line 806 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp11_ = self->priv->current_unit_id;
-#line 806 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp12_ = name;
-#line 806 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 807 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       main_window_clear_unit (self);
-#line 6179 "systemadm.c"
-                               }
-#line 809 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp13_ = self->priv->unit_model;
-#line 809 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = iter;
-#line 809 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_list_store_remove (_tmp13_, &_tmp14_);
-#line 810 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (name);
-#line 810 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 6191 "systemadm.c"
-                       }
-#line 800 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (name);
-#line 6195 "systemadm.c"
-               }
-       }
-#line 815 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp15_ = self->priv->unit_map;
-#line 815 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp16_ = id;
-#line 815 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gee_abstract_map_unset ((GeeAbstractMap*) _tmp15_, _tmp16_, NULL);
-#line 6204 "systemadm.c"
-}
-
-
-void main_window_on_job_removed (MainWindow* self, guint32 id, const char* path, const gchar* res) {
-       GtkTreeIter iter = {0};
-       GtkListStore* _tmp0_;
-       GtkTreeIter _tmp1_ = {0};
-       gboolean _tmp2_ = FALSE;
-#line 818 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 818 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (path != NULL);
-#line 818 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (res != NULL);
-#line 820 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->job_model;
-#line 820 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 820 "/home/lennart/projects/systemd/src/systemadm.vala"
-       iter = _tmp1_;
-#line 820 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (!_tmp2_) {
-#line 821 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 6229 "systemadm.c"
-       }
-       {
-               gboolean _tmp3_;
-#line 823 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = TRUE;
-#line 823 "/home/lennart/projects/systemd/src/systemadm.vala"
-               while (TRUE) {
-#line 6237 "systemadm.c"
-                       gboolean _tmp4_;
-                       guint32 j = 0U;
-                       GtkListStore* _tmp7_;
-                       GtkTreeIter _tmp8_;
-                       guint32 _tmp9_;
-                       guint32 _tmp10_;
-#line 823 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp4_ = _tmp3_;
-#line 823 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (!_tmp4_) {
-#line 6248 "systemadm.c"
-                               GtkListStore* _tmp5_;
-                               gboolean _tmp6_ = FALSE;
-#line 837 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp5_ = self->priv->job_model;
-#line 837 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
-#line 837 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (!_tmp6_) {
-#line 837 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       break;
-#line 6259 "systemadm.c"
-                               }
-                       }
-#line 823 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp3_ = FALSE;
-#line 826 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp7_ = self->priv->job_model;
-#line 826 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp8_ = iter;
-#line 826 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 5, &j, -1);
-#line 828 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp9_ = id;
-#line 828 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp10_ = j;
-#line 828 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (_tmp9_ == _tmp10_) {
-#line 6276 "systemadm.c"
-                               guint32 _tmp11_;
-                               guint32 _tmp12_;
-                               GtkListStore* _tmp13_;
-                               GtkTreeIter _tmp14_;
-#line 829 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp11_ = self->priv->current_job_id;
-#line 829 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp12_ = j;
-#line 829 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp11_ == _tmp12_) {
-#line 830 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       main_window_clear_job (self);
-#line 6289 "systemadm.c"
-                               }
-#line 832 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp13_ = self->priv->job_model;
-#line 832 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = iter;
-#line 832 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_list_store_remove (_tmp13_, &_tmp14_);
-#line 834 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               break;
-#line 6299 "systemadm.c"
-                       }
-               }
-       }
-}
-
-
-void main_window_on_unit_changed (MainWindow* self, Properties* p, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1) {
-       GError * _inner_error_ = NULL;
-#line 840 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 840 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (p != NULL);
-#line 840 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (iface != NULL);
-#line 840 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (changed_properties != NULL);
-#line 6316 "systemadm.c"
-       {
-               GtkTreeIter iter = {0};
-               gchar* id = NULL;
-               GBusType _tmp0_ = 0;
-               gboolean _tmp1_;
-               GBusType _tmp2_;
-               Properties* _tmp3_;
-               const gchar* _tmp4_ = NULL;
-               Properties* _tmp5_;
-               const gchar* _tmp6_ = NULL;
-               Unit* _tmp7_ = NULL;
-               Unit* u;
-               GtkListStore* _tmp8_;
-               GtkTreeIter _tmp9_ = {0};
-               gboolean _tmp10_ = FALSE;
-               Unit* _tmp11_;
-               gchar* _tmp12_;
-               gchar* _tmp13_;
-#line 847 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = user;
-#line 847 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp1_) {
-#line 847 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SESSION;
-#line 6341 "systemadm.c"
-               } else {
-#line 847 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SYSTEM;
-#line 6345 "systemadm.c"
-               }
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = _tmp0_;
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = p;
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = g_dbus_proxy_get_name ((GDBusProxy*) _tmp3_);
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = p;
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = g_dbus_proxy_get_object_path ((GDBusProxy*) _tmp5_);
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = g_initable_new (TYPE_UNIT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp4_, "g-bus-type", _tmp2_, "g-object-path", _tmp6_, "g-interface-name", "org.freedesktop.systemd1.Unit", NULL);
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               u = (Unit*) _tmp7_;
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 846 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 6365 "systemadm.c"
-                       goto __catch8_g_error;
-               }
-#line 851 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp8_ = self->priv->unit_model;
-#line 851 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp8_, &_tmp9_);
-#line 851 "/home/lennart/projects/systemd/src/systemadm.vala"
-               iter = _tmp9_;
-#line 851 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (!_tmp10_) {
-#line 852 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (u);
-#line 852 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 852 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return;
-#line 6382 "systemadm.c"
-               }
-#line 854 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp11_ = u;
-#line 854 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp12_ = unit_get_id (_tmp11_);
-#line 854 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp13_ = _tmp12_;
-#line 854 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (id);
-#line 854 "/home/lennart/projects/systemd/src/systemadm.vala"
-               id = _tmp13_;
-#line 6394 "systemadm.c"
-               {
-                       gboolean _tmp14_;
-#line 856 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp14_ = TRUE;
-#line 856 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       while (TRUE) {
-#line 6401 "systemadm.c"
-                               gboolean _tmp15_;
-                               gchar* name = NULL;
-                               GtkListStore* _tmp18_;
-                               GtkTreeIter _tmp19_;
-                               const gchar* _tmp20_;
-                               const gchar* _tmp21_;
-#line 856 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp15_ = _tmp14_;
-#line 856 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (!_tmp15_) {
-#line 6412 "systemadm.c"
-                                       GtkListStore* _tmp16_;
-                                       gboolean _tmp17_ = FALSE;
-#line 870 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp16_ = self->priv->unit_model;
-#line 870 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp17_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp16_, &iter);
-#line 870 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (!_tmp17_) {
-#line 870 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               break;
-#line 6423 "systemadm.c"
-                                       }
-                               }
-#line 856 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = FALSE;
-#line 859 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp18_ = self->priv->unit_model;
-#line 859 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp19_ = iter;
-#line 859 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_tree_model_get ((GtkTreeModel*) _tmp18_, &_tmp19_, 0, &name, -1);
-#line 861 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp20_ = id;
-#line 861 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp21_ = name;
-#line 861 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (g_strcmp0 (_tmp20_, _tmp21_) == 0) {
-#line 6440 "systemadm.c"
-                                       GtkTreeIter _tmp22_;
-                                       const gchar* _tmp23_;
-                                       Unit* _tmp24_;
-                                       const gchar* _tmp25_;
-                                       const gchar* _tmp26_;
-#line 862 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp22_ = iter;
-#line 862 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp23_ = id;
-#line 862 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp24_ = u;
-#line 862 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       main_window_update_unit_iter (self, &_tmp22_, _tmp23_, _tmp24_);
-#line 864 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp25_ = self->priv->current_unit_id;
-#line 864 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp26_ = id;
-#line 864 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (g_strcmp0 (_tmp25_, _tmp26_) == 0) {
-#line 6460 "systemadm.c"
-                                               Unit* _tmp27_;
-#line 865 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               _tmp27_ = u;
-#line 865 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               main_window_show_unit (self, _tmp27_);
-#line 6466 "systemadm.c"
-                                       }
-#line 867 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _g_free0 (name);
-#line 867 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       break;
-#line 6472 "systemadm.c"
-                               }
-#line 856 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _g_free0 (name);
-#line 6476 "systemadm.c"
-                       }
-               }
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (id);
-#line 6483 "systemadm.c"
-       }
-       goto __finally8;
-       __catch8_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp28_;
-               const gchar* _tmp29_;
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 873 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp28_ = e;
-#line 873 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp29_ = _tmp28_->message;
-#line 873 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp29_);
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 6503 "systemadm.c"
-       }
-       __finally8:
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 842 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 6514 "systemadm.c"
-       }
-}
-
-
-void main_window_on_job_changed (MainWindow* self, Properties* p, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1) {
-       GError * _inner_error_ = NULL;
-#line 877 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 877 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (p != NULL);
-#line 877 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (iface != NULL);
-#line 877 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (changed_properties != NULL);
-#line 6529 "systemadm.c"
-       {
-               GtkTreeIter iter = {0};
-               guint32 id = 0U;
-               GBusType _tmp0_ = 0;
-               gboolean _tmp1_;
-               GBusType _tmp2_;
-               Properties* _tmp3_;
-               const gchar* _tmp4_ = NULL;
-               Properties* _tmp5_;
-               const gchar* _tmp6_ = NULL;
-               Job* _tmp7_ = NULL;
-               Job* j;
-               GtkListStore* _tmp8_;
-               GtkTreeIter _tmp9_ = {0};
-               gboolean _tmp10_ = FALSE;
-               Job* _tmp11_;
-               guint32 _tmp12_;
-               guint32 _tmp13_;
-#line 883 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = user;
-#line 883 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp1_) {
-#line 883 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SESSION;
-#line 6554 "systemadm.c"
-               } else {
-#line 883 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp0_ = G_BUS_TYPE_SYSTEM;
-#line 6558 "systemadm.c"
-               }
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = _tmp0_;
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = p;
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = g_dbus_proxy_get_name ((GDBusProxy*) _tmp3_);
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = p;
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = g_dbus_proxy_get_object_path ((GDBusProxy*) _tmp5_);
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = g_initable_new (TYPE_JOB_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", _tmp4_, "g-bus-type", _tmp2_, "g-object-path", _tmp6_, "g-interface-name", "org.freedesktop.systemd1.Job", NULL);
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               j = (Job*) _tmp7_;
-#line 882 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 6576 "systemadm.c"
-                       goto __catch9_g_error;
-               }
-#line 887 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp8_ = self->priv->job_model;
-#line 887 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp8_, &_tmp9_);
-#line 887 "/home/lennart/projects/systemd/src/systemadm.vala"
-               iter = _tmp9_;
-#line 887 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (!_tmp10_) {
-#line 888 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_object_unref0 (j);
-#line 888 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return;
-#line 6591 "systemadm.c"
-               }
-#line 890 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp11_ = j;
-#line 890 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp12_ = job_get_id (_tmp11_);
-#line 890 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp13_ = _tmp12_;
-#line 890 "/home/lennart/projects/systemd/src/systemadm.vala"
-               id = _tmp13_;
-#line 6601 "systemadm.c"
-               {
-                       gboolean _tmp14_;
-#line 892 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp14_ = TRUE;
-#line 892 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       while (TRUE) {
-#line 6608 "systemadm.c"
-                               gboolean _tmp15_;
-                               guint32 k = 0U;
-                               GtkListStore* _tmp18_;
-                               GtkTreeIter _tmp19_;
-                               guint32 _tmp20_;
-                               guint32 _tmp21_;
-#line 892 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp15_ = _tmp14_;
-#line 892 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (!_tmp15_) {
-#line 6619 "systemadm.c"
-                                       GtkListStore* _tmp16_;
-                                       gboolean _tmp17_ = FALSE;
-#line 906 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp16_ = self->priv->job_model;
-#line 906 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp17_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp16_, &iter);
-#line 906 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (!_tmp17_) {
-#line 906 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               break;
-#line 6630 "systemadm.c"
-                                       }
-                               }
-#line 892 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp14_ = FALSE;
-#line 895 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp18_ = self->priv->job_model;
-#line 895 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp19_ = iter;
-#line 895 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               gtk_tree_model_get ((GtkTreeModel*) _tmp18_, &_tmp19_, 5, &k, -1);
-#line 897 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp20_ = id;
-#line 897 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               _tmp21_ = k;
-#line 897 "/home/lennart/projects/systemd/src/systemadm.vala"
-                               if (_tmp20_ == _tmp21_) {
-#line 6647 "systemadm.c"
-                                       GtkTreeIter _tmp22_;
-                                       guint32 _tmp23_;
-                                       Job* _tmp24_;
-                                       guint32 _tmp25_;
-                                       guint32 _tmp26_;
-#line 898 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp22_ = iter;
-#line 898 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp23_ = id;
-#line 898 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp24_ = j;
-#line 898 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       main_window_update_job_iter (self, &_tmp22_, _tmp23_, _tmp24_);
-#line 900 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp25_ = self->priv->current_job_id;
-#line 900 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       _tmp26_ = id;
-#line 900 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       if (_tmp25_ == _tmp26_) {
-#line 6667 "systemadm.c"
-                                               Job* _tmp27_;
-#line 901 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               _tmp27_ = j;
-#line 901 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                               main_window_show_job (self, _tmp27_);
-#line 6673 "systemadm.c"
-                                       }
-#line 903 "/home/lennart/projects/systemd/src/systemadm.vala"
-                                       break;
-#line 6677 "systemadm.c"
-                               }
-                       }
-               }
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (j);
-#line 6683 "systemadm.c"
-       }
-       goto __finally9;
-       __catch9_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp28_;
-               const gchar* _tmp29_;
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 909 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp28_ = e;
-#line 909 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp29_ = _tmp28_->message;
-#line 909 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp29_);
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 6703 "systemadm.c"
-       }
-       __finally9:
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 878 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 6714 "systemadm.c"
-       }
-}
-
-
-gboolean main_window_unit_filter (MainWindow* self, GtkTreeModel* model, GtkTreeIter* iter) {
-       gboolean result = FALSE;
-       gchar* id = NULL;
-       gchar* active_state = NULL;
-       gchar* job = NULL;
-       GtkTreeModel* _tmp0_;
-       GtkTreeIter _tmp1_;
-       const gchar* _tmp2_;
-       gboolean _tmp3_ = FALSE;
-       gboolean _tmp4_ = FALSE;
-       GtkCheckButton* _tmp5_;
-       gboolean _tmp6_ = FALSE;
-       gboolean _tmp8_;
-       gboolean _tmp10_;
-       GtkComboBox* _tmp11_;
-       gint _tmp12_ = 0;
-#line 913 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 913 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (model != NULL, FALSE);
-#line 913 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (iter != NULL, FALSE);
-#line 916 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = model;
-#line 916 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = *iter;
-#line 916 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_get (_tmp0_, &_tmp1_, 0, &id, 3, &active_state, 5, &job, -1);
-#line 918 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = id;
-#line 918 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp2_ == NULL) {
-#line 919 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = FALSE;
-#line 919 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (job);
-#line 919 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (active_state);
-#line 919 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (id);
-#line 919 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 6761 "systemadm.c"
-       }
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp5_ = self->priv->inactive_checkbox;
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp6_ = gtk_toggle_button_get_active ((GtkToggleButton*) _tmp5_);
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (!_tmp6_) {
-#line 6769 "systemadm.c"
-               const gchar* _tmp7_;
-#line 922 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = active_state;
-#line 922 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = g_strcmp0 (_tmp7_, "inactive") == 0;
-#line 6775 "systemadm.c"
-       } else {
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = FALSE;
-#line 6779 "systemadm.c"
-       }
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp8_ = _tmp4_;
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp8_) {
-#line 6785 "systemadm.c"
-               const gchar* _tmp9_;
-#line 922 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp9_ = job;
-#line 922 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = g_strcmp0 (_tmp9_, "") == 0;
-#line 6791 "systemadm.c"
-       } else {
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = FALSE;
-#line 6795 "systemadm.c"
-       }
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp10_ = _tmp3_;
-#line 921 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_tmp10_) {
-#line 923 "/home/lennart/projects/systemd/src/systemadm.vala"
-               result = FALSE;
-#line 923 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (job);
-#line 923 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (active_state);
-#line 923 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (id);
-#line 923 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return result;
-#line 6811 "systemadm.c"
-       }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp11_ = self->priv->unit_type_combo_box;
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp12_ = gtk_combo_box_get_active (_tmp11_);
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-       switch (_tmp12_) {
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 0:
-#line 6821 "systemadm.c"
-               {
-#line 927 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = TRUE;
-#line 927 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 927 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 927 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 927 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6833 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 1:
-#line 6837 "systemadm.c"
-               {
-                       const gchar* _tmp13_;
-                       gboolean _tmp14_ = FALSE;
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp13_ = id;
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp14_ = g_str_has_suffix (_tmp13_, ".target");
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp14_;
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 929 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6855 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 2:
-#line 6859 "systemadm.c"
-               {
-                       const gchar* _tmp15_;
-                       gboolean _tmp16_ = FALSE;
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp15_ = id;
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp16_ = g_str_has_suffix (_tmp15_, ".service");
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp16_;
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 931 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6877 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 3:
-#line 6881 "systemadm.c"
-               {
-                       const gchar* _tmp17_;
-                       gboolean _tmp18_ = FALSE;
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp17_ = id;
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp18_ = g_str_has_suffix (_tmp17_, ".device");
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp18_;
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 933 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6899 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 4:
-#line 6903 "systemadm.c"
-               {
-                       const gchar* _tmp19_;
-                       gboolean _tmp20_ = FALSE;
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp19_ = id;
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp20_ = g_str_has_suffix (_tmp19_, ".mount");
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp20_;
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 935 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6921 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 5:
-#line 6925 "systemadm.c"
-               {
-                       const gchar* _tmp21_;
-                       gboolean _tmp22_ = FALSE;
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp21_ = id;
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp22_ = g_str_has_suffix (_tmp21_, ".automount");
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp22_;
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 937 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6943 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 6:
-#line 6947 "systemadm.c"
-               {
-                       const gchar* _tmp23_;
-                       gboolean _tmp24_ = FALSE;
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp23_ = id;
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp24_ = g_str_has_suffix (_tmp23_, ".swap");
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp24_;
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 939 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6965 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 7:
-#line 6969 "systemadm.c"
-               {
-                       const gchar* _tmp25_;
-                       gboolean _tmp26_ = FALSE;
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp25_ = id;
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp26_ = g_str_has_suffix (_tmp25_, ".socket");
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp26_;
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 941 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 6987 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 8:
-#line 6991 "systemadm.c"
-               {
-                       const gchar* _tmp27_;
-                       gboolean _tmp28_ = FALSE;
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp27_ = id;
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp28_ = g_str_has_suffix (_tmp27_, ".path");
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp28_;
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 943 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 7009 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 9:
-#line 7013 "systemadm.c"
-               {
-                       const gchar* _tmp29_;
-                       gboolean _tmp30_ = FALSE;
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp29_ = id;
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp30_ = g_str_has_suffix (_tmp29_, ".timer");
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp30_;
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 945 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 7031 "systemadm.c"
-               }
-#line 925 "/home/lennart/projects/systemd/src/systemadm.vala"
-               case 10:
-#line 7035 "systemadm.c"
-               {
-                       const gchar* _tmp31_;
-                       gboolean _tmp32_ = FALSE;
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp31_ = id;
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp32_ = g_str_has_suffix (_tmp31_, ".snapshot");
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = _tmp32_;
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 947 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 7053 "systemadm.c"
-               }
-               default:
-               {
-#line 949 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       g_assert (FALSE);
-#line 950 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       result = FALSE;
-#line 950 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (job);
-#line 950 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (active_state);
-#line 950 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (id);
-#line 950 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       return result;
-#line 7069 "systemadm.c"
-               }
-       }
-#line 913 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (job);
-#line 913 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (active_state);
-#line 913 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (id);
-#line 7078 "systemadm.c"
-}
-
-
-void main_window_unit_type_changed (MainWindow* self) {
-       GtkTreeView* _tmp0_;
-       GtkTreeModel* _tmp1_ = NULL;
-       GtkTreeModel* _tmp2_ = NULL;
-       GtkTreeModelFilter* _tmp3_;
-       GtkTreeModelFilter* model;
-#line 954 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 955 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_view;
-#line 955 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = gtk_tree_view_get_model (_tmp0_);
-#line 955 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (_tmp1_));
-#line 955 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = _g_object_ref0 (GTK_TREE_MODEL_FILTER (_tmp2_));
-#line 955 "/home/lennart/projects/systemd/src/systemadm.vala"
-       model = _tmp3_;
-#line 957 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_tree_model_filter_refilter (model);
-#line 954 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (model);
-#line 7104 "systemadm.c"
-}
-
-
-void main_window_on_server_reload (MainWindow* self) {
-       GError * _inner_error_ = NULL;
-#line 960 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 7112 "systemadm.c"
-       {
-               Manager* _tmp0_;
-#line 962 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = self->priv->manager;
-#line 962 "/home/lennart/projects/systemd/src/systemadm.vala"
-               manager_reload (_tmp0_, &_inner_error_);
-#line 962 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 7121 "systemadm.c"
-                       goto __catch10_g_error;
-               }
-       }
-       goto __finally10;
-       __catch10_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp1_;
-               const gchar* _tmp2_;
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 964 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = e;
-#line 964 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = _tmp1_->message;
-#line 964 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp2_);
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 7143 "systemadm.c"
-       }
-       __finally10:
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 961 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 7154 "systemadm.c"
-       }
-}
-
-
-void main_window_on_server_snapshot (MainWindow* self) {
-       GError * _inner_error_ = NULL;
-#line 968 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 7163 "systemadm.c"
-       {
-               Manager* _tmp0_;
-               char* _tmp1_ = NULL;
-               char* _tmp2_;
-               GtkComboBox* _tmp3_;
-               gint _tmp4_ = 0;
-#line 970 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = self->priv->manager;
-#line 970 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = manager_create_snapshot (_tmp0_, "", FALSE, &_inner_error_);
-#line 970 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = _tmp1_;
-#line 970 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp2_);
-#line 970 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 7180 "systemadm.c"
-                       goto __catch11_g_error;
-               }
-#line 972 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = self->priv->unit_type_combo_box;
-#line 972 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 972 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp4_ != 0) {
-#line 7189 "systemadm.c"
-                       GtkComboBox* _tmp5_;
-#line 973 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp5_ = self->priv->unit_type_combo_box;
-#line 973 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       gtk_combo_box_set_active (_tmp5_, 8);
-#line 7195 "systemadm.c"
-               }
-       }
-       goto __finally11;
-       __catch11_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp6_;
-               const gchar* _tmp7_;
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 976 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = e;
-#line 976 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = _tmp6_->message;
-#line 976 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp7_);
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 7216 "systemadm.c"
-       }
-       __finally11:
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 969 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 7227 "systemadm.c"
-       }
-}
-
-
-void main_window_on_unit_load (MainWindow* self) {
-       GtkEntry* _tmp0_;
-       const gchar* _tmp1_ = NULL;
-       gchar* _tmp2_;
-       gchar* t;
-       const gchar* _tmp3_;
-       GError * _inner_error_ = NULL;
-#line 980 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 981 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_load_entry;
-#line 981 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 981 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = g_strdup (_tmp1_);
-#line 981 "/home/lennart/projects/systemd/src/systemadm.vala"
-       t = _tmp2_;
-#line 983 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp3_ = t;
-#line 983 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (g_strcmp0 (_tmp3_, "") == 0) {
-#line 984 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (t);
-#line 984 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 7257 "systemadm.c"
-       }
-       {
-               Manager* _tmp4_;
-               const gchar* _tmp5_;
-               char* _tmp6_ = NULL;
-               char* path;
-               GBusType _tmp7_ = 0;
-               gboolean _tmp8_;
-               GBusType _tmp9_;
-               const char* _tmp10_;
-               Unit* _tmp11_ = NULL;
-               Unit* u;
-               Unit* _tmp12_;
-               gchar* _tmp13_;
-               gchar* _tmp14_;
-               gchar* _tmp15_;
-               GtkMessageDialog* _tmp16_;
-               GtkMessageDialog* _tmp17_;
-               GtkMessageDialog* _tmp18_;
-               GtkMessageDialog* m;
-               GtkMessageDialog* _tmp19_;
-               GtkMessageDialog* _tmp20_;
-               GtkMessageDialog* _tmp21_;
-               Unit* _tmp22_;
-#line 987 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = self->priv->manager;
-#line 987 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = t;
-#line 987 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = manager_load_unit (_tmp4_, _tmp5_, &_inner_error_);
-#line 987 "/home/lennart/projects/systemd/src/systemadm.vala"
-               path = _tmp6_;
-#line 987 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 7292 "systemadm.c"
-                       goto __catch12_g_error;
-               }
-#line 990 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp8_ = user;
-#line 990 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp8_) {
-#line 990 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp7_ = G_BUS_TYPE_SESSION;
-#line 7301 "systemadm.c"
-               } else {
-#line 990 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp7_ = G_BUS_TYPE_SYSTEM;
-#line 7305 "systemadm.c"
-               }
-#line 989 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp9_ = _tmp7_;
-#line 989 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = path;
-#line 989 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp11_ = g_initable_new (TYPE_UNIT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp9_, "g-object-path", (const gchar*) _tmp10_, "g-interface-name", "org.freedesktop.systemd1.Unit", NULL);
-#line 989 "/home/lennart/projects/systemd/src/systemadm.vala"
-               u = (Unit*) _tmp11_;
-#line 989 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 989 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (path);
-#line 7319 "systemadm.c"
-                       goto __catch12_g_error;
-               }
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp12_ = u;
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp13_ = unit_get_id (_tmp12_);
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp14_ = _tmp13_;
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp15_ = _tmp14_;
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp16_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "Unit available as id %s", _tmp15_);
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp17_ = g_object_ref_sink (_tmp16_);
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp18_ = _tmp17_;
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (_tmp15_);
-#line 994 "/home/lennart/projects/systemd/src/systemadm.vala"
-               m = _tmp18_;
-#line 999 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp19_ = m;
-#line 999 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_window_set_title ((GtkWindow*) _tmp19_, "Unit");
-#line 1000 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp20_ = m;
-#line 1000 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_dialog_run ((GtkDialog*) _tmp20_);
-#line 1001 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp21_ = m;
-#line 1001 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_object_destroy ((GtkObject*) _tmp21_);
-#line 1003 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp22_ = u;
-#line 1003 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_unit (self, _tmp22_);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (m);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (path);
-#line 7362 "systemadm.c"
-       }
-       goto __finally12;
-       __catch12_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp23_;
-               const gchar* _tmp24_;
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 1005 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp23_ = e;
-#line 1005 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp24_ = _tmp23_->message;
-#line 1005 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp24_);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 7382 "systemadm.c"
-       }
-       __finally12:
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (t);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 986 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return;
-#line 7395 "systemadm.c"
-       }
-#line 980 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (t);
-#line 7399 "systemadm.c"
-}
-
-
-void main_window_on_unit_load_entry_changed (MainWindow* self) {
-       GtkButton* _tmp0_;
-       GtkEntry* _tmp1_;
-       const gchar* _tmp2_ = NULL;
-#line 1009 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 1010 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = self->priv->unit_load_button;
-#line 1010 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = self->priv->unit_load_entry;
-#line 1010 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1010 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, g_strcmp0 (_tmp2_, "") != 0);
-#line 7417 "systemadm.c"
-}
-
-
-gboolean main_window_on_activate_link (MainWindow* self, const gchar* uri) {
-       gboolean result = FALSE;
-       GError * _inner_error_ = NULL;
-#line 1013 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 1013 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_val_if_fail (uri != NULL, FALSE);
-#line 7428 "systemadm.c"
-       {
-               Manager* _tmp0_;
-               const gchar* _tmp1_;
-               char* _tmp2_ = NULL;
-               gchar* path;
-               GBusType _tmp3_ = 0;
-               gboolean _tmp4_;
-               GBusType _tmp5_;
-               const gchar* _tmp6_;
-               Unit* _tmp7_ = NULL;
-               Unit* u;
-               Unit* _tmp8_;
-#line 1016 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = self->priv->manager;
-#line 1016 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = uri;
-#line 1016 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = manager_get_unit (_tmp0_, _tmp1_, &_inner_error_);
-#line 1016 "/home/lennart/projects/systemd/src/systemadm.vala"
-               path = (gchar*) _tmp2_;
-#line 1016 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 7451 "systemadm.c"
-                       goto __catch13_g_error;
-               }
-#line 1019 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = user;
-#line 1019 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_tmp4_) {
-#line 1019 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp3_ = G_BUS_TYPE_SESSION;
-#line 7460 "systemadm.c"
-               } else {
-#line 1019 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _tmp3_ = G_BUS_TYPE_SYSTEM;
-#line 7464 "systemadm.c"
-               }
-#line 1018 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = _tmp3_;
-#line 1018 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = path;
-#line 1018 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = g_initable_new (TYPE_UNIT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.systemd1", "g-bus-type", _tmp5_, "g-object-path", _tmp6_, "g-interface-name", "org.freedesktop.systemd1.Unit", NULL);
-#line 1018 "/home/lennart/projects/systemd/src/systemadm.vala"
-               u = (Unit*) _tmp7_;
-#line 1018 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 1018 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       _g_free0 (path);
-#line 7478 "systemadm.c"
-                       goto __catch13_g_error;
-               }
-#line 1023 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp8_ = u;
-#line 1023 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_unit (self, _tmp8_);
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (u);
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_free0 (path);
-#line 7489 "systemadm.c"
-       }
-       goto __finally13;
-       __catch13_g_error:
-       {
-               GError* e = NULL;
-               GError* _tmp9_;
-               const gchar* _tmp10_;
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 1025 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp9_ = e;
-#line 1025 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp10_ = _tmp9_->message;
-#line 1025 "/home/lennart/projects/systemd/src/systemadm.vala"
-               main_window_show_error (self, _tmp10_);
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 7509 "systemadm.c"
-       }
-       __finally13:
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 1015 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return FALSE;
-#line 7520 "systemadm.c"
-       }
-#line 1028 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = TRUE;
-#line 1028 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 7526 "systemadm.c"
-}
-
-
-void main_window_show_error (MainWindow* self, const gchar* e) {
-       const gchar* _tmp0_;
-       GtkMessageDialog* _tmp1_;
-       GtkMessageDialog* _tmp2_;
-       GtkMessageDialog* m;
-#line 1031 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (self != NULL);
-#line 1031 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (e != NULL);
-#line 1032 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = e;
-#line 1032 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_);
-#line 1032 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = g_object_ref_sink (_tmp1_);
-#line 1032 "/home/lennart/projects/systemd/src/systemadm.vala"
-       m = _tmp2_;
-#line 1036 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_window_set_title ((GtkWindow*) m, "Error");
-#line 1037 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_dialog_run ((GtkDialog*) m);
-#line 1038 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_object_destroy ((GtkObject*) m);
-#line 1031 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (m);
-#line 7555 "systemadm.c"
-}
-
-
-static void main_window_class_init (MainWindowClass * klass) {
-#line 71 "/home/lennart/projects/systemd/src/systemadm.vala"
-       main_window_parent_class = g_type_class_peek_parent (klass);
-#line 71 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_type_class_add_private (klass, sizeof (MainWindowPrivate));
-#line 71 "/home/lennart/projects/systemd/src/systemadm.vala"
-       G_OBJECT_CLASS (klass)->finalize = main_window_finalize;
-#line 7566 "systemadm.c"
-}
-
-
-static void main_window_instance_init (MainWindow * self) {
-#line 71 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self->priv = MAIN_WINDOW_GET_PRIVATE (self);
-#line 7573 "systemadm.c"
-}
-
-
-static void main_window_finalize (GObject* obj) {
-       MainWindow * self;
-#line 71 "/home/lennart/projects/systemd/src/systemadm.vala"
-       self = MAIN_WINDOW (obj);
-#line 73 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_free0 (self->priv->current_unit_id);
-#line 76 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_view);
-#line 77 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_view);
-#line 79 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_model);
-#line 80 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_model);
-#line 82 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_map);
-#line 84 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->start_button);
-#line 85 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->stop_button);
-#line 86 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->restart_button);
-#line 87 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->reload_button);
-#line 88 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->cancel_button);
-#line 90 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_load_entry);
-#line 91 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_load_button);
-#line 93 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->server_snapshot_button);
-#line 94 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->server_reload_button);
-#line 96 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->manager);
-#line 98 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_id_label);
-#line 99 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_dependency_label);
-#line 100 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_description_label);
-#line 101 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_load_state_label);
-#line 102 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_active_state_label);
-#line 103 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_sub_state_label);
-#line 104 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_fragment_path_label);
-#line 105 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_active_enter_timestamp_label);
-#line 106 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_active_exit_timestamp_label);
-#line 107 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_can_start_label);
-#line 108 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_can_reload_label);
-#line 109 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_cgroup_label);
-#line 111 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_id_label);
-#line 112 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_state_label);
-#line 113 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->job_type_label);
-#line 115 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->unit_type_combo_box);
-#line 116 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (self->priv->inactive_checkbox);
-#line 71 "/home/lennart/projects/systemd/src/systemadm.vala"
-       G_OBJECT_CLASS (main_window_parent_class)->finalize (obj);
-#line 7649 "systemadm.c"
-}
-
-
-GType main_window_get_type (void) {
-       static volatile gsize main_window_type_id__volatile = 0;
-       if (g_once_init_enter (&main_window_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (MainWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) main_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (MainWindow), 0, (GInstanceInitFunc) main_window_instance_init, NULL };
-               GType main_window_type_id;
-               main_window_type_id = g_type_register_static (GTK_TYPE_WINDOW, "MainWindow", &g_define_type_info, 0);
-               g_once_init_leave (&main_window_type_id__volatile, main_window_type_id);
-       }
-       return main_window_type_id__volatile;
-}
-
-
-void show_error (const gchar* e) {
-       const gchar* _tmp0_;
-       GtkMessageDialog* _tmp1_;
-       GtkMessageDialog* _tmp2_;
-       GtkMessageDialog* m;
-#line 1049 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_return_if_fail (e != NULL);
-#line 1050 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp0_ = e;
-#line 1050 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_);
-#line 1050 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _tmp2_ = g_object_ref_sink (_tmp1_);
-#line 1050 "/home/lennart/projects/systemd/src/systemadm.vala"
-       m = _tmp2_;
-#line 1051 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_dialog_run ((GtkDialog*) m);
-#line 1052 "/home/lennart/projects/systemd/src/systemadm.vala"
-       gtk_object_destroy ((GtkObject*) m);
-#line 1049 "/home/lennart/projects/systemd/src/systemadm.vala"
-       _g_object_unref0 (m);
-#line 7686 "systemadm.c"
-}
-
-
-gint _vala_main (gchar** args, int args_length1) {
-       gint result = 0;
-       GError * _inner_error_ = NULL;
-       {
-               MainWindow* _tmp0_;
-               MainWindow* _tmp1_;
-               MainWindow* window;
-               MainWindow* _tmp2_;
-#line 1058 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_init_with_args (&args_length1, &args, "[OPTION...]", entries, "systemadm", &_inner_error_);
-#line 1058 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 1058 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (_inner_error_->domain == G_IO_ERROR) {
-#line 7704 "systemadm.c"
-                               goto __catch14_g_io_error;
-                       }
-                       goto __catch14_g_error;
-               }
-#line 1060 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp0_ = main_window_new (&_inner_error_);
-#line 1060 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp1_ = g_object_ref_sink (_tmp0_);
-#line 1060 "/home/lennart/projects/systemd/src/systemadm.vala"
-               window = _tmp1_;
-#line 1060 "/home/lennart/projects/systemd/src/systemadm.vala"
-               if (_inner_error_ != NULL) {
-#line 1060 "/home/lennart/projects/systemd/src/systemadm.vala"
-                       if (_inner_error_->domain == G_IO_ERROR) {
-#line 7719 "systemadm.c"
-                               goto __catch14_g_io_error;
-                       }
-                       goto __catch14_g_error;
-               }
-#line 1061 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp2_ = window;
-#line 1061 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_widget_show_all ((GtkWidget*) _tmp2_);
-#line 1063 "/home/lennart/projects/systemd/src/systemadm.vala"
-               gtk_main ();
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_object_unref0 (window);
-#line 7732 "systemadm.c"
-       }
-       goto __finally14;
-       __catch14_g_io_error:
-       {
-               GError* e = NULL;
-               GError* _tmp3_;
-               const gchar* _tmp4_;
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 1065 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp3_ = e;
-#line 1065 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp4_ = _tmp3_->message;
-#line 1065 "/home/lennart/projects/systemd/src/systemadm.vala"
-               show_error (_tmp4_);
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 7752 "systemadm.c"
-       }
-       goto __finally14;
-       __catch14_g_error:
-       {
-               GError* e = NULL;
-               FILE* _tmp5_;
-               GError* _tmp6_;
-               const gchar* _tmp7_;
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               e = _inner_error_;
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _inner_error_ = NULL;
-#line 1067 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp5_ = stderr;
-#line 1067 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp6_ = e;
-#line 1067 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _tmp7_ = _tmp6_->message;
-#line 1067 "/home/lennart/projects/systemd/src/systemadm.vala"
-               fprintf (_tmp5_, "%s\n", _tmp7_);
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               _g_error_free0 (e);
-#line 7775 "systemadm.c"
-       }
-       __finally14:
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-       if (_inner_error_ != NULL) {
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               g_clear_error (&_inner_error_);
-#line 1057 "/home/lennart/projects/systemd/src/systemadm.vala"
-               return 0;
-#line 7786 "systemadm.c"
-       }
-#line 1070 "/home/lennart/projects/systemd/src/systemadm.vala"
-       result = 0;
-#line 1070 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return result;
-#line 7792 "systemadm.c"
-}
-
-
-int main (int argc, char ** argv) {
-#line 1055 "/home/lennart/projects/systemd/src/systemadm.vala"
-       g_type_init ();
-#line 1055 "/home/lennart/projects/systemd/src/systemadm.vala"
-       return _vala_main (argv, argc);
-#line 7801 "systemadm.c"
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-       if ((array != NULL) && (destroy_func != NULL)) {
-               int i;
-               for (i = 0; i < array_length; i = i + 1) {
-                       if (((gpointer*) array)[i] != NULL) {
-                               destroy_func (((gpointer*) array)[i]);
-                       }
-               }
-       }
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-       _vala_array_destroy (array, array_length, destroy_func);
-       g_free (array);
-}
-
-
-
index 5971ac0..d45ec64 100644 (file)
@@ -23,20 +23,6 @@ using Pango;
 
 static bool user = false;
 
-public string format_time(uint64 time_ns) {
-        if (time_ns <= 0)
-                return "";
-        Time timestamp = Time.local((time_t) (time_ns / 1000000));
-        return timestamp.format("%a, %d %b %Y %H:%M:%S");
-}
-
-public void new_column(TreeView view, int column_id, string title) {
-        TreeViewColumn col;
-        col = new TreeViewColumn.with_attributes(title, new CellRendererText(), "text", column_id);
-        col.set_sort_column_id(column_id);
-        view.insert_column(col, -1);
-}
-
 public class LeftLabel : Label {
         public LeftLabel(string? text = null) {
                 if (text != null)
@@ -46,11 +32,12 @@ public class LeftLabel : Label {
         }
 }
 
-public class RightLabel : WrapLabel {
-
+public class RightLabel : Label {
         public RightLabel(string? text = null) {
-                set_selectable(true);
                 set_text_or_na(text);
+                set_alignment(0, 0);
+                set_ellipsize(EllipsizeMode.START);
+                set_selectable(true);
         }
 
         public void set_text_or_na(string? text = null) {
@@ -79,8 +66,6 @@ public class MainWindow : Window {
         private ListStore unit_model;
         private ListStore job_model;
 
-        private Gee.HashMap<string, Unit> unit_map;
-
         private Button start_button;
         private Button stop_button;
         private Button restart_button;
@@ -96,6 +81,7 @@ public class MainWindow : Window {
         private Manager manager;
 
         private RightLabel unit_id_label;
+        private RightLabel unit_aliases_label;
         private RightLabel unit_dependency_label;
         private RightLabel unit_description_label;
         private RightLabel unit_load_state_label;
@@ -113,7 +99,6 @@ public class MainWindow : Window {
         private RightLabel job_type_label;
 
         private ComboBox unit_type_combo_box;
-        private CheckButton inactive_checkbox;
 
         public MainWindow() throws IOError {
                 title = user ? "systemd User Service Manager" : "systemd System Manager";
@@ -138,24 +123,18 @@ public class MainWindow : Window {
                 type_hbox.pack_start(unit_type_combo_box, false, false, 0);
                 unit_vbox.pack_start(type_hbox, false, false, 0);
 
-                unit_type_combo_box.append_text("All unit types");
-                unit_type_combo_box.append_text("Targets");
+                unit_type_combo_box.append_text("Show All Units");
+                unit_type_combo_box.append_text("Show Only Live Units");
                 unit_type_combo_box.append_text("Services");
+                unit_type_combo_box.append_text("Sockets");
                 unit_type_combo_box.append_text("Devices");
                 unit_type_combo_box.append_text("Mounts");
                 unit_type_combo_box.append_text("Automounts");
-                unit_type_combo_box.append_text("Swaps");
-                unit_type_combo_box.append_text("Sockets");
-                unit_type_combo_box.append_text("Paths");
-                unit_type_combo_box.append_text("Timers");
+                unit_type_combo_box.append_text("Targets");
                 unit_type_combo_box.append_text("Snapshots");
-                unit_type_combo_box.set_active(0); // Show All
+                unit_type_combo_box.set_active(1);
                 unit_type_combo_box.changed.connect(unit_type_changed);
 
-                inactive_checkbox = new CheckButton.with_label("inactive too");
-                inactive_checkbox.toggled.connect(unit_type_changed);
-                type_hbox.pack_start(inactive_checkbox, false, false, 0);
-
                 unit_load_entry = new Entry();
                 unit_load_button = new Button.with_mnemonic("_Load");
                 unit_load_button.set_sensitive(false);
@@ -181,30 +160,26 @@ public class MainWindow : Window {
                 unit_model = new ListStore(7, typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Unit));
                 job_model = new ListStore(6, typeof(string), typeof(string), typeof(string), typeof(string), typeof(Job), typeof(uint32));
 
-                unit_map = new Gee.HashMap<string, Unit>();
-
                 TreeModelFilter unit_model_filter;
                 unit_model_filter = new TreeModelFilter(unit_model, null);
                 unit_model_filter.set_visible_func(unit_filter);
 
-                TreeModelSort unit_model_sort = new TreeModelSort.with_model(unit_model_filter);
-
-                unit_view = new TreeView.with_model(unit_model_sort);
+                unit_view = new TreeView.with_model(unit_model_filter);
                 job_view = new TreeView.with_model(job_model);
 
                 unit_view.cursor_changed.connect(unit_changed);
                 job_view.cursor_changed.connect(job_changed);
 
-                new_column(unit_view, 2, "Load State");
-                new_column(unit_view, 3, "Active State");
-                new_column(unit_view, 4, "Unit State");
-                new_column(unit_view, 0, "Unit");
-                new_column(unit_view, 5, "Job");
+                unit_view.insert_column_with_attributes(-1, "Load State", new CellRendererText(), "text", 2);
+                unit_view.insert_column_with_attributes(-1, "Active State", new CellRendererText(), "text", 3);
+                unit_view.insert_column_with_attributes(-1, "Unit State", new CellRendererText(), "text", 4);
+                unit_view.insert_column_with_attributes(-1, "Unit", new CellRendererText(), "text", 0);
+                unit_view.insert_column_with_attributes(-1, "Job", new CellRendererText(), "text", 5);
 
-                new_column(job_view, 0, "Job");
-                new_column(job_view, 1, "Unit");
-                new_column(job_view, 2, "Type");
-                new_column(job_view, 3, "State");
+                job_view.insert_column_with_attributes(-1, "Job", new CellRendererText(), "text", 0);
+                job_view.insert_column_with_attributes(-1, "Unit", new CellRendererText(), "text", 1);
+                job_view.insert_column_with_attributes(-1, "Type", new CellRendererText(), "text", 2);
+                job_view.insert_column_with_attributes(-1, "State", new CellRendererText(), "text", 3);
 
                 ScrolledWindow scroll = new ScrolledWindow(null, null);
                 scroll.set_policy(PolicyType.AUTOMATIC, PolicyType.AUTOMATIC);
@@ -219,6 +194,7 @@ public class MainWindow : Window {
                 job_vbox.pack_start(scroll, true, true, 0);
 
                 unit_id_label = new RightLabel();
+                unit_aliases_label = new RightLabel();
                 unit_dependency_label = new RightLabel();
                 unit_description_label = new RightLabel();
                 unit_load_state_label = new RightLabel();
@@ -236,7 +212,7 @@ public class MainWindow : Window {
                 job_type_label = new RightLabel();
 
                 unit_dependency_label.set_track_visited_links(false);
-                unit_dependency_label.set_selectable(true);
+                unit_dependency_label.set_selectable(false);
                 unit_dependency_label.activate_link.connect(on_activate_link);
 
                 unit_fragment_path_label.set_track_visited_links(false);
@@ -253,31 +229,33 @@ public class MainWindow : Window {
 
                 unit_table.attach(new LeftLabel("Id:"),                     0, 1, 0, 1, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
                 unit_table.attach(unit_id_label,                            1, 6, 0, 1, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Description:"),            0, 1, 1, 2, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_description_label,                   1, 6, 1, 2, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Dependencies:"),           0, 1, 2, 3, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_dependency_label,                    1, 6, 2, 3, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Fragment Path:"),          0, 1, 3, 4, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_fragment_path_label,                 1, 6, 3, 4, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Control Group:"),          0, 1, 4, 5, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_cgroup_label,                        1, 6, 4, 5, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-
-                unit_table.attach(new LeftLabel("Load State:"),             0, 1, 5, 6, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_load_state_label,                    1, 2, 5, 6, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Active State:"),           0, 1, 6, 7, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_active_state_label,                  1, 2, 6, 7, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Unit State:"),             0, 1, 7, 8, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_sub_state_label,                     1, 2, 7, 8, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-
-                unit_table.attach(new LeftLabel("Activated:"),              2, 3, 6, 7, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_active_enter_timestamp_label,        3, 4, 6, 7, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Deactivated:"),            2, 3, 7, 8, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_active_exit_timestamp_label,         3, 4, 7, 8, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-
-                unit_table.attach(new LeftLabel("Can Start/Stop:"),         4, 5, 6, 7, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_can_start_label,                     5, 6, 6, 7, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(new LeftLabel("Can Reload:"),             4, 5, 7, 8, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
-                unit_table.attach(unit_can_reload_label,                    5, 6, 7, 8, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Aliases:"),                0, 1, 1, 2, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_aliases_label,                       1, 6, 1, 2, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Description:"),            0, 1, 2, 3, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_description_label,                   1, 6, 2, 3, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Dependencies:"),           0, 1, 3, 4, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_dependency_label,                    1, 6, 3, 4, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Fragment Path:"),          0, 1, 4, 5, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_fragment_path_label,                 1, 6, 4, 5, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Control Group:"),          0, 1, 5, 6, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_cgroup_label,                        1, 6, 5, 6, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+
+                unit_table.attach(new LeftLabel("Load State:"),             0, 1, 6, 7, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_load_state_label,                    1, 2, 6, 7, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Active State:"),           0, 1, 7, 8, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_active_state_label,                  1, 2, 7, 8, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Unit State:"),             0, 1, 8, 9, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_sub_state_label,                     1, 2, 8, 9, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+
+                unit_table.attach(new LeftLabel("Active Enter Timestamp:"), 2, 3, 7, 8, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_active_enter_timestamp_label,        3, 4, 7, 8, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Active Exit Timestamp:"),  2, 3, 8, 9, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_active_exit_timestamp_label,         3, 4, 8, 9, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+
+                unit_table.attach(new LeftLabel("Can Start/Stop:"),         4, 5, 7, 8, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_can_start_label,                     5, 6, 7, 8, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(new LeftLabel("Can Reload:"),             4, 5, 8, 9, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
+                unit_table.attach(unit_can_reload_label,                    5, 6, 8, 9, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
 
                 job_table.attach(new LeftLabel("Id:"),                      0, 1, 0, 1, AttachOptions.FILL, AttachOptions.FILL, 0, 0);
                 job_table.attach(job_id_label,                              1, 2, 0, 1, AttachOptions.EXPAND|AttachOptions.FILL, AttachOptions.FILL, 0, 0);
@@ -355,8 +333,6 @@ public class MainWindow : Window {
                                         "org.freedesktop.systemd1",
                                         i.unit_path);
 
-                        unit_map[i.id] = u;
-
                         unit_model.append(out iter);
                         unit_model.set(iter,
                                        0, i.id,
@@ -417,10 +393,6 @@ public class MainWindow : Window {
                 return u;
         }
 
-        public Unit? get_unit(string id) {
-                return this.unit_map[id];
-        }
-
         public void unit_changed() {
                 Unit u = get_current_unit();
 
@@ -439,6 +411,7 @@ public class MainWindow : Window {
                 restart_button.set_sensitive(false);
 
                 unit_id_label.set_text_or_na();
+                unit_aliases_label.set_text_or_na();
                 unit_description_label.set_text_or_na();
                 unit_description_label.set_text_or_na();
                 unit_load_state_label.set_text_or_na();
@@ -452,33 +425,7 @@ public class MainWindow : Window {
                 unit_cgroup_label.set_text_or_na();
         }
 
-        public string format_unit_link(string i, bool link) {
-                Unit? u = get_unit(i);
-                if(u == null)
-                        return "<span color='grey'>" + i + "</span";
-
-                string color;
-                switch (u.sub_state) {
-                case "active": color = "blue"; break;
-                case "dead": color = "red"; break;
-                case "running": color = "green"; break;
-                default: color = "black"; break;
-                }
-                string span = "<span underline='none' color='" + color + "'>"
-                              + i + "(" +
-                              u.sub_state + ")" + "</span>";
-                if(link)
-                        return  " <a href='" + i + "'>" + span + "</a>";
-                else
-                        return span;
-        }
-
-
         public string make_dependency_string(string? prefix, string word, string[] dependencies) {
-                Gee.Collection<unowned string> sorted = new Gee.TreeSet<string>();
-                foreach (string i in dependencies)
-                        sorted.add(i);
-
                 bool first = true;
                 string r;
 
@@ -487,16 +434,16 @@ public class MainWindow : Window {
                 else
                         r = prefix;
 
-                foreach (string i in sorted) {
+                foreach (string i in dependencies) {
                         if (r != "")
                                 r += first ? "\n" : ",";
 
                         if (first) {
-                                r += "<b>" + word + ":</b>";
+                                r += word;
                                 first = false;
                         }
 
-                        r += format_unit_link(i, true);
+                        r += " <a href=\"" + i + "\">" + i + "</a>";
                 }
 
                 return r;
@@ -505,23 +452,20 @@ public class MainWindow : Window {
         public void show_unit(Unit unit) {
                 current_unit_id = unit.id;
 
-                string id_display = format_unit_link(current_unit_id, false);
-                bool has_alias = false;
+                unit_id_label.set_text_or_na(current_unit_id);
+
+                string a = "";
                 foreach (string i in unit.names) {
                         if (i == current_unit_id)
                                 continue;
 
-                        if (!has_alias) {
-                                id_display += " (aliases:";
-                                has_alias = true;
-                        }
-
-                        id_display += " " + i;
+                        if (a == "")
+                                a = i;
+                        else
+                                a += "\n" + i;
                 }
-                if(has_alias)
-                        id_display += ")";
 
-                unit_id_label.set_markup_or_na(id_display);
+                unit_aliases_label.set_text_or_na(a);
 
                 string[]
                         requires = unit.requires,
@@ -567,16 +511,23 @@ public class MainWindow : Window {
 
                 string fp = unit.fragment_path;
                 if (fp != "")
-                        unit_fragment_path_label.set_markup_or_na(
-                                "<a href=\"file://" + fp +"\">" +
-                                "<span underline='none' color='black'>" + fp + "</span></a>");
+                        unit_fragment_path_label.set_markup_or_na("<a href=\"file://" + fp +"\">" + fp + "</a>" );
                 else
                         unit_fragment_path_label.set_text_or_na();
 
+                uint64 t = unit.active_enter_timestamp;
+                if (t > 0) {
+                        Time timestamp = Time.local((time_t) (t / 1000000));
+                        unit_active_enter_timestamp_label.set_text_or_na(timestamp.format("%a, %d %b %Y %H:%M:%S %z"));
+                } else
+                        unit_active_enter_timestamp_label.set_text_or_na();
 
-                unit_active_enter_timestamp_label.set_text_or_na(format_time(unit.active_enter_timestamp));
-
-                unit_active_exit_timestamp_label.set_text_or_na(format_time(unit.active_exit_timestamp));
+                t = unit.active_exit_timestamp;
+                if (t > 0) {
+                        Time timestamp = Time.local((time_t) (t / 1000000));
+                        unit_active_exit_timestamp_label.set_text_or_na(timestamp.format("%a, %d %b %Y %H:%M:%S %z"));
+                } else
+                        unit_active_exit_timestamp_label.set_text_or_na();
 
                 bool b = unit.can_start;
                 start_button.set_sensitive(b);
@@ -645,7 +596,7 @@ public class MainWindow : Window {
 
                 try {
                         u.start("replace");
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -658,7 +609,7 @@ public class MainWindow : Window {
 
                 try {
                         u.stop("replace");
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -671,7 +622,7 @@ public class MainWindow : Window {
 
                 try {
                         u.reload("replace");
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -684,7 +635,7 @@ public class MainWindow : Window {
 
                 try {
                         u.restart("replace");
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -697,7 +648,7 @@ public class MainWindow : Window {
 
                 try {
                         j.cancel();
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -725,7 +676,7 @@ public class MainWindow : Window {
                                        4, u.sub_state,
                                        5, t != "" ? "→ %s".printf(t) : "",
                                        6, u);
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -748,10 +699,8 @@ public class MainWindow : Window {
                                         "org.freedesktop.systemd1",
                                         path);
 
-                        unit_map[id] = u;
-
                         update_unit_iter(iter, id, u);
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -787,7 +736,7 @@ public class MainWindow : Window {
 
                         update_job_iter(iter, id, j);
 
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -811,8 +760,6 @@ public class MainWindow : Window {
                         }
 
                 } while (unit_model.iter_next(ref iter));
-
-                unit_map.unset(id);
         }
 
         public void on_job_removed(uint32 id, ObjectPath path, string res) {
@@ -869,7 +816,7 @@ public class MainWindow : Window {
 
                         } while (unit_model.iter_next(ref iter));
 
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -905,7 +852,7 @@ public class MainWindow : Window {
 
                         } while (job_model.iter_next(ref iter));
 
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -918,41 +865,41 @@ public class MainWindow : Window {
                 if (id == null)
                         return false;
 
-                if (!inactive_checkbox.get_active()
-                    && active_state == "inactive" && job == "")
-                        return false;
-
                 switch (unit_type_combo_box.get_active()) {
-                case 0:
-                        return true;
-                case 1:
-                        return id.has_suffix(".target");
-                case 2:
-                        return id.has_suffix(".service");
-                case 3:
-                        return id.has_suffix(".device");
-                case 4:
-                        return id.has_suffix(".mount");
-                case 5:
-                        return id.has_suffix(".automount");
-                case 6:
-                        return id.has_suffix(".swap");
-                case 7:
-                        return id.has_suffix(".socket");
-                case 8:
-                        return id.has_suffix(".path");
-                case 9:
-                        return id.has_suffix(".timer");
-                case 10:
-                        return id.has_suffix(".snapshot");
-                default:
-                        assert(false);
-                        return false;
+
+                        case 0:
+                                return true;
+
+                        case 1:
+                                return active_state != "inactive" || job != "";
+
+                        case 2:
+                                return id.has_suffix(".service");
+
+                        case 3:
+                                return id.has_suffix(".socket");
+
+                        case 4:
+                                return id.has_suffix(".device");
+
+                        case 5:
+                                return id.has_suffix(".mount");
+
+                        case 6:
+                                return id.has_suffix(".automount");
+
+                        case 7:
+                                return id.has_suffix(".target");
+
+                        case 8:
+                                return id.has_suffix(".snapshot");
                 }
+
+                return false;
         }
 
         public void unit_type_changed() {
-                TreeModelFilter model = (TreeModelFilter) ((TreeModelSort) unit_view.get_model()).get_model();
+                TreeModelFilter model = (TreeModelFilter) unit_view.get_model();
 
                 model.refilter();
         }
@@ -960,7 +907,7 @@ public class MainWindow : Window {
         public void on_server_reload() {
                 try {
                         manager.reload();
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -972,7 +919,7 @@ public class MainWindow : Window {
                         if (unit_type_combo_box.get_active() != 0)
                                 unit_type_combo_box.set_active(8);
 
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -1001,7 +948,7 @@ public class MainWindow : Window {
                         m.destroy();
 
                         show_unit(u);
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
         }
@@ -1021,7 +968,7 @@ public class MainWindow : Window {
                                         path);
 
                         show_unit(u);
-                } catch (Error e) {
+                } catch (IOError e) {
                         show_error(e.message);
                 }
 
diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh
new file mode 100644 (file)
index 0000000..6369a6c
--- /dev/null
@@ -0,0 +1,150 @@
+# This file is part of systemd.
+#
+# Copyright 2010 Ran Benita
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+__contains_word () {
+        local word=$1; shift
+        for w in $*; do [[ $w = $word ]] && return 0; done
+        return 1
+}
+
+__filter_units_by_property () {
+        local property=$1 value=$2 ; shift ; shift
+        local -a units=( $* )
+        local -a props=( $(systemctl show --property "$property" -- ${units[*]} | grep -v ^$) )
+        for ((i=0; $i < ${#units[*]}; i++)); do
+                if [[ "${props[i]}" = "$property=$value" ]]; then
+                        echo "${units[i]}"
+                fi
+        done
+}
+
+__get_all_units      () { systemctl list-units --full --all | awk '                 {print $1}' ; }
+__get_active_units   () { systemctl list-units --full       | awk '                 {print $1}' ; }
+__get_inactive_units () { systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; }
+__get_failed_units   () { systemctl list-units --full       | awk '$3 == "failed"   {print $1}' ; }
+
+_systemctl () {
+        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
+        local verb comps
+
+        local -A OPTS=(
+               [STANDALONE]='--all -a --defaults --fail --ignore-dependencies --failed --force -f --full --global
+                             --help -h --no-ask-password --no-block --no-pager --no-reload --no-wall
+                             --order --require --quiet -q --privileged -P --system --user --version'
+                      [ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t'
+        )
+
+        if __contains_word "$prev" ${OPTS[ARG]}; then
+                case $prev in
+                        --signal|-s)
+                                comps=$(compgen -A signal | grep '^SIG' | grep -Ev 'RTMIN|RTMAX|JUNK')
+                        ;;
+                        --type|-t)
+                                comps='automount device mount path service snapshot socket swap target timer'
+                        ;;
+                        --kill-who)
+                                comps='all control main'
+                        ;;
+                        --kill-mode)
+                                comps='control-group process'
+                        ;;
+                        --property|-p|--host|-H)
+                                comps=''
+                        ;;
+                esac
+                COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+                return 0
+        fi
+
+
+        if [[ "$cur" = -* ]]; then
+                COMPREPLY=( $(compgen -W "${OPTS[*]}" -- "$cur") )
+                return 0
+        fi
+
+        local -A VERBS=(
+                [ALL_UNITS]='enable disable is-active is-enabled status show'
+             [FAILED_UNITS]='reset-failed'
+          [STARTABLE_UNITS]='start'
+          [STOPPABLE_UNITS]='stop kill try-restart condrestart'
+         [ISOLATABLE_UNITS]='isolate'
+         [RELOADABLE_UNITS]='reload reload-or-try-restart force-reload'
+          [RESTARTABLE_UNITS]='restart reload-or-restart'
+                     [JOBS]='cancel'
+                [SNAPSHOTS]='delete'
+                     [ENVS]='set-environment unset-environment'
+               [STANDALONE]='daemon-reexec daemon-reload default dot dump emergency exit halt kexec
+                             list-jobs list-units poweroff reboot rescue show-environment'
+                     [NAME]='snapshot load'
+        )
+
+        local verb
+        for ((i=0; $i <= $COMP_CWORD; i++)); do
+                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
+                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG}]}; then
+                        verb=${COMP_WORDS[i]}
+                        break
+                fi
+        done
+
+        if   [[ -z $verb ]]; then
+                comps="${VERBS[*]}"
+
+        elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
+                comps=$( __get_all_units )
+
+        elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
+                comps=$( __filter_units_by_property CanStart yes \
+                      $( __get_inactive_units | grep -Ev '\.(device|snapshot)$' ))
+
+        elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
+                comps=$( __filter_units_by_property CanStart yes \
+                      $( __get_all_units | grep -Ev '\.(device|snapshot|socket|timer)$' ))
+
+        elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
+                comps=$( __filter_units_by_property CanStop yes \
+                      $( __get_active_units ) )
+
+        elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then
+                comps=$( __filter_units_by_property CanReload yes \
+                      $( __get_active_units ) )
+
+        elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
+                comps=$( __filter_units_by_property AllowIsolate yes \
+                      $( __get_all_units ) )
+
+        elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then
+                comps=$( __get_failed_units )
+
+        elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[NAME]}; then
+                comps=''
+
+        elif __contains_word "$verb" ${VERBS[JOBS]}; then
+                comps=$( systemctl list-jobs | awk '{print $1}' )
+
+        elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
+                comps=$( systemctl list-units --type snapshot --full --all | awk '{print $1}' )
+
+        elif __contains_word "$verb" ${VERBS[ENVS]}; then
+                comps=$( systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' )
+                compopt -o nospace
+        fi
+
+        COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
+        return 0
+}
+complete -F _systemctl systemctl
index ab6d126..0de2444 100644 (file)
@@ -35,8 +35,6 @@
 #include <sys/prctl.h>
 #include <dbus/dbus.h>
 
-#include <systemd/sd-daemon.h>
-
 #include "log.h"
 #include "util.h"
 #include "macro.h"
@@ -51,6 +49,7 @@
 #include "list.h"
 #include "path-lookup.h"
 #include "conf-parser.h"
+#include "sd-daemon.h"
 #include "shutdownd.h"
 #include "exit-status.h"
 #include "bus-errors.h"
@@ -59,7 +58,6 @@
 #include "pager.h"
 #include "spawn-agent.h"
 #include "install.h"
-#include "logs-show.h"
 
 static const char *arg_type = NULL;
 static char **arg_property = NULL;
@@ -119,9 +117,6 @@ static enum transport {
         TRANSPORT_POLKIT
 } arg_transport = TRANSPORT_NORMAL;
 static const char *arg_host = NULL;
-static bool arg_follow = false;
-static unsigned arg_lines = 10;
-static OutputMode arg_output = OUTPUT_SHORT;
 
 static bool private_bus = false;
 
@@ -166,12 +161,12 @@ static void agent_open_if_enabled(void) {
         agent_open();
 }
 
-static const char *ansi_highlight_red(bool b) {
+static const char *ansi_highlight(bool b) {
 
         if (!on_tty())
                 return "";
 
-        return b ? ANSI_HIGHLIGHT_RED_ON : ANSI_HIGHLIGHT_OFF;
+        return b ? ANSI_HIGHLIGHT_ON : ANSI_HIGHLIGHT_OFF;
 }
 
 static const char *ansi_highlight_green(bool b) {
@@ -382,15 +377,16 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
 
                 n_shown++;
 
-                if (streq(u->load_state, "error")) {
-                        on_loaded = ansi_highlight_red(true);
-                        off_loaded = ansi_highlight_red(false);
+                if (!streq(u->load_state, "loaded") &&
+                    !streq(u->load_state, "banned")) {
+                        on_loaded = ansi_highlight(true);
+                        off_loaded = ansi_highlight(false);
                 } else
                         on_loaded = off_loaded = "";
 
                 if (streq(u->active_state, "failed")) {
-                        on_active = ansi_highlight_red(true);
-                        off_active = ansi_highlight_red(false);
+                        on_active = ansi_highlight(true);
+                        off_active = ansi_highlight(false);
                 } else
                         on_active = off_active = "";
 
@@ -555,30 +551,11 @@ static bool output_show_unit_file(const UnitFileList *u) {
 }
 
 static void output_unit_file_list(const UnitFileList *units, unsigned c) {
-        unsigned max_id_len, id_cols, state_cols, n_shown = 0;
+        unsigned n_shown = 0;
         const UnitFileList *u;
 
-        max_id_len = sizeof("UNIT FILE")-1;
-        state_cols = sizeof("STATE")-1;
-        for (u = units; u < units + c; u++) {
-                if (!output_show_unit_file(u))
-                        continue;
-
-                max_id_len = MAX(max_id_len, strlen(file_name_from_path(u->path)));
-                state_cols = MAX(state_cols, strlen(unit_file_state_to_string(u->state)));
-        }
-
-        if (!arg_full) {
-                unsigned basic_cols;
-                id_cols = MIN(max_id_len, 25);
-                basic_cols = 1 + id_cols + state_cols;
-                if (basic_cols < (unsigned) columns())
-                        id_cols += MIN(columns() - basic_cols, max_id_len - id_cols);
-        } else
-                id_cols = max_id_len;
-
-        if (!arg_no_legend)
-                printf("%-*s %-*s\n", id_cols, "UNIT FILE", state_cols, "STATE");
+        if (on_tty())
+                printf("%-25s %-6s\n", "UNIT FILE", "STATE");
 
         for (u = units; u < units + c; u++) {
                 char *e;
@@ -593,8 +570,8 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) {
                 if (u->state == UNIT_FILE_MASKED ||
                     u->state == UNIT_FILE_MASKED_RUNTIME ||
                     u->state == UNIT_FILE_DISABLED) {
-                        on  = ansi_highlight_red(true);
-                        off = ansi_highlight_red(false);
+                        on  = ansi_highlight(true);
+                        off = ansi_highlight(false);
                 } else if (u->state == UNIT_FILE_ENABLED) {
                         on  = ansi_highlight_green(true);
                         off = ansi_highlight_green(false);
@@ -603,16 +580,16 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) {
 
                 id = file_name_from_path(u->path);
 
-                e = arg_full ? NULL : ellipsize(id, id_cols, 33);
+                e = arg_full ? NULL : ellipsize(id, 25, 33);
 
-                printf("%-*s %s%-*s%s\n",
-                       id_cols, e ? e : id,
-                       on, state_cols, unit_file_state_to_string(u->state), off);
+                printf("%-25s %s%-6s%s\n",
+                       e ? e : id,
+                       on, unit_file_state_to_string(u->state), off);
 
                 free(e);
         }
 
-        if (!arg_no_legend)
+        if (on_tty())
                 printf("\n%u unit files listed.\n", n_shown);
 }
 
@@ -626,6 +603,8 @@ static int list_unit_files(DBusConnection *bus, char **args) {
 
         dbus_error_init(&error);
 
+        assert(bus);
+
         pager_open_if_enabled();
 
         if (avoid_bus()) {
@@ -661,8 +640,6 @@ static int list_unit_files(DBusConnection *bus, char **args) {
 
                 hashmap_free(h);
         } else {
-                assert(bus);
-
                 m = dbus_message_new_method_call(
                                 "org.freedesktop.systemd1",
                                 "/org/freedesktop/systemd1",
@@ -1437,9 +1414,9 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) {
                 else if (streq(d.result, "canceled"))
                         log_error("Job canceled.");
                 else if (streq(d.result, "dependency"))
-                        log_error("A dependency job failed. See system journal for details.");
+                        log_error("A dependency job failed. See system logs for details.");
                 else if (!streq(d.result, "done") && !streq(d.result, "skipped"))
-                        log_error("Job failed. See system journal and 'systemctl status' for details.");
+                        log_error("Job failed. See system logs and 'systemctl status' for details.");
         }
 
         if (streq_ptr(d.result, "timeout"))
@@ -2003,10 +1980,8 @@ typedef struct UnitStatusInfo {
         const char *default_control_group;
 
         const char *load_error;
-        const char *result;
 
         usec_t inactive_exit_timestamp;
-        usec_t inactive_exit_timestamp_monotonic;
         usec_t active_enter_timestamp;
         usec_t active_exit_timestamp;
         usec_t inactive_enter_timestamp;
@@ -2069,9 +2044,10 @@ static void print_status_info(UnitStatusInfo *i) {
         if (i->following)
                 printf("\t  Follow: unit currently follows state of %s\n", i->following);
 
-        if (streq_ptr(i->load_state, "error")) {
-                on = ansi_highlight_red(true);
-                off = ansi_highlight_red(false);
+        if (streq_ptr(i->load_state, "failed") ||
+            streq_ptr(i->load_state, "banned")) {
+                on = ansi_highlight(true);
+                off = ansi_highlight(false);
         } else
                 on = off = "";
 
@@ -2087,8 +2063,8 @@ static void print_status_info(UnitStatusInfo *i) {
         ss = streq_ptr(i->active_state, i->sub_state) ? NULL : i->sub_state;
 
         if (streq_ptr(i->active_state, "failed")) {
-                on = ansi_highlight_red(true);
-                off = ansi_highlight_red(false);
+                on = ansi_highlight(true);
+                off = ansi_highlight(false);
         } else if (streq_ptr(i->active_state, "active") || streq_ptr(i->active_state, "reloading")) {
                 on = ansi_highlight_green(true);
                 off = ansi_highlight_green(false);
@@ -2107,9 +2083,6 @@ static void print_status_info(UnitStatusInfo *i) {
                        strna(i->active_state),
                        off);
 
-        if (!isempty(i->result) && !streq(i->result, "success"))
-                printf(" (Result: %s)", i->result);
-
         timestamp = (streq_ptr(i->active_state, "active")      ||
                      streq_ptr(i->active_state, "reloading"))   ? i->active_enter_timestamp :
                     (streq_ptr(i->active_state, "inactive")    ||
@@ -2167,8 +2140,8 @@ static void print_status_info(UnitStatusInfo *i) {
                         good = is_clean_exit(p->code, p->status);
 
                 if (!good) {
-                        on = ansi_highlight_red(true);
-                        off = ansi_highlight_red(false);
+                        on = ansi_highlight(true);
+                        off = ansi_highlight(false);
                 } else
                         on = off = "";
 
@@ -2209,7 +2182,7 @@ static void print_status_info(UnitStatusInfo *i) {
 
                         if (i->running) {
                                 char *t = NULL;
-                                get_process_comm(i->main_pid, &t);
+                                get_process_name(i->main_pid, &t);
                                 if (t) {
                                         printf(" (%s)", t);
                                         free(t);
@@ -2243,7 +2216,7 @@ static void print_status_info(UnitStatusInfo *i) {
 
                         printf(" Control: %u", (unsigned) i->control_pid);
 
-                        get_process_comm(i->control_pid, &t);
+                        get_process_name(i->control_pid, &t);
                         if (t) {
                                 printf(" (%s)", t);
                                 free(t);
@@ -2267,19 +2240,14 @@ static void print_status_info(UnitStatusInfo *i) {
                         else
                                 c = 0;
 
-                        show_cgroup_by_path(i->default_control_group, "\t\t  ", c, false);
+                        show_cgroup_by_path(i->default_control_group, "\t\t  ", c);
                 }
         }
 
-        if (i->id && arg_transport != TRANSPORT_SSH) {
-                printf("\n");
-                show_journal_by_unit(i->id, arg_output, NULL, 0, i->inactive_exit_timestamp_monotonic, arg_lines, arg_all, arg_follow);
-        }
-
         if (i->need_daemon_reload)
                 printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %s daemon-reload' recommended.\n",
-                       ansi_highlight_red(true),
-                       ansi_highlight_red(false),
+                       ansi_highlight(true),
+                       ansi_highlight(false),
                        arg_scope == UNIT_FILE_SYSTEM ? "--system" : "--user");
 }
 
@@ -2329,8 +2297,6 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn
                                 i->following = s;
                         else if (streq(name, "UnitFileState"))
                                 i->unit_file_state = s;
-                        else if (streq(name, "Result"))
-                                i->result = s;
                 }
 
                 break;
@@ -2402,8 +2368,6 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn
                         i->inactive_enter_timestamp = (usec_t) u;
                 else if (streq(name, "InactiveExitTimestamp"))
                         i->inactive_exit_timestamp = (usec_t) u;
-                else if (streq(name, "InactiveExitTimestampMonotonic"))
-                        i->inactive_exit_timestamp_monotonic = (usec_t) u;
                 else if (streq(name, "ActiveExitTimestamp"))
                         i->active_exit_timestamp = (usec_t) u;
                 else if (streq(name, "ConditionTimestamp"))
@@ -3479,7 +3443,7 @@ finish:
 static int enable_sysv_units(char **args) {
         int r = 0;
 
-#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_MEEGO) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
+#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_MEEGO) || defined(TARGET_ALTLINUX))
         const char *verb = args[0];
         unsigned f = 1, t = 1;
         LookupPaths paths;
@@ -3662,15 +3626,12 @@ static int enable_unit(DBusConnection *bus, char **args) {
         int r;
         DBusError error;
 
+        dbus_error_init(&error);
+
         r = enable_sysv_units(args);
         if (r < 0)
                 return r;
 
-        if (!args[1])
-                return 0;
-
-        dbus_error_init(&error);
-
         if (!bus || avoid_bus()) {
                 if (streq(verb, "enable")) {
                         r = unit_file_enable(arg_scope, arg_runtime, arg_root, args+1, arg_force, &changes, &n_changes);
@@ -3697,13 +3658,11 @@ static int enable_unit(DBusConnection *bus, char **args) {
                         goto finish;
                 }
 
-                if (!arg_quiet) {
-                        for (i = 0; i < n_changes; i++) {
-                                if (changes[i].type == UNIT_FILE_SYMLINK)
-                                        log_info("ln -s '%s' '%s'", changes[i].source, changes[i].path);
-                                else
-                                        log_info("rm '%s'", changes[i].path);
-                        }
+                for (i = 0; i < n_changes; i++) {
+                        if (changes[i].type == UNIT_FILE_SYMLINK)
+                                log_info("ln -s '%s' '%s'", changes[i].source, changes[i].path);
+                        else
+                                log_info("rm '%s'", changes[i].path);
                 }
 
         } else {
@@ -3819,12 +3778,10 @@ static int enable_unit(DBusConnection *bus, char **args) {
                                 goto finish;
                         }
 
-                        if (!arg_quiet) {
-                                if (streq(type, "symlink"))
-                                        log_info("ln -s '%s' '%s'", source, path);
-                                else
-                                        log_info("rm '%s'", path);
-                        }
+                        if (streq(type, "symlink"))
+                                log_info("ln -s '%s' '%s'", source, path);
+                        else
+                                log_info("rm '%s'", path);
 
                         dbus_message_iter_next(&sub);
                 }
@@ -3989,11 +3946,7 @@ static int systemctl_help(void) {
                "  -f --force          When enabling unit files, override existing symlinks\n"
                "                      When shutting down, execute action immediately\n"
                "     --root=PATH      Enable unit files in the specified root directory\n"
-               "     --runtime        Enable unit files only temporarily until next reboot\n"
-               "  -n --lines=INTEGER  Journal entries to show\n"
-               "     --follow         Follow journal\n"
-               "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
-               "                      verbose, export, json, cat)\n\n"
+               "     --runtime        Enable unit files only temporarily until next reboot\n\n"
                "Unit Commands:\n"
                "  list-units                      List loaded units\n"
                "  start [NAME...]                 Start (activate) one or more units\n"
@@ -4144,8 +4097,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 ARG_KILL_WHO,
                 ARG_NO_ASK_PASSWORD,
                 ARG_FAILED,
-                ARG_RUNTIME,
-                ARG_FOLLOW
+                ARG_RUNTIME
         };
 
         static const struct option options[] = {
@@ -4178,9 +4130,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                 { "host",      required_argument, NULL, 'H'           },
                 { "privileged",no_argument,       NULL, 'P'           },
                 { "runtime",   no_argument,       NULL, ARG_RUNTIME   },
-                { "lines",     required_argument, NULL, 'n'           },
-                { "follow",    no_argument,       NULL, ARG_FOLLOW    },
-                { "output",    required_argument, NULL, 'o'           },
                 { NULL,        0,                 NULL, 0             }
         };
 
@@ -4192,7 +4141,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
         /* Only when running as systemctl we ask for passwords */
         arg_ask_password = true;
 
-        while ((c = getopt_long(argc, argv, "ht:p:aqfs:H:Pn:o:", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "ht:p:aqfs:H:P", options, NULL)) >= 0) {
 
                 switch (c) {
 
@@ -4330,25 +4279,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         arg_runtime = true;
                         break;
 
-                case 'n':
-                        if (safe_atou(optarg, &arg_lines) < 0) {
-                                log_error("Failed to parse lines '%s'", optarg);
-                                return -EINVAL;
-                        }
-                        break;
-
-                case ARG_FOLLOW:
-                        arg_follow = true;
-                        break;
-
-                case 'o':
-                        arg_output = output_mode_from_string(optarg);
-                        if (arg_output < 0) {
-                                log_error("Unknown output '%s'.", optarg);
-                                return -EINVAL;
-                        }
-                        break;
-
                 case '?':
                         return -EINVAL;
 
@@ -5051,8 +4981,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
          * enable/disable */
         if (!streq(verbs[i].verb, "enable") &&
             !streq(verbs[i].verb, "disable") &&
-            !streq(verbs[i].verb, "is-enabled") &&
-            !streq(verbs[i].verb, "list-unit-files") &&
+            !streq(verbs[i].verb, "is-enable") &&
             !streq(verbs[i].verb, "reenable") &&
             !streq(verbs[i].verb, "preset") &&
             !streq(verbs[i].verb, "mask") &&
@@ -5208,7 +5137,7 @@ static int halt_main(DBusConnection *bus) {
         if (!arg_no_wtmp) {
                 if (sd_booted() > 0)
                         log_debug("Not writing utmp record, assuming that systemd-update-utmp is used.");
-                else if ((r = utmp_put_shutdown()) < 0)
+                else if ((r = utmp_put_shutdown(0)) < 0)
                         log_warning("Failed to write utmp record: %s", strerror(-r));
         }
 
diff --git a/src/systemd-bash-completion.sh b/src/systemd-bash-completion.sh
deleted file mode 100644 (file)
index 176591f..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-# This file is part of systemd.
-#
-# Copyright 2010 Ran Benita
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# systemd is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
-__systemctl() {
-        systemctl --full --no-legend "$@"
-}
-
-__contains_word () {
-        local word=$1; shift
-        for w in $*; do [[ $w = $word ]] && return 0; done
-        return 1
-}
-
-__filter_units_by_property () {
-        local property=$1 value=$2 ; shift ; shift
-        local -a units=( $* )
-        local -a props=( $(__systemctl show --property "$property" -- ${units[*]} | grep -v ^$) )
-        for ((i=0; $i < ${#units[*]}; i++)); do
-                if [[ "${props[i]}" = "$property=$value" ]]; then
-                        echo "${units[i]}"
-                fi
-        done
-}
-
-__get_all_units      () { __systemctl list-units --all | awk '                 {print $1}' ; }
-__get_active_units   () { __systemctl list-units       | awk '                 {print $1}' ; }
-__get_inactive_units () { __systemctl list-units --all | awk '$3 == "inactive" {print $1}' ; }
-__get_failed_units   () { __systemctl list-units       | awk '$3 == "failed"   {print $1}' ; }
-__get_enabled_units  () { __systemctl list-unit-files  | awk '$2 == "enabled"  {print $1}' ; }
-__get_disabled_units () { __systemctl list-unit-files  | awk '$2 == "disabled" {print $1}' ; }
-__get_masked_units   () { __systemctl list-unit-files  | awk '$2 == "masked"   {print $1}' ; }
-
-_systemctl () {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='--all -a --defaults --fail --ignore-dependencies --failed --force -f --full --global
-                             --help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall
-                             --order --require --quiet -q --privileged -P --system --user --version --runtime'
-                      [ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --root'
-        )
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --signal|-s)
-                                comps=$(compgen -A signal)
-                        ;;
-                        --type|-t)
-                                comps='automount device mount path service snapshot socket swap target timer'
-                        ;;
-                        --kill-who)
-                                comps='all control main'
-                        ;;
-                        --kill-mode)
-                                comps='control-group process'
-                        ;;
-                        --root)
-                                comps=$(compgen -A directory -- "$cur" )
-                                compopt -o filenames
-                        ;;
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --property|-p)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
-                return 0
-        fi
-
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W "${OPTS[*]}" -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [ALL_UNITS]='is-active is-enabled status show mask preset'
-            [ENABLED_UNITS]='disable reenable'
-           [DISABLED_UNITS]='enable'
-             [FAILED_UNITS]='reset-failed'
-          [STARTABLE_UNITS]='start'
-          [STOPPABLE_UNITS]='stop condstop kill try-restart condrestart'
-         [ISOLATABLE_UNITS]='isolate'
-         [RELOADABLE_UNITS]='reload condreload reload-or-try-restart force-reload'
-        [RESTARTABLE_UNITS]='restart reload-or-restart'
-             [MASKED_UNITS]='unmask'
-                     [JOBS]='cancel'
-                [SNAPSHOTS]='delete'
-                     [ENVS]='set-environment unset-environment'
-               [STANDALONE]='daemon-reexec daemon-reload default dot dump
-                             emergency exit halt kexec list-jobs list-units
-                             list-unit-files poweroff reboot rescue show-environment'
-                     [NAME]='snapshot load'
-                     [FILE]='link'
-        )
-
-        for ((i=0; $i <= $COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
-                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG}]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if   [[ -z $verb ]]; then
-                comps="${VERBS[*]}"
-
-        elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then
-                comps=$( __get_all_units )
-
-        elif __contains_word "$verb" ${VERBS[ENABLED_UNITS]}; then
-                comps=$( __get_enabled_units )
-
-        elif __contains_word "$verb" ${VERBS[DISABLED_UNITS]}; then
-                comps=$( __get_disabled_units )
-
-        elif __contains_word "$verb" ${VERBS[STARTABLE_UNITS]}; then
-                comps=$( __filter_units_by_property CanStart yes \
-                      $( __get_inactive_units | grep -Ev '\.(device|snapshot)$' ))
-
-        elif __contains_word "$verb" ${VERBS[RESTARTABLE_UNITS]}; then
-                comps=$( __filter_units_by_property CanStart yes \
-                      $( __get_all_units | grep -Ev '\.(device|snapshot|socket|timer)$' ))
-
-        elif __contains_word "$verb" ${VERBS[STOPPABLE_UNITS]}; then
-                comps=$( __filter_units_by_property CanStop yes \
-                      $( __get_active_units ) )
-
-        elif __contains_word "$verb" ${VERBS[RELOADABLE_UNITS]}; then
-                comps=$( __filter_units_by_property CanReload yes \
-                      $( __get_active_units ) )
-
-        elif __contains_word "$verb" ${VERBS[ISOLATABLE_UNITS]}; then
-                comps=$( __filter_units_by_property AllowIsolate yes \
-                      $( __get_all_units ) )
-
-        elif __contains_word "$verb" ${VERBS[FAILED_UNITS]}; then
-                comps=$( __get_failed_units )
-
-        elif __contains_word "$verb" ${VERBS[MASKED_UNITS]}; then
-                comps=$( __get_masked_units )
-
-        elif __contains_word "$verb" ${VERBS[STANDALONE]} ${VERBS[NAME]}; then
-                comps=''
-
-        elif __contains_word "$verb" ${VERBS[JOBS]}; then
-                comps=$( __systemctl list-jobs | awk '{print $1}' )
-
-        elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then
-                comps=$( __systemctl list-units --type snapshot --full --all | awk '{print $1}' )
-
-        elif __contains_word "$verb" ${VERBS[ENVS]}; then
-                comps=$( __systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' )
-                compopt -o nospace
-
-        elif __contains_word "$verb" ${VERBS[FILE]}; then
-                comps=$( compgen -A file -- "$cur" )
-                compopt -o filenames
-        fi
-
-        COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
-        return 0
-}
-complete -F _systemctl systemctl
-
-__get_all_sessions () { systemd-loginctl list-sessions | awk '{print $1}' ; }
-__get_all_users    () { systemd-loginctl list-users    | awk '{print $2}' ; }
-__get_all_seats    () { systemd-loginctl list-seats    | awk '{print $1}' ; }
-
-_systemd_loginctl () {
-        local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
-        local verb comps
-
-        local -A OPTS=(
-               [STANDALONE]='--all -a --help -h --no-pager --privileged -P --version'
-                      [ARG]='--host -H --kill-who --property -p --signal -s'
-        )
-
-        if __contains_word "$prev" ${OPTS[ARG]}; then
-                case $prev in
-                        --signal|-s)
-                                comps=$(compgen -A signal)
-                        ;;
-                        --kill-who)
-                                comps='all leader'
-                        ;;
-                        --host|-H)
-                                comps=$(compgen -A hostname)
-                        ;;
-                        --property|-p)
-                                comps=''
-                        ;;
-                esac
-                COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
-                return 0
-        fi
-
-
-        if [[ "$cur" = -* ]]; then
-                COMPREPLY=( $(compgen -W "${OPTS[*]}" -- "$cur") )
-                return 0
-        fi
-
-        local -A VERBS=(
-                [SESSIONS]='session-status show-session activate lock-session unlock-session terminate-session kill-session'
-                [USERS]='user-status show-user enable-linger disable-linger terminate-user kill-user'
-                [SEATS]='seat-status show-seat terminate-seat'
-                [STANDALONE]='list-sessions list-users list-seats flush-devices'
-                [ATTACH]='attach'
-        )
-
-        for ((i=0; $i <= $COMP_CWORD; i++)); do
-                if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} &&
-                 ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG}]}; then
-                        verb=${COMP_WORDS[i]}
-                        break
-                fi
-        done
-
-        if   [[ -z $verb ]]; then
-                comps="${VERBS[*]}"
-
-        elif __contains_word "$verb" ${VERBS[SESSIONS]}; then
-                comps=$( __get_all_sessions )
-
-        elif __contains_word "$verb" ${VERBS[USERS]}; then
-                comps=$( __get_all_users )
-
-        elif __contains_word "$verb" ${VERBS[SEATS]}; then
-                comps=$( __get_all_seats )
-
-        elif __contains_word "$verb" ${VERBS[STANDALONE]}; then
-                comps=''
-
-        elif __contains_word "$verb" ${VERBS[ATTACH]}; then
-                if [[ $prev = $verb ]]; then
-                        comps=$( __get_all_seats )
-                else
-                        comps=$(compgen -A file -- "$cur" )
-                        compopt -o filenames
-                fi
-        fi
-
-        COMPREPLY=( $(compgen -W "$comps" -- "$cur") )
-        return 0
-}
-complete -F _systemd_loginctl systemd-loginctl
diff --git a/src/systemd-interfaces.c b/src/systemd-interfaces.c
deleted file mode 100644 (file)
index b7ff772..0000000
+++ /dev/null
@@ -1,7501 +0,0 @@
-/* systemd-interfaces.c generated by valac 0.15.1, the Vala compiler
- * generated from systemd-interfaces.vala, do not modify */
-
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gio/gio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-#define TYPE_MANAGER (manager_get_type ())
-#define MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MANAGER, Manager))
-#define IS_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MANAGER))
-#define MANAGER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_MANAGER, ManagerIface))
-
-typedef struct _Manager Manager;
-typedef struct _ManagerIface ManagerIface;
-
-#define TYPE_MANAGER_PROXY (manager_proxy_get_type ())
-
-#define MANAGER_TYPE_UNIT_INFO (manager_unit_info_get_type ())
-typedef struct _ManagerUnitInfo ManagerUnitInfo;
-
-#define MANAGER_TYPE_JOB_INFO (manager_job_info_get_type ())
-typedef struct _ManagerJobInfo ManagerJobInfo;
-#define _g_free0(var) (var = (g_free (var), NULL))
-typedef GDBusProxy ManagerProxy;
-typedef GDBusProxyClass ManagerProxyClass;
-
-#define TYPE_UNIT (unit_get_type ())
-#define UNIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UNIT, Unit))
-#define IS_UNIT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UNIT))
-#define UNIT_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_UNIT, UnitIface))
-
-typedef struct _Unit Unit;
-typedef struct _UnitIface UnitIface;
-
-#define TYPE_UNIT_PROXY (unit_proxy_get_type ())
-
-#define UNIT_TYPE_JOB_LINK (unit_job_link_get_type ())
-typedef struct _UnitJobLink UnitJobLink;
-typedef GDBusProxy UnitProxy;
-typedef GDBusProxyClass UnitProxyClass;
-
-#define TYPE_JOB (job_get_type ())
-#define JOB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_JOB, Job))
-#define IS_JOB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_JOB))
-#define JOB_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_JOB, JobIface))
-
-typedef struct _Job Job;
-typedef struct _JobIface JobIface;
-
-#define TYPE_JOB_PROXY (job_proxy_get_type ())
-
-#define JOB_TYPE_UNIT_LINK (job_unit_link_get_type ())
-typedef struct _JobUnitLink JobUnitLink;
-typedef GDBusProxy JobProxy;
-typedef GDBusProxyClass JobProxyClass;
-
-#define TYPE_PROPERTIES (properties_get_type ())
-#define PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROPERTIES, Properties))
-#define IS_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PROPERTIES))
-#define PROPERTIES_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_PROPERTIES, PropertiesIface))
-
-typedef struct _Properties Properties;
-typedef struct _PropertiesIface PropertiesIface;
-
-#define TYPE_PROPERTIES_PROXY (properties_proxy_get_type ())
-typedef GDBusProxy PropertiesProxy;
-typedef GDBusProxyClass PropertiesProxyClass;
-#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
-
-struct _ManagerUnitInfo {
-       gchar* id;
-       gchar* description;
-       gchar* load_state;
-       gchar* active_state;
-       gchar* sub_state;
-       gchar* following;
-       char* unit_path;
-       guint32 job_id;
-       gchar* job_type;
-       char* job_path;
-};
-
-struct _ManagerJobInfo {
-       guint32 id;
-       gchar* name;
-       gchar* type;
-       gchar* state;
-       char* job_path;
-       char* unit_path;
-};
-
-struct _ManagerIface {
-       GTypeInterface parent_iface;
-       ManagerUnitInfo* (*list_units) (Manager* self, int* result_length1, GError** error);
-       ManagerJobInfo* (*list_jobs) (Manager* self, int* result_length1, GError** error);
-       char* (*get_unit) (Manager* self, const gchar* name, GError** error);
-       char* (*get_unit_by_pid) (Manager* self, guint32 pid, GError** error);
-       char* (*load_unit) (Manager* self, const gchar* name, GError** error);
-       char* (*get_job) (Manager* self, guint32 id, GError** error);
-       char* (*start_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*stop_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*reload_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*try_restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*reload_or_restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       char* (*reload_or_try_restart_unit) (Manager* self, const gchar* name, const gchar* mode, GError** error);
-       void (*reset_failed_unit) (Manager* self, const gchar* name, GError** error);
-       void (*clear_jobs) (Manager* self, GError** error);
-       void (*subscribe) (Manager* self, GError** error);
-       void (*unsubscribe) (Manager* self, GError** error);
-       gchar* (*dump) (Manager* self, GError** error);
-       void (*reload) (Manager* self, GError** error);
-       void (*reexecute) (Manager* self, GError** error);
-       void (*exit) (Manager* self, GError** error);
-       void (*halt) (Manager* self, GError** error);
-       void (*power_off) (Manager* self, GError** error);
-       void (*reboot) (Manager* self, GError** error);
-       void (*kexec) (Manager* self, GError** error);
-       char* (*create_snapshot) (Manager* self, const gchar* name, gboolean cleanup, GError** error);
-       void (*set_environment) (Manager* self, gchar** names, int names_length1, GError** error);
-       void (*unset_environment) (Manager* self, gchar** names, int names_length1, GError** error);
-       gchar** (*get_environment) (Manager* self, int* result_length1);
-};
-
-struct _UnitJobLink {
-       guint32 id;
-       char* path;
-};
-
-struct _UnitIface {
-       GTypeInterface parent_iface;
-       char* (*start) (Unit* self, const gchar* mode, GError** error);
-       char* (*stop) (Unit* self, const gchar* mode, GError** error);
-       char* (*reload) (Unit* self, const gchar* mode, GError** error);
-       char* (*restart) (Unit* self, const gchar* mode, GError** error);
-       char* (*try_restart) (Unit* self, const gchar* mode, GError** error);
-       char* (*reload_or_restart) (Unit* self, const gchar* mode, GError** error);
-       char* (*reload_or_try_restart) (Unit* self, const gchar* mode, GError** error);
-       void (*reset_failed) (Unit* self, GError** error);
-       gchar* (*get_id) (Unit* self);
-       gchar** (*get_names) (Unit* self, int* result_length1);
-       gchar* (*get_following) (Unit* self);
-       gchar** (*get_requires) (Unit* self, int* result_length1);
-       gchar** (*get_requires_overridable) (Unit* self, int* result_length1);
-       gchar** (*get_requisite) (Unit* self, int* result_length1);
-       gchar** (*get_requisite_overridable) (Unit* self, int* result_length1);
-       gchar** (*get_wants) (Unit* self, int* result_length1);
-       gchar** (*get_required_by) (Unit* self, int* result_length1);
-       gchar** (*get_required_by_overridable) (Unit* self, int* result_length1);
-       gchar** (*get_wanted_by) (Unit* self, int* result_length1);
-       gchar** (*get_conflicts) (Unit* self, int* result_length1);
-       gchar** (*get_conflicted_by) (Unit* self, int* result_length1);
-       gchar** (*get_before) (Unit* self, int* result_length1);
-       gchar** (*get_after) (Unit* self, int* result_length1);
-       gchar** (*get_on_failure) (Unit* self, int* result_length1);
-       gchar* (*get_description) (Unit* self);
-       gchar* (*get_load_state) (Unit* self);
-       gchar* (*get_active_state) (Unit* self);
-       gchar* (*get_sub_state) (Unit* self);
-       gchar* (*get_fragment_path) (Unit* self);
-       guint64 (*get_inactive_exit_timestamp) (Unit* self);
-       guint64 (*get_active_enter_timestamp) (Unit* self);
-       guint64 (*get_active_exit_timestamp) (Unit* self);
-       guint64 (*get_inactive_enter_timestamp) (Unit* self);
-       gboolean (*get_can_start) (Unit* self);
-       gboolean (*get_can_stop) (Unit* self);
-       gboolean (*get_can_reload) (Unit* self);
-       void (*get_job) (Unit* self, UnitJobLink* value);
-       gboolean (*get_recursive_stop) (Unit* self);
-       gboolean (*get_stop_when_unneeded) (Unit* self);
-       gboolean (*get_refuse_manual_start) (Unit* self);
-       gboolean (*get_refuse_manual_stop) (Unit* self);
-       gboolean (*get_default_dependencies) (Unit* self);
-       gchar* (*get_default_control_group) (Unit* self);
-       gchar** (*get_control_groups) (Unit* self, int* result_length1);
-       gboolean (*get_need_daemon_reload) (Unit* self);
-       guint64 (*get_job_timeout_usec) (Unit* self);
-};
-
-struct _JobUnitLink {
-       gchar* id;
-       char* path;
-};
-
-struct _JobIface {
-       GTypeInterface parent_iface;
-       void (*cancel) (Job* self, GError** error);
-       guint32 (*get_id) (Job* self);
-       gchar* (*get_state) (Job* self);
-       gchar* (*get_job_type) (Job* self);
-       void (*get_unit) (Job* self, JobUnitLink* value);
-};
-
-struct _PropertiesIface {
-       GTypeInterface parent_iface;
-       GVariant* (*get) (Properties* self, const gchar* iface, const gchar* property, GError** error);
-};
-
-
-
-GType manager_proxy_get_type (void) G_GNUC_CONST;
-guint manager_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType manager_unit_info_get_type (void) G_GNUC_CONST;
-ManagerUnitInfo* manager_unit_info_dup (const ManagerUnitInfo* self);
-void manager_unit_info_free (ManagerUnitInfo* self);
-void manager_unit_info_copy (const ManagerUnitInfo* self, ManagerUnitInfo* dest);
-void manager_unit_info_destroy (ManagerUnitInfo* self);
-GType manager_job_info_get_type (void) G_GNUC_CONST;
-ManagerJobInfo* manager_job_info_dup (const ManagerJobInfo* self);
-void manager_job_info_free (ManagerJobInfo* self);
-void manager_job_info_copy (const ManagerJobInfo* self, ManagerJobInfo* dest);
-void manager_job_info_destroy (ManagerJobInfo* self);
-GType manager_get_type (void) G_GNUC_CONST;
-ManagerUnitInfo* manager_list_units (Manager* self, int* result_length1, GError** error);
-ManagerJobInfo* manager_list_jobs (Manager* self, int* result_length1, GError** error);
-char* manager_get_unit (Manager* self, const gchar* name, GError** error);
-char* manager_get_unit_by_pid (Manager* self, guint32 pid, GError** error);
-char* manager_load_unit (Manager* self, const gchar* name, GError** error);
-char* manager_get_job (Manager* self, guint32 id, GError** error);
-char* manager_start_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-char* manager_stop_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-char* manager_reload_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-char* manager_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-char* manager_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-char* manager_reload_or_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-char* manager_reload_or_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-void manager_reset_failed_unit (Manager* self, const gchar* name, GError** error);
-void manager_clear_jobs (Manager* self, GError** error);
-void manager_subscribe (Manager* self, GError** error);
-void manager_unsubscribe (Manager* self, GError** error);
-gchar* manager_dump (Manager* self, GError** error);
-void manager_reload (Manager* self, GError** error);
-void manager_reexecute (Manager* self, GError** error);
-void manager_exit (Manager* self, GError** error);
-void manager_halt (Manager* self, GError** error);
-void manager_power_off (Manager* self, GError** error);
-void manager_reboot (Manager* self, GError** error);
-void manager_kexec (Manager* self, GError** error);
-char* manager_create_snapshot (Manager* self, const gchar* name, gboolean cleanup, GError** error);
-void manager_set_environment (Manager* self, gchar** names, int names_length1, GError** error);
-void manager_unset_environment (Manager* self, gchar** names, int names_length1, GError** error);
-gchar** manager_get_environment (Manager* self, int* result_length1);
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__UINT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__UINT_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void manager_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters);
-static void _dbus_handle_manager_unit_new (Manager* self, GVariant* parameters);
-static void _dbus_handle_manager_unit_removed (Manager* self, GVariant* parameters);
-static void _dbus_handle_manager_job_new (Manager* self, GVariant* parameters);
-static void _dbus_handle_manager_job_removed (Manager* self, GVariant* parameters);
-static ManagerUnitInfo* manager_proxy_list_units (Manager* self, int* result_length1, GError** error);
-static ManagerJobInfo* manager_proxy_list_jobs (Manager* self, int* result_length1, GError** error);
-static char* manager_proxy_get_unit (Manager* self, const gchar* name, GError** error);
-static char* manager_proxy_get_unit_by_pid (Manager* self, guint32 pid, GError** error);
-static char* manager_proxy_load_unit (Manager* self, const gchar* name, GError** error);
-static char* manager_proxy_get_job (Manager* self, guint32 id, GError** error);
-static char* manager_proxy_start_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static char* manager_proxy_stop_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static char* manager_proxy_reload_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static char* manager_proxy_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static char* manager_proxy_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static char* manager_proxy_reload_or_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static char* manager_proxy_reload_or_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error);
-static void manager_proxy_reset_failed_unit (Manager* self, const gchar* name, GError** error);
-static void manager_proxy_clear_jobs (Manager* self, GError** error);
-static void manager_proxy_subscribe (Manager* self, GError** error);
-static void manager_proxy_unsubscribe (Manager* self, GError** error);
-static gchar* manager_proxy_dump (Manager* self, GError** error);
-static void manager_proxy_reload (Manager* self, GError** error);
-static void manager_proxy_reexecute (Manager* self, GError** error);
-static void manager_proxy_exit (Manager* self, GError** error);
-static void manager_proxy_halt (Manager* self, GError** error);
-static void manager_proxy_power_off (Manager* self, GError** error);
-static void manager_proxy_reboot (Manager* self, GError** error);
-static void manager_proxy_kexec (Manager* self, GError** error);
-static char* manager_proxy_create_snapshot (Manager* self, const gchar* name, gboolean cleanup, GError** error);
-static void manager_proxy_set_environment (Manager* self, gchar** names, int names_length1, GError** error);
-static void manager_proxy_unset_environment (Manager* self, gchar** names, int names_length1, GError** error);
-static gchar** manager_dbus_proxy_get_environment (Manager* self, int* result_length1);
-static void manager_proxy_manager_interface_init (ManagerIface* iface);
-static void _vala_ManagerUnitInfo_array_free (ManagerUnitInfo* array, gint array_length);
-static void _dbus_manager_list_units (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _vala_ManagerJobInfo_array_free (ManagerJobInfo* array, gint array_length);
-static void _dbus_manager_list_jobs (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_get_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_get_unit_by_pid (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_load_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_get_job (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_start_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_stop_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reload_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_try_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reload_or_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reload_or_try_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reset_failed_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_clear_jobs (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_subscribe (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_unsubscribe (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_dump (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reload (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reexecute (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_exit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_halt (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_power_off (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_reboot (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_kexec (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_create_snapshot (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_set_environment (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_manager_unset_environment (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void manager_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data);
-static GVariant* manager_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data);
-static GVariant* _dbus_manager_get_environment (Manager* self);
-static gboolean manager_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data);
-static void _dbus_manager_unit_new (GObject* _sender, const gchar* id, const char* path, gpointer* _data);
-static void _dbus_manager_unit_removed (GObject* _sender, const gchar* id, const char* path, gpointer* _data);
-static void _dbus_manager_job_new (GObject* _sender, guint32 id, const char* path, gpointer* _data);
-static void _dbus_manager_job_removed (GObject* _sender, guint32 id, const char* path, const gchar* res, gpointer* _data);
-static void _manager_unregister_object (gpointer user_data);
-GType unit_proxy_get_type (void) G_GNUC_CONST;
-guint unit_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType unit_job_link_get_type (void) G_GNUC_CONST;
-UnitJobLink* unit_job_link_dup (const UnitJobLink* self);
-void unit_job_link_free (UnitJobLink* self);
-void unit_job_link_copy (const UnitJobLink* self, UnitJobLink* dest);
-void unit_job_link_destroy (UnitJobLink* self);
-GType unit_get_type (void) G_GNUC_CONST;
-char* unit_start (Unit* self, const gchar* mode, GError** error);
-char* unit_stop (Unit* self, const gchar* mode, GError** error);
-char* unit_reload (Unit* self, const gchar* mode, GError** error);
-char* unit_restart (Unit* self, const gchar* mode, GError** error);
-char* unit_try_restart (Unit* self, const gchar* mode, GError** error);
-char* unit_reload_or_restart (Unit* self, const gchar* mode, GError** error);
-char* unit_reload_or_try_restart (Unit* self, const gchar* mode, GError** error);
-void unit_reset_failed (Unit* self, GError** error);
-gchar* unit_get_id (Unit* self);
-gchar** unit_get_names (Unit* self, int* result_length1);
-gchar* unit_get_following (Unit* self);
-gchar** unit_get_requires (Unit* self, int* result_length1);
-gchar** unit_get_requires_overridable (Unit* self, int* result_length1);
-gchar** unit_get_requisite (Unit* self, int* result_length1);
-gchar** unit_get_requisite_overridable (Unit* self, int* result_length1);
-gchar** unit_get_wants (Unit* self, int* result_length1);
-gchar** unit_get_required_by (Unit* self, int* result_length1);
-gchar** unit_get_required_by_overridable (Unit* self, int* result_length1);
-gchar** unit_get_wanted_by (Unit* self, int* result_length1);
-gchar** unit_get_conflicts (Unit* self, int* result_length1);
-gchar** unit_get_conflicted_by (Unit* self, int* result_length1);
-gchar** unit_get_before (Unit* self, int* result_length1);
-gchar** unit_get_after (Unit* self, int* result_length1);
-gchar** unit_get_on_failure (Unit* self, int* result_length1);
-gchar* unit_get_description (Unit* self);
-gchar* unit_get_load_state (Unit* self);
-gchar* unit_get_active_state (Unit* self);
-gchar* unit_get_sub_state (Unit* self);
-gchar* unit_get_fragment_path (Unit* self);
-guint64 unit_get_inactive_exit_timestamp (Unit* self);
-guint64 unit_get_active_enter_timestamp (Unit* self);
-guint64 unit_get_active_exit_timestamp (Unit* self);
-guint64 unit_get_inactive_enter_timestamp (Unit* self);
-gboolean unit_get_can_start (Unit* self);
-gboolean unit_get_can_stop (Unit* self);
-gboolean unit_get_can_reload (Unit* self);
-void unit_get_job (Unit* self, UnitJobLink* result);
-gboolean unit_get_recursive_stop (Unit* self);
-gboolean unit_get_stop_when_unneeded (Unit* self);
-gboolean unit_get_refuse_manual_start (Unit* self);
-gboolean unit_get_refuse_manual_stop (Unit* self);
-gboolean unit_get_default_dependencies (Unit* self);
-gchar* unit_get_default_control_group (Unit* self);
-gchar** unit_get_control_groups (Unit* self, int* result_length1);
-gboolean unit_get_need_daemon_reload (Unit* self);
-guint64 unit_get_job_timeout_usec (Unit* self);
-static void unit_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters);
-static char* unit_proxy_start (Unit* self, const gchar* mode, GError** error);
-static char* unit_proxy_stop (Unit* self, const gchar* mode, GError** error);
-static char* unit_proxy_reload (Unit* self, const gchar* mode, GError** error);
-static char* unit_proxy_restart (Unit* self, const gchar* mode, GError** error);
-static char* unit_proxy_try_restart (Unit* self, const gchar* mode, GError** error);
-static char* unit_proxy_reload_or_restart (Unit* self, const gchar* mode, GError** error);
-static char* unit_proxy_reload_or_try_restart (Unit* self, const gchar* mode, GError** error);
-static void unit_proxy_reset_failed (Unit* self, GError** error);
-static gchar* unit_dbus_proxy_get_id (Unit* self);
-static gchar** unit_dbus_proxy_get_names (Unit* self, int* result_length1);
-static gchar* unit_dbus_proxy_get_following (Unit* self);
-static gchar** unit_dbus_proxy_get_requires (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_requires_overridable (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_requisite (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_requisite_overridable (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_wants (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_required_by (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_required_by_overridable (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_wanted_by (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_conflicts (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_conflicted_by (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_before (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_after (Unit* self, int* result_length1);
-static gchar** unit_dbus_proxy_get_on_failure (Unit* self, int* result_length1);
-static gchar* unit_dbus_proxy_get_description (Unit* self);
-static gchar* unit_dbus_proxy_get_load_state (Unit* self);
-static gchar* unit_dbus_proxy_get_active_state (Unit* self);
-static gchar* unit_dbus_proxy_get_sub_state (Unit* self);
-static gchar* unit_dbus_proxy_get_fragment_path (Unit* self);
-static guint64 unit_dbus_proxy_get_inactive_exit_timestamp (Unit* self);
-static guint64 unit_dbus_proxy_get_active_enter_timestamp (Unit* self);
-static guint64 unit_dbus_proxy_get_active_exit_timestamp (Unit* self);
-static guint64 unit_dbus_proxy_get_inactive_enter_timestamp (Unit* self);
-static gboolean unit_dbus_proxy_get_can_start (Unit* self);
-static gboolean unit_dbus_proxy_get_can_stop (Unit* self);
-static gboolean unit_dbus_proxy_get_can_reload (Unit* self);
-static void unit_dbus_proxy_get_job (Unit* self, UnitJobLink* result);
-static gboolean unit_dbus_proxy_get_recursive_stop (Unit* self);
-static gboolean unit_dbus_proxy_get_stop_when_unneeded (Unit* self);
-static gboolean unit_dbus_proxy_get_refuse_manual_start (Unit* self);
-static gboolean unit_dbus_proxy_get_refuse_manual_stop (Unit* self);
-static gboolean unit_dbus_proxy_get_default_dependencies (Unit* self);
-static gchar* unit_dbus_proxy_get_default_control_group (Unit* self);
-static gchar** unit_dbus_proxy_get_control_groups (Unit* self, int* result_length1);
-static gboolean unit_dbus_proxy_get_need_daemon_reload (Unit* self);
-static guint64 unit_dbus_proxy_get_job_timeout_usec (Unit* self);
-static void unit_proxy_unit_interface_init (UnitIface* iface);
-static void _dbus_unit_start (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_stop (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_reload (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_try_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_reload_or_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_reload_or_try_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void _dbus_unit_reset_failed (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void unit_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data);
-static GVariant* unit_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data);
-static GVariant* _dbus_unit_get_id (Unit* self);
-static GVariant* _dbus_unit_get_names (Unit* self);
-static GVariant* _dbus_unit_get_following (Unit* self);
-static GVariant* _dbus_unit_get_requires (Unit* self);
-static GVariant* _dbus_unit_get_requires_overridable (Unit* self);
-static GVariant* _dbus_unit_get_requisite (Unit* self);
-static GVariant* _dbus_unit_get_requisite_overridable (Unit* self);
-static GVariant* _dbus_unit_get_wants (Unit* self);
-static GVariant* _dbus_unit_get_required_by (Unit* self);
-static GVariant* _dbus_unit_get_required_by_overridable (Unit* self);
-static GVariant* _dbus_unit_get_wanted_by (Unit* self);
-static GVariant* _dbus_unit_get_conflicts (Unit* self);
-static GVariant* _dbus_unit_get_conflicted_by (Unit* self);
-static GVariant* _dbus_unit_get_before (Unit* self);
-static GVariant* _dbus_unit_get_after (Unit* self);
-static GVariant* _dbus_unit_get_on_failure (Unit* self);
-static GVariant* _dbus_unit_get_description (Unit* self);
-static GVariant* _dbus_unit_get_load_state (Unit* self);
-static GVariant* _dbus_unit_get_active_state (Unit* self);
-static GVariant* _dbus_unit_get_sub_state (Unit* self);
-static GVariant* _dbus_unit_get_fragment_path (Unit* self);
-static GVariant* _dbus_unit_get_inactive_exit_timestamp (Unit* self);
-static GVariant* _dbus_unit_get_active_enter_timestamp (Unit* self);
-static GVariant* _dbus_unit_get_active_exit_timestamp (Unit* self);
-static GVariant* _dbus_unit_get_inactive_enter_timestamp (Unit* self);
-static GVariant* _dbus_unit_get_can_start (Unit* self);
-static GVariant* _dbus_unit_get_can_stop (Unit* self);
-static GVariant* _dbus_unit_get_can_reload (Unit* self);
-static GVariant* _dbus_unit_get_job (Unit* self);
-static GVariant* _dbus_unit_get_recursive_stop (Unit* self);
-static GVariant* _dbus_unit_get_stop_when_unneeded (Unit* self);
-static GVariant* _dbus_unit_get_refuse_manual_start (Unit* self);
-static GVariant* _dbus_unit_get_refuse_manual_stop (Unit* self);
-static GVariant* _dbus_unit_get_default_dependencies (Unit* self);
-static GVariant* _dbus_unit_get_default_control_group (Unit* self);
-static GVariant* _dbus_unit_get_control_groups (Unit* self);
-static GVariant* _dbus_unit_get_need_daemon_reload (Unit* self);
-static GVariant* _dbus_unit_get_job_timeout_usec (Unit* self);
-static gboolean unit_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data);
-static void _unit_unregister_object (gpointer user_data);
-GType job_proxy_get_type (void) G_GNUC_CONST;
-guint job_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType job_unit_link_get_type (void) G_GNUC_CONST;
-JobUnitLink* job_unit_link_dup (const JobUnitLink* self);
-void job_unit_link_free (JobUnitLink* self);
-void job_unit_link_copy (const JobUnitLink* self, JobUnitLink* dest);
-void job_unit_link_destroy (JobUnitLink* self);
-GType job_get_type (void) G_GNUC_CONST;
-void job_cancel (Job* self, GError** error);
-guint32 job_get_id (Job* self);
-gchar* job_get_state (Job* self);
-gchar* job_get_job_type (Job* self);
-void job_get_unit (Job* self, JobUnitLink* result);
-static void job_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters);
-static void job_proxy_cancel (Job* self, GError** error);
-static guint32 job_dbus_proxy_get_id (Job* self);
-static gchar* job_dbus_proxy_get_state (Job* self);
-static gchar* job_dbus_proxy_get_job_type (Job* self);
-static void job_dbus_proxy_get_unit (Job* self, JobUnitLink* result);
-static void job_proxy_job_interface_init (JobIface* iface);
-static void _dbus_job_cancel (Job* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void job_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data);
-static GVariant* job_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data);
-static GVariant* _dbus_job_get_id (Job* self);
-static GVariant* _dbus_job_get_state (Job* self);
-static GVariant* _dbus_job_get_job_type (Job* self);
-static GVariant* _dbus_job_get_unit (Job* self);
-static gboolean job_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data);
-static void _job_unregister_object (gpointer user_data);
-GType properties_proxy_get_type (void) G_GNUC_CONST;
-guint properties_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error);
-GType properties_get_type (void) G_GNUC_CONST;
-GVariant* properties_get (Properties* self, const gchar* iface, const gchar* property, GError** error);
-static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void properties_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters);
-static void _dbus_handle_properties_properties_changed (Properties* self, GVariant* parameters);
-static GVariant* properties_proxy_get (Properties* self, const gchar* iface, const gchar* property, GError** error);
-static void properties_proxy_properties_interface_init (PropertiesIface* iface);
-static void _dbus_properties_get (Properties* self, GVariant* parameters, GDBusMethodInvocation* invocation);
-static void properties_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data);
-static GVariant* properties_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data);
-static gboolean properties_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data);
-static void _dbus_properties_properties_changed (GObject* _sender, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1, gpointer* _data);
-static void _properties_unregister_object (gpointer user_data);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-
-static const GDBusArgInfo _manager_dbus_arg_info_list_units_result = {-1, "result", "a(ssssssouso)"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_list_units_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_list_units_out[] = {&_manager_dbus_arg_info_list_units_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_list_units = {-1, "ListUnits", (GDBusArgInfo **) (&_manager_dbus_arg_info_list_units_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_list_units_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_list_jobs_result = {-1, "result", "a(usssoo)"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_list_jobs_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_list_jobs_out[] = {&_manager_dbus_arg_info_list_jobs_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_list_jobs = {-1, "ListJobs", (GDBusArgInfo **) (&_manager_dbus_arg_info_list_jobs_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_list_jobs_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_get_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_get_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_get_unit_in[] = {&_manager_dbus_arg_info_get_unit_name, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_get_unit_out[] = {&_manager_dbus_arg_info_get_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_get_unit = {-1, "GetUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_get_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_get_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_get_unit_by_pid_pid = {-1, "pid", "u"};
-static const GDBusArgInfo _manager_dbus_arg_info_get_unit_by_pid_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_get_unit_by_pid_in[] = {&_manager_dbus_arg_info_get_unit_by_pid_pid, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_get_unit_by_pid_out[] = {&_manager_dbus_arg_info_get_unit_by_pid_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_get_unit_by_pid = {-1, "GetUnitByPid", (GDBusArgInfo **) (&_manager_dbus_arg_info_get_unit_by_pid_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_get_unit_by_pid_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_load_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_load_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_load_unit_in[] = {&_manager_dbus_arg_info_load_unit_name, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_load_unit_out[] = {&_manager_dbus_arg_info_load_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_load_unit = {-1, "LoadUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_load_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_load_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_get_job_id = {-1, "id", "u"};
-static const GDBusArgInfo _manager_dbus_arg_info_get_job_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_get_job_in[] = {&_manager_dbus_arg_info_get_job_id, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_get_job_out[] = {&_manager_dbus_arg_info_get_job_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_get_job = {-1, "GetJob", (GDBusArgInfo **) (&_manager_dbus_arg_info_get_job_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_get_job_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_start_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_start_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_start_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_start_unit_in[] = {&_manager_dbus_arg_info_start_unit_name, &_manager_dbus_arg_info_start_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_start_unit_out[] = {&_manager_dbus_arg_info_start_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_start_unit = {-1, "StartUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_start_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_start_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_stop_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_stop_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_stop_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_stop_unit_in[] = {&_manager_dbus_arg_info_stop_unit_name, &_manager_dbus_arg_info_stop_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_stop_unit_out[] = {&_manager_dbus_arg_info_stop_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_stop_unit = {-1, "StopUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_stop_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_stop_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_unit_in[] = {&_manager_dbus_arg_info_reload_unit_name, &_manager_dbus_arg_info_reload_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_unit_out[] = {&_manager_dbus_arg_info_reload_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reload_unit = {-1, "ReloadUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_restart_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_restart_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_restart_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_restart_unit_in[] = {&_manager_dbus_arg_info_restart_unit_name, &_manager_dbus_arg_info_restart_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_restart_unit_out[] = {&_manager_dbus_arg_info_restart_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_restart_unit = {-1, "RestartUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_restart_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_restart_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_try_restart_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_try_restart_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_try_restart_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_try_restart_unit_in[] = {&_manager_dbus_arg_info_try_restart_unit_name, &_manager_dbus_arg_info_try_restart_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_try_restart_unit_out[] = {&_manager_dbus_arg_info_try_restart_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_try_restart_unit = {-1, "TryRestartUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_try_restart_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_try_restart_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_or_restart_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_or_restart_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_or_restart_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_or_restart_unit_in[] = {&_manager_dbus_arg_info_reload_or_restart_unit_name, &_manager_dbus_arg_info_reload_or_restart_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_or_restart_unit_out[] = {&_manager_dbus_arg_info_reload_or_restart_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reload_or_restart_unit = {-1, "ReloadOrRestartUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_or_restart_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_or_restart_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_or_try_restart_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_or_try_restart_unit_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_reload_or_try_restart_unit_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_or_try_restart_unit_in[] = {&_manager_dbus_arg_info_reload_or_try_restart_unit_name, &_manager_dbus_arg_info_reload_or_try_restart_unit_mode, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_or_try_restart_unit_out[] = {&_manager_dbus_arg_info_reload_or_try_restart_unit_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reload_or_try_restart_unit = {-1, "ReloadOrTryRestartUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_or_try_restart_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_or_try_restart_unit_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_reset_failed_unit_name = {-1, "name", "s"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reset_failed_unit_in[] = {&_manager_dbus_arg_info_reset_failed_unit_name, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reset_failed_unit_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reset_failed_unit = {-1, "ResetFailedUnit", (GDBusArgInfo **) (&_manager_dbus_arg_info_reset_failed_unit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reset_failed_unit_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_clear_jobs_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_clear_jobs_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_clear_jobs = {-1, "ClearJobs", (GDBusArgInfo **) (&_manager_dbus_arg_info_clear_jobs_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_clear_jobs_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_subscribe_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_subscribe_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_subscribe = {-1, "Subscribe", (GDBusArgInfo **) (&_manager_dbus_arg_info_subscribe_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_subscribe_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_unsubscribe_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_unsubscribe_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_unsubscribe = {-1, "Unsubscribe", (GDBusArgInfo **) (&_manager_dbus_arg_info_unsubscribe_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_unsubscribe_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_dump_result = {-1, "result", "s"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_dump_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_dump_out[] = {&_manager_dbus_arg_info_dump_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_dump = {-1, "Dump", (GDBusArgInfo **) (&_manager_dbus_arg_info_dump_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_dump_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reload_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reload = {-1, "Reload", (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reload_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reexecute_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reexecute_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reexecute = {-1, "Reexecute", (GDBusArgInfo **) (&_manager_dbus_arg_info_reexecute_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reexecute_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_exit_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_exit_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_exit = {-1, "Exit", (GDBusArgInfo **) (&_manager_dbus_arg_info_exit_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_exit_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_halt_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_halt_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_halt = {-1, "Halt", (GDBusArgInfo **) (&_manager_dbus_arg_info_halt_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_halt_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_power_off_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_power_off_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_power_off = {-1, "PowerOff", (GDBusArgInfo **) (&_manager_dbus_arg_info_power_off_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_power_off_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reboot_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_reboot_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_reboot = {-1, "Reboot", (GDBusArgInfo **) (&_manager_dbus_arg_info_reboot_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_reboot_out)};
-static const GDBusArgInfo * const _manager_dbus_arg_info_kexec_in[] = {NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_kexec_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_kexec = {-1, "Kexec", (GDBusArgInfo **) (&_manager_dbus_arg_info_kexec_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_kexec_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_create_snapshot_name = {-1, "name", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_create_snapshot_cleanup = {-1, "cleanup", "b"};
-static const GDBusArgInfo _manager_dbus_arg_info_create_snapshot_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_create_snapshot_in[] = {&_manager_dbus_arg_info_create_snapshot_name, &_manager_dbus_arg_info_create_snapshot_cleanup, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_create_snapshot_out[] = {&_manager_dbus_arg_info_create_snapshot_result, NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_create_snapshot = {-1, "CreateSnapshot", (GDBusArgInfo **) (&_manager_dbus_arg_info_create_snapshot_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_create_snapshot_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_set_environment_names = {-1, "names", "as"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_set_environment_in[] = {&_manager_dbus_arg_info_set_environment_names, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_set_environment_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_set_environment = {-1, "SetEnvironment", (GDBusArgInfo **) (&_manager_dbus_arg_info_set_environment_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_set_environment_out)};
-static const GDBusArgInfo _manager_dbus_arg_info_unset_environment_names = {-1, "names", "as"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_unset_environment_in[] = {&_manager_dbus_arg_info_unset_environment_names, NULL};
-static const GDBusArgInfo * const _manager_dbus_arg_info_unset_environment_out[] = {NULL};
-static const GDBusMethodInfo _manager_dbus_method_info_unset_environment = {-1, "UnsetEnvironment", (GDBusArgInfo **) (&_manager_dbus_arg_info_unset_environment_in), (GDBusArgInfo **) (&_manager_dbus_arg_info_unset_environment_out)};
-static const GDBusMethodInfo * const _manager_dbus_method_info[] = {&_manager_dbus_method_info_list_units, &_manager_dbus_method_info_list_jobs, &_manager_dbus_method_info_get_unit, &_manager_dbus_method_info_get_unit_by_pid, &_manager_dbus_method_info_load_unit, &_manager_dbus_method_info_get_job, &_manager_dbus_method_info_start_unit, &_manager_dbus_method_info_stop_unit, &_manager_dbus_method_info_reload_unit, &_manager_dbus_method_info_restart_unit, &_manager_dbus_method_info_try_restart_unit, &_manager_dbus_method_info_reload_or_restart_unit, &_manager_dbus_method_info_reload_or_try_restart_unit, &_manager_dbus_method_info_reset_failed_unit, &_manager_dbus_method_info_clear_jobs, &_manager_dbus_method_info_subscribe, &_manager_dbus_method_info_unsubscribe, &_manager_dbus_method_info_dump, &_manager_dbus_method_info_reload, &_manager_dbus_method_info_reexecute, &_manager_dbus_method_info_exit, &_manager_dbus_method_info_halt, &_manager_dbus_method_info_power_off, &_manager_dbus_method_info_reboot, &_manager_dbus_method_info_kexec, &_manager_dbus_method_info_create_snapshot, &_manager_dbus_method_info_set_environment, &_manager_dbus_method_info_unset_environment, NULL};
-static const GDBusArgInfo _manager_dbus_arg_info_unit_new_id = {-1, "id", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_unit_new_path = {-1, "path", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_unit_new[] = {&_manager_dbus_arg_info_unit_new_id, &_manager_dbus_arg_info_unit_new_path, NULL};
-static const GDBusSignalInfo _manager_dbus_signal_info_unit_new = {-1, "UnitNew", (GDBusArgInfo **) (&_manager_dbus_arg_info_unit_new)};
-static const GDBusArgInfo _manager_dbus_arg_info_unit_removed_id = {-1, "id", "s"};
-static const GDBusArgInfo _manager_dbus_arg_info_unit_removed_path = {-1, "path", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_unit_removed[] = {&_manager_dbus_arg_info_unit_removed_id, &_manager_dbus_arg_info_unit_removed_path, NULL};
-static const GDBusSignalInfo _manager_dbus_signal_info_unit_removed = {-1, "UnitRemoved", (GDBusArgInfo **) (&_manager_dbus_arg_info_unit_removed)};
-static const GDBusArgInfo _manager_dbus_arg_info_job_new_id = {-1, "id", "u"};
-static const GDBusArgInfo _manager_dbus_arg_info_job_new_path = {-1, "path", "o"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_job_new[] = {&_manager_dbus_arg_info_job_new_id, &_manager_dbus_arg_info_job_new_path, NULL};
-static const GDBusSignalInfo _manager_dbus_signal_info_job_new = {-1, "JobNew", (GDBusArgInfo **) (&_manager_dbus_arg_info_job_new)};
-static const GDBusArgInfo _manager_dbus_arg_info_job_removed_id = {-1, "id", "u"};
-static const GDBusArgInfo _manager_dbus_arg_info_job_removed_path = {-1, "path", "o"};
-static const GDBusArgInfo _manager_dbus_arg_info_job_removed_res = {-1, "res", "s"};
-static const GDBusArgInfo * const _manager_dbus_arg_info_job_removed[] = {&_manager_dbus_arg_info_job_removed_id, &_manager_dbus_arg_info_job_removed_path, &_manager_dbus_arg_info_job_removed_res, NULL};
-static const GDBusSignalInfo _manager_dbus_signal_info_job_removed = {-1, "JobRemoved", (GDBusArgInfo **) (&_manager_dbus_arg_info_job_removed)};
-static const GDBusSignalInfo * const _manager_dbus_signal_info[] = {&_manager_dbus_signal_info_unit_new, &_manager_dbus_signal_info_unit_removed, &_manager_dbus_signal_info_job_new, &_manager_dbus_signal_info_job_removed, NULL};
-static const GDBusPropertyInfo _manager_dbus_property_info_environment = {-1, "Environment", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo * const _manager_dbus_property_info[] = {&_manager_dbus_property_info_environment, NULL};
-static const GDBusInterfaceInfo _manager_dbus_interface_info = {-1, "org.freedesktop.systemd1.Manager", (GDBusMethodInfo **) (&_manager_dbus_method_info), (GDBusSignalInfo **) (&_manager_dbus_signal_info), (GDBusPropertyInfo **) (&_manager_dbus_property_info)};
-static const GDBusInterfaceVTable _manager_dbus_interface_vtable = {manager_dbus_interface_method_call, manager_dbus_interface_get_property, manager_dbus_interface_set_property};
-static const GDBusArgInfo _unit_dbus_arg_info_start_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_start_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_start_in[] = {&_unit_dbus_arg_info_start_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_start_out[] = {&_unit_dbus_arg_info_start_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_start = {-1, "Start", (GDBusArgInfo **) (&_unit_dbus_arg_info_start_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_start_out)};
-static const GDBusArgInfo _unit_dbus_arg_info_stop_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_stop_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_stop_in[] = {&_unit_dbus_arg_info_stop_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_stop_out[] = {&_unit_dbus_arg_info_stop_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_stop = {-1, "Stop", (GDBusArgInfo **) (&_unit_dbus_arg_info_stop_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_stop_out)};
-static const GDBusArgInfo _unit_dbus_arg_info_reload_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_reload_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reload_in[] = {&_unit_dbus_arg_info_reload_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reload_out[] = {&_unit_dbus_arg_info_reload_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_reload = {-1, "Reload", (GDBusArgInfo **) (&_unit_dbus_arg_info_reload_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_reload_out)};
-static const GDBusArgInfo _unit_dbus_arg_info_restart_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_restart_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_restart_in[] = {&_unit_dbus_arg_info_restart_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_restart_out[] = {&_unit_dbus_arg_info_restart_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_restart = {-1, "Restart", (GDBusArgInfo **) (&_unit_dbus_arg_info_restart_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_restart_out)};
-static const GDBusArgInfo _unit_dbus_arg_info_try_restart_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_try_restart_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_try_restart_in[] = {&_unit_dbus_arg_info_try_restart_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_try_restart_out[] = {&_unit_dbus_arg_info_try_restart_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_try_restart = {-1, "TryRestart", (GDBusArgInfo **) (&_unit_dbus_arg_info_try_restart_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_try_restart_out)};
-static const GDBusArgInfo _unit_dbus_arg_info_reload_or_restart_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_reload_or_restart_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reload_or_restart_in[] = {&_unit_dbus_arg_info_reload_or_restart_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reload_or_restart_out[] = {&_unit_dbus_arg_info_reload_or_restart_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_reload_or_restart = {-1, "ReloadOrRestart", (GDBusArgInfo **) (&_unit_dbus_arg_info_reload_or_restart_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_reload_or_restart_out)};
-static const GDBusArgInfo _unit_dbus_arg_info_reload_or_try_restart_mode = {-1, "mode", "s"};
-static const GDBusArgInfo _unit_dbus_arg_info_reload_or_try_restart_result = {-1, "result", "o"};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reload_or_try_restart_in[] = {&_unit_dbus_arg_info_reload_or_try_restart_mode, NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reload_or_try_restart_out[] = {&_unit_dbus_arg_info_reload_or_try_restart_result, NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_reload_or_try_restart = {-1, "ReloadOrTryRestart", (GDBusArgInfo **) (&_unit_dbus_arg_info_reload_or_try_restart_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_reload_or_try_restart_out)};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reset_failed_in[] = {NULL};
-static const GDBusArgInfo * const _unit_dbus_arg_info_reset_failed_out[] = {NULL};
-static const GDBusMethodInfo _unit_dbus_method_info_reset_failed = {-1, "ResetFailed", (GDBusArgInfo **) (&_unit_dbus_arg_info_reset_failed_in), (GDBusArgInfo **) (&_unit_dbus_arg_info_reset_failed_out)};
-static const GDBusMethodInfo * const _unit_dbus_method_info[] = {&_unit_dbus_method_info_start, &_unit_dbus_method_info_stop, &_unit_dbus_method_info_reload, &_unit_dbus_method_info_restart, &_unit_dbus_method_info_try_restart, &_unit_dbus_method_info_reload_or_restart, &_unit_dbus_method_info_reload_or_try_restart, &_unit_dbus_method_info_reset_failed, NULL};
-static const GDBusSignalInfo * const _unit_dbus_signal_info[] = {NULL};
-static const GDBusPropertyInfo _unit_dbus_property_info_id = {-1, "Id", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_names = {-1, "Names", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_following = {-1, "Following", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_requires = {-1, "Requires", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_requires_overridable = {-1, "RequiresOverridable", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_requisite = {-1, "Requisite", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_requisite_overridable = {-1, "RequisiteOverridable", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_wants = {-1, "Wants", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_required_by = {-1, "RequiredBy", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_required_by_overridable = {-1, "RequiredByOverridable", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_wanted_by = {-1, "WantedBy", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_conflicts = {-1, "Conflicts", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_conflicted_by = {-1, "ConflictedBy", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_before = {-1, "Before", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_after = {-1, "After", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_on_failure = {-1, "OnFailure", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_description = {-1, "Description", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_load_state = {-1, "LoadState", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_active_state = {-1, "ActiveState", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_sub_state = {-1, "SubState", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_fragment_path = {-1, "FragmentPath", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_inactive_exit_timestamp = {-1, "InactiveExitTimestamp", "t", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_active_enter_timestamp = {-1, "ActiveEnterTimestamp", "t", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_active_exit_timestamp = {-1, "ActiveExitTimestamp", "t", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_inactive_enter_timestamp = {-1, "InactiveEnterTimestamp", "t", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_can_start = {-1, "CanStart", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_can_stop = {-1, "CanStop", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_can_reload = {-1, "CanReload", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_job = {-1, "Job", "(uo)", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_recursive_stop = {-1, "RecursiveStop", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_stop_when_unneeded = {-1, "StopWhenUnneeded", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_refuse_manual_start = {-1, "RefuseManualStart", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_refuse_manual_stop = {-1, "RefuseManualStop", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_default_dependencies = {-1, "DefaultDependencies", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_default_control_group = {-1, "DefaultControlGroup", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_control_groups = {-1, "ControlGroups", "as", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_need_daemon_reload = {-1, "NeedDaemonReload", "b", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _unit_dbus_property_info_job_timeout_usec = {-1, "JobTimeoutUsec", "t", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo * const _unit_dbus_property_info[] = {&_unit_dbus_property_info_id, &_unit_dbus_property_info_names, &_unit_dbus_property_info_following, &_unit_dbus_property_info_requires, &_unit_dbus_property_info_requires_overridable, &_unit_dbus_property_info_requisite, &_unit_dbus_property_info_requisite_overridable, &_unit_dbus_property_info_wants, &_unit_dbus_property_info_required_by, &_unit_dbus_property_info_required_by_overridable, &_unit_dbus_property_info_wanted_by, &_unit_dbus_property_info_conflicts, &_unit_dbus_property_info_conflicted_by, &_unit_dbus_property_info_before, &_unit_dbus_property_info_after, &_unit_dbus_property_info_on_failure, &_unit_dbus_property_info_description, &_unit_dbus_property_info_load_state, &_unit_dbus_property_info_active_state, &_unit_dbus_property_info_sub_state, &_unit_dbus_property_info_fragment_path, &_unit_dbus_property_info_inactive_exit_timestamp, &_unit_dbus_property_info_active_enter_timestamp, &_unit_dbus_property_info_active_exit_timestamp, &_unit_dbus_property_info_inactive_enter_timestamp, &_unit_dbus_property_info_can_start, &_unit_dbus_property_info_can_stop, &_unit_dbus_property_info_can_reload, &_unit_dbus_property_info_job, &_unit_dbus_property_info_recursive_stop, &_unit_dbus_property_info_stop_when_unneeded, &_unit_dbus_property_info_refuse_manual_start, &_unit_dbus_property_info_refuse_manual_stop, &_unit_dbus_property_info_default_dependencies, &_unit_dbus_property_info_default_control_group, &_unit_dbus_property_info_control_groups, &_unit_dbus_property_info_need_daemon_reload, &_unit_dbus_property_info_job_timeout_usec, NULL};
-static const GDBusInterfaceInfo _unit_dbus_interface_info = {-1, "org.freedesktop.systemd1.Unit", (GDBusMethodInfo **) (&_unit_dbus_method_info), (GDBusSignalInfo **) (&_unit_dbus_signal_info), (GDBusPropertyInfo **) (&_unit_dbus_property_info)};
-static const GDBusInterfaceVTable _unit_dbus_interface_vtable = {unit_dbus_interface_method_call, unit_dbus_interface_get_property, unit_dbus_interface_set_property};
-static const GDBusArgInfo * const _job_dbus_arg_info_cancel_in[] = {NULL};
-static const GDBusArgInfo * const _job_dbus_arg_info_cancel_out[] = {NULL};
-static const GDBusMethodInfo _job_dbus_method_info_cancel = {-1, "Cancel", (GDBusArgInfo **) (&_job_dbus_arg_info_cancel_in), (GDBusArgInfo **) (&_job_dbus_arg_info_cancel_out)};
-static const GDBusMethodInfo * const _job_dbus_method_info[] = {&_job_dbus_method_info_cancel, NULL};
-static const GDBusSignalInfo * const _job_dbus_signal_info[] = {NULL};
-static const GDBusPropertyInfo _job_dbus_property_info_id = {-1, "Id", "u", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _job_dbus_property_info_state = {-1, "State", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _job_dbus_property_info_job_type = {-1, "JobType", "s", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo _job_dbus_property_info_unit = {-1, "Unit", "(so)", G_DBUS_PROPERTY_INFO_FLAGS_READABLE};
-static const GDBusPropertyInfo * const _job_dbus_property_info[] = {&_job_dbus_property_info_id, &_job_dbus_property_info_state, &_job_dbus_property_info_job_type, &_job_dbus_property_info_unit, NULL};
-static const GDBusInterfaceInfo _job_dbus_interface_info = {-1, "org.freedesktop.systemd1.Job", (GDBusMethodInfo **) (&_job_dbus_method_info), (GDBusSignalInfo **) (&_job_dbus_signal_info), (GDBusPropertyInfo **) (&_job_dbus_property_info)};
-static const GDBusInterfaceVTable _job_dbus_interface_vtable = {job_dbus_interface_method_call, job_dbus_interface_get_property, job_dbus_interface_set_property};
-static const GDBusArgInfo _properties_dbus_arg_info_get_iface = {-1, "iface", "s"};
-static const GDBusArgInfo _properties_dbus_arg_info_get_property = {-1, "property", "s"};
-static const GDBusArgInfo _properties_dbus_arg_info_get_result = {-1, "result", "v"};
-static const GDBusArgInfo * const _properties_dbus_arg_info_get_in[] = {&_properties_dbus_arg_info_get_iface, &_properties_dbus_arg_info_get_property, NULL};
-static const GDBusArgInfo * const _properties_dbus_arg_info_get_out[] = {&_properties_dbus_arg_info_get_result, NULL};
-static const GDBusMethodInfo _properties_dbus_method_info_get = {-1, "Get", (GDBusArgInfo **) (&_properties_dbus_arg_info_get_in), (GDBusArgInfo **) (&_properties_dbus_arg_info_get_out)};
-static const GDBusMethodInfo * const _properties_dbus_method_info[] = {&_properties_dbus_method_info_get, NULL};
-static const GDBusArgInfo _properties_dbus_arg_info_properties_changed_iface = {-1, "iface", "s"};
-static const GDBusArgInfo _properties_dbus_arg_info_properties_changed_changed_properties = {-1, "changed_properties", "a{sv}"};
-static const GDBusArgInfo _properties_dbus_arg_info_properties_changed_invalidated_properties = {-1, "invalidated_properties", "as"};
-static const GDBusArgInfo * const _properties_dbus_arg_info_properties_changed[] = {&_properties_dbus_arg_info_properties_changed_iface, &_properties_dbus_arg_info_properties_changed_changed_properties, &_properties_dbus_arg_info_properties_changed_invalidated_properties, NULL};
-static const GDBusSignalInfo _properties_dbus_signal_info_properties_changed = {-1, "PropertiesChanged", (GDBusArgInfo **) (&_properties_dbus_arg_info_properties_changed)};
-static const GDBusSignalInfo * const _properties_dbus_signal_info[] = {&_properties_dbus_signal_info_properties_changed, NULL};
-static const GDBusPropertyInfo * const _properties_dbus_property_info[] = {NULL};
-static const GDBusInterfaceInfo _properties_dbus_interface_info = {-1, "org.freedesktop.Properties", (GDBusMethodInfo **) (&_properties_dbus_method_info), (GDBusSignalInfo **) (&_properties_dbus_signal_info), (GDBusPropertyInfo **) (&_properties_dbus_property_info)};
-static const GDBusInterfaceVTable _properties_dbus_interface_vtable = {properties_dbus_interface_method_call, properties_dbus_interface_get_property, properties_dbus_interface_set_property};
-
-ManagerUnitInfo* manager_list_units (Manager* self, int* result_length1, GError** error) {
-#line 47 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 47 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->list_units (self, result_length1, error);
-#line 785 "systemd-interfaces.c"
-}
-
-
-ManagerJobInfo* manager_list_jobs (Manager* self, int* result_length1, GError** error) {
-#line 48 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 48 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->list_jobs (self, result_length1, error);
-#line 794 "systemd-interfaces.c"
-}
-
-
-char* manager_get_unit (Manager* self, const gchar* name, GError** error) {
-#line 50 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 50 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->get_unit (self, name, error);
-#line 803 "systemd-interfaces.c"
-}
-
-
-char* manager_get_unit_by_pid (Manager* self, guint32 pid, GError** error) {
-#line 51 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 51 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->get_unit_by_pid (self, pid, error);
-#line 812 "systemd-interfaces.c"
-}
-
-
-char* manager_load_unit (Manager* self, const gchar* name, GError** error) {
-#line 52 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 52 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->load_unit (self, name, error);
-#line 821 "systemd-interfaces.c"
-}
-
-
-char* manager_get_job (Manager* self, guint32 id, GError** error) {
-#line 53 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 53 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->get_job (self, id, error);
-#line 830 "systemd-interfaces.c"
-}
-
-
-char* manager_start_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 55 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 55 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->start_unit (self, name, mode, error);
-#line 839 "systemd-interfaces.c"
-}
-
-
-char* manager_stop_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 56 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 56 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->stop_unit (self, name, mode, error);
-#line 848 "systemd-interfaces.c"
-}
-
-
-char* manager_reload_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 57 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 57 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->reload_unit (self, name, mode, error);
-#line 857 "systemd-interfaces.c"
-}
-
-
-char* manager_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 58 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 58 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->restart_unit (self, name, mode, error);
-#line 866 "systemd-interfaces.c"
-}
-
-
-char* manager_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 59 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 59 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->try_restart_unit (self, name, mode, error);
-#line 875 "systemd-interfaces.c"
-}
-
-
-char* manager_reload_or_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 60 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 60 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->reload_or_restart_unit (self, name, mode, error);
-#line 884 "systemd-interfaces.c"
-}
-
-
-char* manager_reload_or_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-#line 61 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 61 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->reload_or_try_restart_unit (self, name, mode, error);
-#line 893 "systemd-interfaces.c"
-}
-
-
-void manager_reset_failed_unit (Manager* self, const gchar* name, GError** error) {
-#line 63 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 63 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->reset_failed_unit (self, name, error);
-#line 902 "systemd-interfaces.c"
-}
-
-
-void manager_clear_jobs (Manager* self, GError** error) {
-#line 65 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 65 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->clear_jobs (self, error);
-#line 911 "systemd-interfaces.c"
-}
-
-
-void manager_subscribe (Manager* self, GError** error) {
-#line 67 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 67 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->subscribe (self, error);
-#line 920 "systemd-interfaces.c"
-}
-
-
-void manager_unsubscribe (Manager* self, GError** error) {
-#line 68 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 68 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->unsubscribe (self, error);
-#line 929 "systemd-interfaces.c"
-}
-
-
-gchar* manager_dump (Manager* self, GError** error) {
-#line 70 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 70 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->dump (self, error);
-#line 938 "systemd-interfaces.c"
-}
-
-
-void manager_reload (Manager* self, GError** error) {
-#line 72 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 72 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->reload (self, error);
-#line 947 "systemd-interfaces.c"
-}
-
-
-void manager_reexecute (Manager* self, GError** error) {
-#line 73 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 73 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->reexecute (self, error);
-#line 956 "systemd-interfaces.c"
-}
-
-
-void manager_exit (Manager* self, GError** error) {
-#line 74 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 74 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->exit (self, error);
-#line 965 "systemd-interfaces.c"
-}
-
-
-void manager_halt (Manager* self, GError** error) {
-#line 75 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 75 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->halt (self, error);
-#line 974 "systemd-interfaces.c"
-}
-
-
-void manager_power_off (Manager* self, GError** error) {
-#line 76 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 76 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->power_off (self, error);
-#line 983 "systemd-interfaces.c"
-}
-
-
-void manager_reboot (Manager* self, GError** error) {
-#line 77 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 77 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->reboot (self, error);
-#line 992 "systemd-interfaces.c"
-}
-
-
-void manager_kexec (Manager* self, GError** error) {
-#line 78 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 78 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->kexec (self, error);
-#line 1001 "systemd-interfaces.c"
-}
-
-
-char* manager_create_snapshot (Manager* self, const gchar* name, gboolean cleanup, GError** error) {
-#line 80 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 80 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->create_snapshot (self, name, cleanup, error);
-#line 1010 "systemd-interfaces.c"
-}
-
-
-void manager_set_environment (Manager* self, gchar** names, int names_length1, GError** error) {
-#line 82 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 82 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->set_environment (self, names, names_length1, error);
-#line 1019 "systemd-interfaces.c"
-}
-
-
-void manager_unset_environment (Manager* self, gchar** names, int names_length1, GError** error) {
-#line 83 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 83 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       MANAGER_GET_INTERFACE (self)->unset_environment (self, names, names_length1, error);
-#line 1028 "systemd-interfaces.c"
-}
-
-
-gchar** manager_get_environment (Manager* self, int* result_length1) {
-#line 45 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 45 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return MANAGER_GET_INTERFACE (self)->get_environment (self, result_length1);
-#line 1037 "systemd-interfaces.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-       typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer data2);
-       register GMarshalFunc_VOID__STRING_STRING callback;
-       register GCClosure * cc;
-       register gpointer data1;
-       register gpointer data2;
-       cc = (GCClosure *) closure;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (n_param_values == 3);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = closure->data;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = param_values->data[0].v_pointer;
-#line 1056 "systemd-interfaces.c"
-       } else {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = param_values->data[0].v_pointer;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = closure->data;
-#line 1062 "systemd-interfaces.c"
-       }
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 1068 "systemd-interfaces.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__UINT_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-       typedef void (*GMarshalFunc_VOID__UINT_STRING) (gpointer data1, guint32 arg_1, gpointer arg_2, gpointer data2);
-       register GMarshalFunc_VOID__UINT_STRING callback;
-       register GCClosure * cc;
-       register gpointer data1;
-       register gpointer data2;
-       cc = (GCClosure *) closure;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (n_param_values == 3);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = closure->data;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = param_values->data[0].v_pointer;
-#line 1087 "systemd-interfaces.c"
-       } else {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = param_values->data[0].v_pointer;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = closure->data;
-#line 1093 "systemd-interfaces.c"
-       }
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback = (GMarshalFunc_VOID__UINT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback (data1, g_value_get_uint (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 1099 "systemd-interfaces.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__UINT_STRING_STRING (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-       typedef void (*GMarshalFunc_VOID__UINT_STRING_STRING) (gpointer data1, guint32 arg_1, gpointer arg_2, const char* arg_3, gpointer data2);
-       register GMarshalFunc_VOID__UINT_STRING_STRING callback;
-       register GCClosure * cc;
-       register gpointer data1;
-       register gpointer data2;
-       cc = (GCClosure *) closure;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (n_param_values == 4);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = closure->data;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = param_values->data[0].v_pointer;
-#line 1118 "systemd-interfaces.c"
-       } else {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = param_values->data[0].v_pointer;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = closure->data;
-#line 1124 "systemd-interfaces.c"
-       }
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback = (GMarshalFunc_VOID__UINT_STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback (data1, g_value_get_uint (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), data2);
-#line 1130 "systemd-interfaces.c"
-}
-
-
-void manager_unit_info_copy (const ManagerUnitInfo* self, ManagerUnitInfo* dest) {
-       const gchar* _tmp0_;
-       gchar* _tmp1_;
-       const gchar* _tmp2_;
-       gchar* _tmp3_;
-       const gchar* _tmp4_;
-       gchar* _tmp5_;
-       const gchar* _tmp6_;
-       gchar* _tmp7_;
-       const gchar* _tmp8_;
-       gchar* _tmp9_;
-       const gchar* _tmp10_;
-       gchar* _tmp11_;
-       const char* _tmp12_;
-       char* _tmp13_;
-       guint32 _tmp14_;
-       const gchar* _tmp15_;
-       gchar* _tmp16_;
-       const char* _tmp17_;
-       char* _tmp18_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp0_ = (*self).id;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp1_ = g_strdup (_tmp0_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).id);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).id = _tmp1_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp2_ = (*self).description;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp3_ = g_strdup (_tmp2_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).description);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).description = _tmp3_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp4_ = (*self).load_state;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp5_ = g_strdup (_tmp4_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).load_state);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).load_state = _tmp5_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp6_ = (*self).active_state;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp7_ = g_strdup (_tmp6_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).active_state);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).active_state = _tmp7_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp8_ = (*self).sub_state;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp9_ = g_strdup (_tmp8_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).sub_state);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).sub_state = _tmp9_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp10_ = (*self).following;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp11_ = g_strdup (_tmp10_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).following);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).following = _tmp11_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp12_ = (*self).unit_path;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp13_ = g_strdup (_tmp12_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).unit_path);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).unit_path = _tmp13_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp14_ = (*self).job_id;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).job_id = _tmp14_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp15_ = (*self).job_type;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp16_ = g_strdup (_tmp15_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).job_type);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).job_type = _tmp16_;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp17_ = (*self).job_path;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp18_ = g_strdup (_tmp17_);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).job_path);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).job_path = _tmp18_;
-#line 1230 "systemd-interfaces.c"
-}
-
-
-void manager_unit_info_destroy (ManagerUnitInfo* self) {
-#line 24 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).id);
-#line 25 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).description);
-#line 26 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).load_state);
-#line 27 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).active_state);
-#line 28 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).sub_state);
-#line 29 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).following);
-#line 30 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).unit_path);
-#line 32 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).job_type);
-#line 33 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).job_path);
-#line 1253 "systemd-interfaces.c"
-}
-
-
-ManagerUnitInfo* manager_unit_info_dup (const ManagerUnitInfo* self) {
-       ManagerUnitInfo* dup;
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       dup = g_new0 (ManagerUnitInfo, 1);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       manager_unit_info_copy (self, dup);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return dup;
-#line 1265 "systemd-interfaces.c"
-}
-
-
-void manager_unit_info_free (ManagerUnitInfo* self) {
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       manager_unit_info_destroy (self);
-#line 23 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_free (self);
-#line 1274 "systemd-interfaces.c"
-}
-
-
-GType manager_unit_info_get_type (void) {
-       static volatile gsize manager_unit_info_type_id__volatile = 0;
-       if (g_once_init_enter (&manager_unit_info_type_id__volatile)) {
-               GType manager_unit_info_type_id;
-               manager_unit_info_type_id = g_boxed_type_register_static ("ManagerUnitInfo", (GBoxedCopyFunc) manager_unit_info_dup, (GBoxedFreeFunc) manager_unit_info_free);
-               g_once_init_leave (&manager_unit_info_type_id__volatile, manager_unit_info_type_id);
-       }
-       return manager_unit_info_type_id__volatile;
-}
-
-
-void manager_job_info_copy (const ManagerJobInfo* self, ManagerJobInfo* dest) {
-       guint32 _tmp0_;
-       const gchar* _tmp1_;
-       gchar* _tmp2_;
-       const gchar* _tmp3_;
-       gchar* _tmp4_;
-       const gchar* _tmp5_;
-       gchar* _tmp6_;
-       const char* _tmp7_;
-       char* _tmp8_;
-       const char* _tmp9_;
-       char* _tmp10_;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp0_ = (*self).id;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).id = _tmp0_;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp1_ = (*self).name;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp2_ = g_strdup (_tmp1_);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).name);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).name = _tmp2_;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp3_ = (*self).type;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp4_ = g_strdup (_tmp3_);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).type);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).type = _tmp4_;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp5_ = (*self).state;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp6_ = g_strdup (_tmp5_);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).state);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).state = _tmp6_;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp7_ = (*self).job_path;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp8_ = g_strdup (_tmp7_);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).job_path);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).job_path = _tmp8_;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp9_ = (*self).unit_path;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp10_ = g_strdup (_tmp9_);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).unit_path);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).unit_path = _tmp10_;
-#line 1345 "systemd-interfaces.c"
-}
-
-
-void manager_job_info_destroy (ManagerJobInfo* self) {
-#line 38 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).name);
-#line 39 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).type);
-#line 40 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).state);
-#line 41 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).job_path);
-#line 42 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).unit_path);
-#line 1360 "systemd-interfaces.c"
-}
-
-
-ManagerJobInfo* manager_job_info_dup (const ManagerJobInfo* self) {
-       ManagerJobInfo* dup;
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       dup = g_new0 (ManagerJobInfo, 1);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       manager_job_info_copy (self, dup);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return dup;
-#line 1372 "systemd-interfaces.c"
-}
-
-
-void manager_job_info_free (ManagerJobInfo* self) {
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       manager_job_info_destroy (self);
-#line 36 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_free (self);
-#line 1381 "systemd-interfaces.c"
-}
-
-
-GType manager_job_info_get_type (void) {
-       static volatile gsize manager_job_info_type_id__volatile = 0;
-       if (g_once_init_enter (&manager_job_info_type_id__volatile)) {
-               GType manager_job_info_type_id;
-               manager_job_info_type_id = g_boxed_type_register_static ("ManagerJobInfo", (GBoxedCopyFunc) manager_job_info_dup, (GBoxedFreeFunc) manager_job_info_free);
-               g_once_init_leave (&manager_job_info_type_id__volatile, manager_job_info_type_id);
-       }
-       return manager_job_info_type_id__volatile;
-}
-
-
-static void manager_base_init (ManagerIface * iface) {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       static gboolean initialized = FALSE;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (!initialized) {
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               initialized = TRUE;
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               g_signal_new ("unit_new", TYPE_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               g_signal_new ("unit_removed", TYPE_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               g_signal_new ("job_new", TYPE_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_STRING, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
-#line 21 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               g_signal_new ("job_removed", TYPE_MANAGER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__UINT_STRING_STRING, G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING);
-#line 1411 "systemd-interfaces.c"
-       }
-}
-
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-GType manager_get_type (void) {
-       static volatile gsize manager_type_id__volatile = 0;
-       if (g_once_init_enter (&manager_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (ManagerIface), (GBaseInitFunc) manager_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
-               GType manager_type_id;
-               manager_type_id = g_type_register_static (G_TYPE_INTERFACE, "Manager", &g_define_type_info, 0);
-               g_type_interface_add_prerequisite (manager_type_id, G_TYPE_DBUS_PROXY);
-               g_type_set_qdata (manager_type_id, g_quark_from_static_string ("vala-dbus-proxy-type"), (void*) manager_proxy_get_type);
-               g_type_set_qdata (manager_type_id, g_quark_from_static_string ("vala-dbus-interface-name"), "org.freedesktop.systemd1.Manager");
-               g_type_set_qdata (manager_type_id, g_quark_from_static_string ("vala-dbus-register-object"), (void*) manager_register_object);
-               g_once_init_leave (&manager_type_id__volatile, manager_type_id);
-       }
-       return manager_type_id__volatile;
-}
-
-
-G_DEFINE_TYPE_EXTENDED (ManagerProxy, manager_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_MANAGER, manager_proxy_manager_interface_init) )
-static void manager_proxy_class_init (ManagerProxyClass* klass) {
-       G_DBUS_PROXY_CLASS (klass)->g_signal = manager_proxy_g_signal;
-}
-
-
-static void _dbus_handle_manager_unit_new (Manager* self, GVariant* parameters) {
-       GVariantIter _arguments_iter;
-       gchar* id = NULL;
-       GVariant* _tmp0_;
-       char* path = NULL;
-       GVariant* _tmp1_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp0_ = g_variant_iter_next_value (&_arguments_iter);
-       id = g_variant_dup_string (_tmp0_, NULL);
-       g_variant_unref (_tmp0_);
-       _tmp1_ = g_variant_iter_next_value (&_arguments_iter);
-       path = g_variant_dup_string (_tmp1_, NULL);
-       g_variant_unref (_tmp1_);
-       g_signal_emit_by_name (self, "unit-new", id, path);
-       _g_free0 (id);
-       _g_free0 (path);
-}
-
-
-static void _dbus_handle_manager_unit_removed (Manager* self, GVariant* parameters) {
-       GVariantIter _arguments_iter;
-       gchar* id = NULL;
-       GVariant* _tmp2_;
-       char* path = NULL;
-       GVariant* _tmp3_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp2_ = g_variant_iter_next_value (&_arguments_iter);
-       id = g_variant_dup_string (_tmp2_, NULL);
-       g_variant_unref (_tmp2_);
-       _tmp3_ = g_variant_iter_next_value (&_arguments_iter);
-       path = g_variant_dup_string (_tmp3_, NULL);
-       g_variant_unref (_tmp3_);
-       g_signal_emit_by_name (self, "unit-removed", id, path);
-       _g_free0 (id);
-       _g_free0 (path);
-}
-
-
-static void _dbus_handle_manager_job_new (Manager* self, GVariant* parameters) {
-       GVariantIter _arguments_iter;
-       guint32 id = 0U;
-       GVariant* _tmp4_;
-       char* path = NULL;
-       GVariant* _tmp5_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp4_ = g_variant_iter_next_value (&_arguments_iter);
-       id = g_variant_get_uint32 (_tmp4_);
-       g_variant_unref (_tmp4_);
-       _tmp5_ = g_variant_iter_next_value (&_arguments_iter);
-       path = g_variant_dup_string (_tmp5_, NULL);
-       g_variant_unref (_tmp5_);
-       g_signal_emit_by_name (self, "job-new", id, path);
-       _g_free0 (path);
-}
-
-
-static void _dbus_handle_manager_job_removed (Manager* self, GVariant* parameters) {
-       GVariantIter _arguments_iter;
-       guint32 id = 0U;
-       GVariant* _tmp6_;
-       char* path = NULL;
-       GVariant* _tmp7_;
-       gchar* res = NULL;
-       GVariant* _tmp8_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
-       id = g_variant_get_uint32 (_tmp6_);
-       g_variant_unref (_tmp6_);
-       _tmp7_ = g_variant_iter_next_value (&_arguments_iter);
-       path = g_variant_dup_string (_tmp7_, NULL);
-       g_variant_unref (_tmp7_);
-       _tmp8_ = g_variant_iter_next_value (&_arguments_iter);
-       res = g_variant_dup_string (_tmp8_, NULL);
-       g_variant_unref (_tmp8_);
-       g_signal_emit_by_name (self, "job-removed", id, path, res);
-       _g_free0 (path);
-       _g_free0 (res);
-}
-
-
-static void manager_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
-       if (strcmp (signal_name, "UnitNew") == 0) {
-               _dbus_handle_manager_unit_new ((Manager*) proxy, parameters);
-       } else if (strcmp (signal_name, "UnitRemoved") == 0) {
-               _dbus_handle_manager_unit_removed ((Manager*) proxy, parameters);
-       } else if (strcmp (signal_name, "JobNew") == 0) {
-               _dbus_handle_manager_job_new ((Manager*) proxy, parameters);
-       } else if (strcmp (signal_name, "JobRemoved") == 0) {
-               _dbus_handle_manager_job_removed ((Manager*) proxy, parameters);
-       }
-}
-
-
-static void manager_proxy_init (ManagerProxy* self) {
-}
-
-
-static ManagerUnitInfo* manager_proxy_list_units (Manager* self, int* result_length1, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       ManagerUnitInfo* _result;
-       int _result_length1;
-       GVariant* _tmp9_;
-       ManagerUnitInfo* _tmp10_;
-       int _tmp10__length;
-       int _tmp10__size;
-       int _tmp10__length1;
-       GVariantIter _tmp11_;
-       GVariant* _tmp12_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ListUnits");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _result_length1 = 0;
-       _tmp9_ = g_variant_iter_next_value (&_reply_iter);
-       _tmp10_ = g_new (ManagerUnitInfo, 5);
-       _tmp10__length = 0;
-       _tmp10__size = 4;
-       _tmp10__length1 = 0;
-       g_variant_iter_init (&_tmp11_, _tmp9_);
-       for (; (_tmp12_ = g_variant_iter_next_value (&_tmp11_)) != NULL; _tmp10__length1++) {
-               ManagerUnitInfo _tmp13_;
-               GVariantIter _tmp14_;
-               GVariant* _tmp15_;
-               GVariant* _tmp16_;
-               GVariant* _tmp17_;
-               GVariant* _tmp18_;
-               GVariant* _tmp19_;
-               GVariant* _tmp20_;
-               GVariant* _tmp21_;
-               GVariant* _tmp22_;
-               GVariant* _tmp23_;
-               GVariant* _tmp24_;
-               if (_tmp10__size == _tmp10__length) {
-                       _tmp10__size = 2 * _tmp10__size;
-                       _tmp10_ = g_renew (ManagerUnitInfo, _tmp10_, _tmp10__size + 1);
-               }
-               g_variant_iter_init (&_tmp14_, _tmp12_);
-               _tmp15_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.id = g_variant_dup_string (_tmp15_, NULL);
-               g_variant_unref (_tmp15_);
-               _tmp16_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.description = g_variant_dup_string (_tmp16_, NULL);
-               g_variant_unref (_tmp16_);
-               _tmp17_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.load_state = g_variant_dup_string (_tmp17_, NULL);
-               g_variant_unref (_tmp17_);
-               _tmp18_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.active_state = g_variant_dup_string (_tmp18_, NULL);
-               g_variant_unref (_tmp18_);
-               _tmp19_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.sub_state = g_variant_dup_string (_tmp19_, NULL);
-               g_variant_unref (_tmp19_);
-               _tmp20_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.following = g_variant_dup_string (_tmp20_, NULL);
-               g_variant_unref (_tmp20_);
-               _tmp21_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.unit_path = g_variant_dup_string (_tmp21_, NULL);
-               g_variant_unref (_tmp21_);
-               _tmp22_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.job_id = g_variant_get_uint32 (_tmp22_);
-               g_variant_unref (_tmp22_);
-               _tmp23_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.job_type = g_variant_dup_string (_tmp23_, NULL);
-               g_variant_unref (_tmp23_);
-               _tmp24_ = g_variant_iter_next_value (&_tmp14_);
-               _tmp13_.job_path = g_variant_dup_string (_tmp24_, NULL);
-               g_variant_unref (_tmp24_);
-               _tmp10_[_tmp10__length++] = _tmp13_;
-               g_variant_unref (_tmp12_);
-       }
-       _result_length1 = _tmp10__length1;
-       _result = _tmp10_;
-       g_variant_unref (_tmp9_);
-       *result_length1 = _result_length1;
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static ManagerJobInfo* manager_proxy_list_jobs (Manager* self, int* result_length1, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       ManagerJobInfo* _result;
-       int _result_length1;
-       GVariant* _tmp25_;
-       ManagerJobInfo* _tmp26_;
-       int _tmp26__length;
-       int _tmp26__size;
-       int _tmp26__length1;
-       GVariantIter _tmp27_;
-       GVariant* _tmp28_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ListJobs");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _result_length1 = 0;
-       _tmp25_ = g_variant_iter_next_value (&_reply_iter);
-       _tmp26_ = g_new (ManagerJobInfo, 5);
-       _tmp26__length = 0;
-       _tmp26__size = 4;
-       _tmp26__length1 = 0;
-       g_variant_iter_init (&_tmp27_, _tmp25_);
-       for (; (_tmp28_ = g_variant_iter_next_value (&_tmp27_)) != NULL; _tmp26__length1++) {
-               ManagerJobInfo _tmp29_;
-               GVariantIter _tmp30_;
-               GVariant* _tmp31_;
-               GVariant* _tmp32_;
-               GVariant* _tmp33_;
-               GVariant* _tmp34_;
-               GVariant* _tmp35_;
-               GVariant* _tmp36_;
-               if (_tmp26__size == _tmp26__length) {
-                       _tmp26__size = 2 * _tmp26__size;
-                       _tmp26_ = g_renew (ManagerJobInfo, _tmp26_, _tmp26__size + 1);
-               }
-               g_variant_iter_init (&_tmp30_, _tmp28_);
-               _tmp31_ = g_variant_iter_next_value (&_tmp30_);
-               _tmp29_.id = g_variant_get_uint32 (_tmp31_);
-               g_variant_unref (_tmp31_);
-               _tmp32_ = g_variant_iter_next_value (&_tmp30_);
-               _tmp29_.name = g_variant_dup_string (_tmp32_, NULL);
-               g_variant_unref (_tmp32_);
-               _tmp33_ = g_variant_iter_next_value (&_tmp30_);
-               _tmp29_.type = g_variant_dup_string (_tmp33_, NULL);
-               g_variant_unref (_tmp33_);
-               _tmp34_ = g_variant_iter_next_value (&_tmp30_);
-               _tmp29_.state = g_variant_dup_string (_tmp34_, NULL);
-               g_variant_unref (_tmp34_);
-               _tmp35_ = g_variant_iter_next_value (&_tmp30_);
-               _tmp29_.job_path = g_variant_dup_string (_tmp35_, NULL);
-               g_variant_unref (_tmp35_);
-               _tmp36_ = g_variant_iter_next_value (&_tmp30_);
-               _tmp29_.unit_path = g_variant_dup_string (_tmp36_, NULL);
-               g_variant_unref (_tmp36_);
-               _tmp26_[_tmp26__length++] = _tmp29_;
-               g_variant_unref (_tmp28_);
-       }
-       _result_length1 = _tmp26__length1;
-       _result = _tmp26_;
-       g_variant_unref (_tmp25_);
-       *result_length1 = _result_length1;
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_get_unit (Manager* self, const gchar* name, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp37_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "GetUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp37_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp37_, NULL);
-       g_variant_unref (_tmp37_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_get_unit_by_pid (Manager* self, guint32 pid, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp38_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "GetUnitByPid");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_uint32 (pid));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp38_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp38_, NULL);
-       g_variant_unref (_tmp38_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_load_unit (Manager* self, const gchar* name, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp39_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "LoadUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp39_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp39_, NULL);
-       g_variant_unref (_tmp39_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_get_job (Manager* self, guint32 id, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp40_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "GetJob");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_uint32 (id));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp40_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp40_, NULL);
-       g_variant_unref (_tmp40_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_start_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp41_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "StartUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp41_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp41_, NULL);
-       g_variant_unref (_tmp41_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_stop_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp42_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "StopUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp42_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp42_, NULL);
-       g_variant_unref (_tmp42_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_reload_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp43_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ReloadUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp43_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp43_, NULL);
-       g_variant_unref (_tmp43_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp44_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "RestartUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp44_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp44_, NULL);
-       g_variant_unref (_tmp44_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp45_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "TryRestartUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp45_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp45_, NULL);
-       g_variant_unref (_tmp45_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_reload_or_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp46_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ReloadOrRestartUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp46_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp46_, NULL);
-       g_variant_unref (_tmp46_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* manager_proxy_reload_or_try_restart_unit (Manager* self, const gchar* name, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp47_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ReloadOrTryRestartUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp47_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp47_, NULL);
-       g_variant_unref (_tmp47_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static void manager_proxy_reset_failed_unit (Manager* self, const gchar* name, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ResetFailedUnit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_clear_jobs (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "ClearJobs");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_subscribe (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Subscribe");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_unsubscribe (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Unsubscribe");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static gchar* manager_proxy_dump (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       gchar* _result;
-       GVariant* _tmp48_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Dump");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp48_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp48_, NULL);
-       g_variant_unref (_tmp48_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static void manager_proxy_reload (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Reload");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_reexecute (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Reexecute");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_exit (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Exit");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_halt (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Halt");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_power_off (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "PowerOff");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_reboot (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Reboot");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_kexec (Manager* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "Kexec");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static char* manager_proxy_create_snapshot (Manager* self, const gchar* name, gboolean cleanup, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp49_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "CreateSnapshot");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (name));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_boolean (cleanup));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp49_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp49_, NULL);
-       g_variant_unref (_tmp49_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static void manager_proxy_set_environment (Manager* self, gchar** names, int names_length1, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       gchar** _tmp50_;
-       GVariantBuilder _tmp51_;
-       int _tmp52_;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "SetEnvironment");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _tmp50_ = names;
-       g_variant_builder_init (&_tmp51_, G_VARIANT_TYPE ("as"));
-       for (_tmp52_ = 0; _tmp52_ < names_length1; _tmp52_++) {
-               g_variant_builder_add_value (&_tmp51_, g_variant_new_string (*_tmp50_));
-               _tmp50_++;
-       }
-       g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp51_));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_proxy_unset_environment (Manager* self, gchar** names, int names_length1, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       gchar** _tmp53_;
-       GVariantBuilder _tmp54_;
-       int _tmp55_;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Manager", "UnsetEnvironment");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _tmp53_ = names;
-       g_variant_builder_init (&_tmp54_, G_VARIANT_TYPE ("as"));
-       for (_tmp55_ = 0; _tmp55_ < names_length1; _tmp55_++) {
-               g_variant_builder_add_value (&_tmp54_, g_variant_new_string (*_tmp53_));
-               _tmp53_++;
-       }
-       g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp54_));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static gchar** manager_dbus_proxy_get_environment (Manager* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp56_;
-       int _tmp56__length;
-       int _tmp56__size;
-       int _tmp56__length1;
-       GVariantIter _tmp57_;
-       GVariant* _tmp58_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Environment");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Manager"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Environment"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp56_ = g_new (gchar*, 5);
-       _tmp56__length = 0;
-       _tmp56__size = 4;
-       _tmp56__length1 = 0;
-       g_variant_iter_init (&_tmp57_, _inner_reply);
-       for (; (_tmp58_ = g_variant_iter_next_value (&_tmp57_)) != NULL; _tmp56__length1++) {
-               if (_tmp56__size == _tmp56__length) {
-                       _tmp56__size = 2 * _tmp56__size;
-                       _tmp56_ = g_renew (gchar*, _tmp56_, _tmp56__size + 1);
-               }
-               _tmp56_[_tmp56__length++] = g_variant_dup_string (_tmp58_, NULL);
-               g_variant_unref (_tmp58_);
-       }
-       _result_length1 = _tmp56__length1;
-       _tmp56_[_tmp56__length] = NULL;
-       _result = _tmp56_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static void manager_proxy_manager_interface_init (ManagerIface* iface) {
-       iface->list_units = manager_proxy_list_units;
-       iface->list_jobs = manager_proxy_list_jobs;
-       iface->get_unit = manager_proxy_get_unit;
-       iface->get_unit_by_pid = manager_proxy_get_unit_by_pid;
-       iface->load_unit = manager_proxy_load_unit;
-       iface->get_job = manager_proxy_get_job;
-       iface->start_unit = manager_proxy_start_unit;
-       iface->stop_unit = manager_proxy_stop_unit;
-       iface->reload_unit = manager_proxy_reload_unit;
-       iface->restart_unit = manager_proxy_restart_unit;
-       iface->try_restart_unit = manager_proxy_try_restart_unit;
-       iface->reload_or_restart_unit = manager_proxy_reload_or_restart_unit;
-       iface->reload_or_try_restart_unit = manager_proxy_reload_or_try_restart_unit;
-       iface->reset_failed_unit = manager_proxy_reset_failed_unit;
-       iface->clear_jobs = manager_proxy_clear_jobs;
-       iface->subscribe = manager_proxy_subscribe;
-       iface->unsubscribe = manager_proxy_unsubscribe;
-       iface->dump = manager_proxy_dump;
-       iface->reload = manager_proxy_reload;
-       iface->reexecute = manager_proxy_reexecute;
-       iface->exit = manager_proxy_exit;
-       iface->halt = manager_proxy_halt;
-       iface->power_off = manager_proxy_power_off;
-       iface->reboot = manager_proxy_reboot;
-       iface->kexec = manager_proxy_kexec;
-       iface->create_snapshot = manager_proxy_create_snapshot;
-       iface->set_environment = manager_proxy_set_environment;
-       iface->unset_environment = manager_proxy_unset_environment;
-       iface->get_environment = manager_dbus_proxy_get_environment;
-}
-
-
-static void _vala_ManagerUnitInfo_array_free (ManagerUnitInfo* array, gint array_length) {
-       if (array != NULL) {
-               int i;
-               for (i = 0; i < array_length; i = i + 1) {
-                       manager_unit_info_destroy (&array[i]);
-               }
-       }
-       g_free (array);
-}
-
-
-static void _dbus_manager_list_units (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       ManagerUnitInfo* result;
-       int result_length1 = 0;
-       ManagerUnitInfo* _tmp59_;
-       GVariantBuilder _tmp60_;
-       int _tmp61_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       result = manager_list_units (self, &result_length1, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _tmp59_ = result;
-       g_variant_builder_init (&_tmp60_, G_VARIANT_TYPE ("a(ssssssouso)"));
-       for (_tmp61_ = 0; _tmp61_ < result_length1; _tmp61_++) {
-               GVariantBuilder _tmp62_;
-               g_variant_builder_init (&_tmp62_, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).id));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).description));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).load_state));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).active_state));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).sub_state));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).following));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_object_path ((*_tmp59_).unit_path));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_uint32 ((*_tmp59_).job_id));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_string ((*_tmp59_).job_type));
-               g_variant_builder_add_value (&_tmp62_, g_variant_new_object_path ((*_tmp59_).job_path));
-               g_variant_builder_add_value (&_tmp60_, g_variant_builder_end (&_tmp62_));
-               _tmp59_++;
-       }
-       g_variant_builder_add_value (&_reply_builder, g_variant_builder_end (&_tmp60_));
-       result = (_vala_ManagerUnitInfo_array_free (result, result_length1), NULL);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _vala_ManagerJobInfo_array_free (ManagerJobInfo* array, gint array_length) {
-       if (array != NULL) {
-               int i;
-               for (i = 0; i < array_length; i = i + 1) {
-                       manager_job_info_destroy (&array[i]);
-               }
-       }
-       g_free (array);
-}
-
-
-static void _dbus_manager_list_jobs (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       ManagerJobInfo* result;
-       int result_length1 = 0;
-       ManagerJobInfo* _tmp63_;
-       GVariantBuilder _tmp64_;
-       int _tmp65_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       result = manager_list_jobs (self, &result_length1, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _tmp63_ = result;
-       g_variant_builder_init (&_tmp64_, G_VARIANT_TYPE ("a(usssoo)"));
-       for (_tmp65_ = 0; _tmp65_ < result_length1; _tmp65_++) {
-               GVariantBuilder _tmp66_;
-               g_variant_builder_init (&_tmp66_, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_tmp66_, g_variant_new_uint32 ((*_tmp63_).id));
-               g_variant_builder_add_value (&_tmp66_, g_variant_new_string ((*_tmp63_).name));
-               g_variant_builder_add_value (&_tmp66_, g_variant_new_string ((*_tmp63_).type));
-               g_variant_builder_add_value (&_tmp66_, g_variant_new_string ((*_tmp63_).state));
-               g_variant_builder_add_value (&_tmp66_, g_variant_new_object_path ((*_tmp63_).job_path));
-               g_variant_builder_add_value (&_tmp66_, g_variant_new_object_path ((*_tmp63_).unit_path));
-               g_variant_builder_add_value (&_tmp64_, g_variant_builder_end (&_tmp66_));
-               _tmp63_++;
-       }
-       g_variant_builder_add_value (&_reply_builder, g_variant_builder_end (&_tmp64_));
-       result = (_vala_ManagerJobInfo_array_free (result, result_length1), NULL);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_get_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp67_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp67_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp67_, NULL);
-       g_variant_unref (_tmp67_);
-       result = manager_get_unit (self, name, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_get_unit_by_pid (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       guint32 pid = 0U;
-       GVariant* _tmp68_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp68_ = g_variant_iter_next_value (&_arguments_iter);
-       pid = g_variant_get_uint32 (_tmp68_);
-       g_variant_unref (_tmp68_);
-       result = manager_get_unit_by_pid (self, pid, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_load_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp69_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp69_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp69_, NULL);
-       g_variant_unref (_tmp69_);
-       result = manager_load_unit (self, name, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_get_job (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       guint32 id = 0U;
-       GVariant* _tmp70_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp70_ = g_variant_iter_next_value (&_arguments_iter);
-       id = g_variant_get_uint32 (_tmp70_);
-       g_variant_unref (_tmp70_);
-       result = manager_get_job (self, id, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_start_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp71_;
-       gchar* mode = NULL;
-       GVariant* _tmp72_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp71_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp71_, NULL);
-       g_variant_unref (_tmp71_);
-       _tmp72_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp72_, NULL);
-       g_variant_unref (_tmp72_);
-       result = manager_start_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_stop_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp73_;
-       gchar* mode = NULL;
-       GVariant* _tmp74_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp73_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp73_, NULL);
-       g_variant_unref (_tmp73_);
-       _tmp74_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp74_, NULL);
-       g_variant_unref (_tmp74_);
-       result = manager_stop_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reload_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp75_;
-       gchar* mode = NULL;
-       GVariant* _tmp76_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp75_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp75_, NULL);
-       g_variant_unref (_tmp75_);
-       _tmp76_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp76_, NULL);
-       g_variant_unref (_tmp76_);
-       result = manager_reload_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp77_;
-       gchar* mode = NULL;
-       GVariant* _tmp78_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp77_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp77_, NULL);
-       g_variant_unref (_tmp77_);
-       _tmp78_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp78_, NULL);
-       g_variant_unref (_tmp78_);
-       result = manager_restart_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_try_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp79_;
-       gchar* mode = NULL;
-       GVariant* _tmp80_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp79_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp79_, NULL);
-       g_variant_unref (_tmp79_);
-       _tmp80_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp80_, NULL);
-       g_variant_unref (_tmp80_);
-       result = manager_try_restart_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reload_or_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp81_;
-       gchar* mode = NULL;
-       GVariant* _tmp82_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp81_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp81_, NULL);
-       g_variant_unref (_tmp81_);
-       _tmp82_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp82_, NULL);
-       g_variant_unref (_tmp82_);
-       result = manager_reload_or_restart_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reload_or_try_restart_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp83_;
-       gchar* mode = NULL;
-       GVariant* _tmp84_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp83_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp83_, NULL);
-       g_variant_unref (_tmp83_);
-       _tmp84_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp84_, NULL);
-       g_variant_unref (_tmp84_);
-       result = manager_reload_or_try_restart_unit (self, name, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reset_failed_unit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp85_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp85_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp85_, NULL);
-       g_variant_unref (_tmp85_);
-       manager_reset_failed_unit (self, name, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_clear_jobs (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_clear_jobs (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_subscribe (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_subscribe (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_unsubscribe (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_unsubscribe (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_dump (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       gchar* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       result = manager_dump (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_string (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reload (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_reload (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reexecute (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_reexecute (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_exit (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_exit (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_halt (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_halt (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_power_off (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_power_off (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_reboot (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_reboot (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_kexec (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       manager_kexec (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_create_snapshot (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* name = NULL;
-       GVariant* _tmp86_;
-       gboolean cleanup = FALSE;
-       GVariant* _tmp87_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp86_ = g_variant_iter_next_value (&_arguments_iter);
-       name = g_variant_dup_string (_tmp86_, NULL);
-       g_variant_unref (_tmp86_);
-       _tmp87_ = g_variant_iter_next_value (&_arguments_iter);
-       cleanup = g_variant_get_boolean (_tmp87_);
-       g_variant_unref (_tmp87_);
-       result = manager_create_snapshot (self, name, cleanup, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (name);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_set_environment (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar** names = NULL;
-       int names_length1 = 0;
-       GVariant* _tmp88_;
-       gchar** _tmp89_;
-       int _tmp89__length;
-       int _tmp89__size;
-       int _tmp89__length1;
-       GVariantIter _tmp90_;
-       GVariant* _tmp91_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp88_ = g_variant_iter_next_value (&_arguments_iter);
-       _tmp89_ = g_new (gchar*, 5);
-       _tmp89__length = 0;
-       _tmp89__size = 4;
-       _tmp89__length1 = 0;
-       g_variant_iter_init (&_tmp90_, _tmp88_);
-       for (; (_tmp91_ = g_variant_iter_next_value (&_tmp90_)) != NULL; _tmp89__length1++) {
-               if (_tmp89__size == _tmp89__length) {
-                       _tmp89__size = 2 * _tmp89__size;
-                       _tmp89_ = g_renew (gchar*, _tmp89_, _tmp89__size + 1);
-               }
-               _tmp89_[_tmp89__length++] = g_variant_dup_string (_tmp91_, NULL);
-               g_variant_unref (_tmp91_);
-       }
-       names_length1 = _tmp89__length1;
-       _tmp89_[_tmp89__length] = NULL;
-       names = _tmp89_;
-       g_variant_unref (_tmp88_);
-       manager_set_environment (self, names, names_length1, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_manager_unset_environment (Manager* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar** names = NULL;
-       int names_length1 = 0;
-       GVariant* _tmp92_;
-       gchar** _tmp93_;
-       int _tmp93__length;
-       int _tmp93__size;
-       int _tmp93__length1;
-       GVariantIter _tmp94_;
-       GVariant* _tmp95_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp92_ = g_variant_iter_next_value (&_arguments_iter);
-       _tmp93_ = g_new (gchar*, 5);
-       _tmp93__length = 0;
-       _tmp93__size = 4;
-       _tmp93__length1 = 0;
-       g_variant_iter_init (&_tmp94_, _tmp92_);
-       for (; (_tmp95_ = g_variant_iter_next_value (&_tmp94_)) != NULL; _tmp93__length1++) {
-               if (_tmp93__size == _tmp93__length) {
-                       _tmp93__size = 2 * _tmp93__size;
-                       _tmp93_ = g_renew (gchar*, _tmp93_, _tmp93__size + 1);
-               }
-               _tmp93_[_tmp93__length++] = g_variant_dup_string (_tmp95_, NULL);
-               g_variant_unref (_tmp95_);
-       }
-       names_length1 = _tmp93__length1;
-       _tmp93_[_tmp93__length] = NULL;
-       names = _tmp93_;
-       g_variant_unref (_tmp92_);
-       manager_unset_environment (self, names, names_length1, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void manager_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (method_name, "ListUnits") == 0) {
-               _dbus_manager_list_units (object, parameters, invocation);
-       } else if (strcmp (method_name, "ListJobs") == 0) {
-               _dbus_manager_list_jobs (object, parameters, invocation);
-       } else if (strcmp (method_name, "GetUnit") == 0) {
-               _dbus_manager_get_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "GetUnitByPid") == 0) {
-               _dbus_manager_get_unit_by_pid (object, parameters, invocation);
-       } else if (strcmp (method_name, "LoadUnit") == 0) {
-               _dbus_manager_load_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "GetJob") == 0) {
-               _dbus_manager_get_job (object, parameters, invocation);
-       } else if (strcmp (method_name, "StartUnit") == 0) {
-               _dbus_manager_start_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "StopUnit") == 0) {
-               _dbus_manager_stop_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "ReloadUnit") == 0) {
-               _dbus_manager_reload_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "RestartUnit") == 0) {
-               _dbus_manager_restart_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "TryRestartUnit") == 0) {
-               _dbus_manager_try_restart_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "ReloadOrRestartUnit") == 0) {
-               _dbus_manager_reload_or_restart_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "ReloadOrTryRestartUnit") == 0) {
-               _dbus_manager_reload_or_try_restart_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "ResetFailedUnit") == 0) {
-               _dbus_manager_reset_failed_unit (object, parameters, invocation);
-       } else if (strcmp (method_name, "ClearJobs") == 0) {
-               _dbus_manager_clear_jobs (object, parameters, invocation);
-       } else if (strcmp (method_name, "Subscribe") == 0) {
-               _dbus_manager_subscribe (object, parameters, invocation);
-       } else if (strcmp (method_name, "Unsubscribe") == 0) {
-               _dbus_manager_unsubscribe (object, parameters, invocation);
-       } else if (strcmp (method_name, "Dump") == 0) {
-               _dbus_manager_dump (object, parameters, invocation);
-       } else if (strcmp (method_name, "Reload") == 0) {
-               _dbus_manager_reload (object, parameters, invocation);
-       } else if (strcmp (method_name, "Reexecute") == 0) {
-               _dbus_manager_reexecute (object, parameters, invocation);
-       } else if (strcmp (method_name, "Exit") == 0) {
-               _dbus_manager_exit (object, parameters, invocation);
-       } else if (strcmp (method_name, "Halt") == 0) {
-               _dbus_manager_halt (object, parameters, invocation);
-       } else if (strcmp (method_name, "PowerOff") == 0) {
-               _dbus_manager_power_off (object, parameters, invocation);
-       } else if (strcmp (method_name, "Reboot") == 0) {
-               _dbus_manager_reboot (object, parameters, invocation);
-       } else if (strcmp (method_name, "Kexec") == 0) {
-               _dbus_manager_kexec (object, parameters, invocation);
-       } else if (strcmp (method_name, "CreateSnapshot") == 0) {
-               _dbus_manager_create_snapshot (object, parameters, invocation);
-       } else if (strcmp (method_name, "SetEnvironment") == 0) {
-               _dbus_manager_set_environment (object, parameters, invocation);
-       } else if (strcmp (method_name, "UnsetEnvironment") == 0) {
-               _dbus_manager_unset_environment (object, parameters, invocation);
-       } else {
-               g_object_unref (invocation);
-       }
-}
-
-
-static GVariant* _dbus_manager_get_environment (Manager* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp96_;
-       GVariantBuilder _tmp97_;
-       int _tmp98_;
-       GVariant* _reply;
-       result = manager_get_environment (self, &result_length1);
-       _tmp96_ = result;
-       g_variant_builder_init (&_tmp97_, G_VARIANT_TYPE ("as"));
-       for (_tmp98_ = 0; _tmp98_ < result_length1; _tmp98_++) {
-               g_variant_builder_add_value (&_tmp97_, g_variant_new_string (*_tmp96_));
-               _tmp96_++;
-       }
-       _reply = g_variant_builder_end (&_tmp97_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* manager_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (property_name, "Environment") == 0) {
-               return _dbus_manager_get_environment (object);
-       }
-       return NULL;
-}
-
-
-static gboolean manager_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       return FALSE;
-}
-
-
-static void _dbus_manager_unit_new (GObject* _sender, const gchar* id, const char* path, gpointer* _data) {
-       GDBusConnection * _connection;
-       const gchar * _path;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       _connection = _data[1];
-       _path = _data[2];
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (id));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_object_path (path));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_connection_emit_signal (_connection, NULL, _path, "org.freedesktop.systemd1.Manager", "UnitNew", _arguments, NULL);
-}
-
-
-static void _dbus_manager_unit_removed (GObject* _sender, const gchar* id, const char* path, gpointer* _data) {
-       GDBusConnection * _connection;
-       const gchar * _path;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       _connection = _data[1];
-       _path = _data[2];
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (id));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_object_path (path));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_connection_emit_signal (_connection, NULL, _path, "org.freedesktop.systemd1.Manager", "UnitRemoved", _arguments, NULL);
-}
-
-
-static void _dbus_manager_job_new (GObject* _sender, guint32 id, const char* path, gpointer* _data) {
-       GDBusConnection * _connection;
-       const gchar * _path;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       _connection = _data[1];
-       _path = _data[2];
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_uint32 (id));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_object_path (path));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_connection_emit_signal (_connection, NULL, _path, "org.freedesktop.systemd1.Manager", "JobNew", _arguments, NULL);
-}
-
-
-static void _dbus_manager_job_removed (GObject* _sender, guint32 id, const char* path, const gchar* res, gpointer* _data) {
-       GDBusConnection * _connection;
-       const gchar * _path;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       _connection = _data[1];
-       _path = _data[2];
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_uint32 (id));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_object_path (path));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (res));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_connection_emit_signal (_connection, NULL, _path, "org.freedesktop.systemd1.Manager", "JobRemoved", _arguments, NULL);
-}
-
-
-guint manager_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) {
-       guint result;
-       gpointer *data;
-       data = g_new (gpointer, 3);
-       data[0] = g_object_ref (object);
-       data[1] = g_object_ref (connection);
-       data[2] = g_strdup (path);
-       result = g_dbus_connection_register_object (connection, path, (GDBusInterfaceInfo *) (&_manager_dbus_interface_info), &_manager_dbus_interface_vtable, data, _manager_unregister_object, error);
-       if (!result) {
-               return 0;
-       }
-       g_signal_connect (object, "unit-new", (GCallback) _dbus_manager_unit_new, data);
-       g_signal_connect (object, "unit-removed", (GCallback) _dbus_manager_unit_removed, data);
-       g_signal_connect (object, "job-new", (GCallback) _dbus_manager_job_new, data);
-       g_signal_connect (object, "job-removed", (GCallback) _dbus_manager_job_removed, data);
-       return result;
-}
-
-
-static void _manager_unregister_object (gpointer user_data) {
-       gpointer* data;
-       data = user_data;
-       g_signal_handlers_disconnect_by_func (data[0], _dbus_manager_unit_new, data);
-       g_signal_handlers_disconnect_by_func (data[0], _dbus_manager_unit_removed, data);
-       g_signal_handlers_disconnect_by_func (data[0], _dbus_manager_job_new, data);
-       g_signal_handlers_disconnect_by_func (data[0], _dbus_manager_job_removed, data);
-       g_object_unref (data[0]);
-       g_object_unref (data[1]);
-       g_free (data[2]);
-       g_free (data);
-}
-
-
-char* unit_start (Unit* self, const gchar* mode, GError** error) {
-#line 137 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 137 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->start (self, mode, error);
-#line 3695 "systemd-interfaces.c"
-}
-
-
-char* unit_stop (Unit* self, const gchar* mode, GError** error) {
-#line 138 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 138 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->stop (self, mode, error);
-#line 3704 "systemd-interfaces.c"
-}
-
-
-char* unit_reload (Unit* self, const gchar* mode, GError** error) {
-#line 139 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 139 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->reload (self, mode, error);
-#line 3713 "systemd-interfaces.c"
-}
-
-
-char* unit_restart (Unit* self, const gchar* mode, GError** error) {
-#line 140 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 140 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->restart (self, mode, error);
-#line 3722 "systemd-interfaces.c"
-}
-
-
-char* unit_try_restart (Unit* self, const gchar* mode, GError** error) {
-#line 141 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 141 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->try_restart (self, mode, error);
-#line 3731 "systemd-interfaces.c"
-}
-
-
-char* unit_reload_or_restart (Unit* self, const gchar* mode, GError** error) {
-#line 142 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 142 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->reload_or_restart (self, mode, error);
-#line 3740 "systemd-interfaces.c"
-}
-
-
-char* unit_reload_or_try_restart (Unit* self, const gchar* mode, GError** error) {
-#line 143 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 143 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->reload_or_try_restart (self, mode, error);
-#line 3749 "systemd-interfaces.c"
-}
-
-
-void unit_reset_failed (Unit* self, GError** error) {
-#line 145 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 145 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       UNIT_GET_INTERFACE (self)->reset_failed (self, error);
-#line 3758 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_id (Unit* self) {
-#line 98 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 98 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_id (self);
-#line 3767 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_names (Unit* self, int* result_length1) {
-#line 99 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 99 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_names (self, result_length1);
-#line 3776 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_following (Unit* self) {
-#line 100 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 100 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_following (self);
-#line 3785 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_requires (Unit* self, int* result_length1) {
-#line 101 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 101 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_requires (self, result_length1);
-#line 3794 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_requires_overridable (Unit* self, int* result_length1) {
-#line 102 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 102 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_requires_overridable (self, result_length1);
-#line 3803 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_requisite (Unit* self, int* result_length1) {
-#line 103 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 103 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_requisite (self, result_length1);
-#line 3812 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_requisite_overridable (Unit* self, int* result_length1) {
-#line 104 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 104 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_requisite_overridable (self, result_length1);
-#line 3821 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_wants (Unit* self, int* result_length1) {
-#line 105 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 105 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_wants (self, result_length1);
-#line 3830 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_required_by (Unit* self, int* result_length1) {
-#line 106 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 106 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_required_by (self, result_length1);
-#line 3839 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_required_by_overridable (Unit* self, int* result_length1) {
-#line 107 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 107 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_required_by_overridable (self, result_length1);
-#line 3848 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_wanted_by (Unit* self, int* result_length1) {
-#line 108 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 108 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_wanted_by (self, result_length1);
-#line 3857 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_conflicts (Unit* self, int* result_length1) {
-#line 109 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 109 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_conflicts (self, result_length1);
-#line 3866 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_conflicted_by (Unit* self, int* result_length1) {
-#line 110 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 110 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_conflicted_by (self, result_length1);
-#line 3875 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_before (Unit* self, int* result_length1) {
-#line 111 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 111 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_before (self, result_length1);
-#line 3884 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_after (Unit* self, int* result_length1) {
-#line 112 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 112 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_after (self, result_length1);
-#line 3893 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_on_failure (Unit* self, int* result_length1) {
-#line 113 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 113 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_on_failure (self, result_length1);
-#line 3902 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_description (Unit* self) {
-#line 114 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 114 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_description (self);
-#line 3911 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_load_state (Unit* self) {
-#line 115 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 115 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_load_state (self);
-#line 3920 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_active_state (Unit* self) {
-#line 116 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 116 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_active_state (self);
-#line 3929 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_sub_state (Unit* self) {
-#line 117 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 117 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_sub_state (self);
-#line 3938 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_fragment_path (Unit* self) {
-#line 118 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 118 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_fragment_path (self);
-#line 3947 "systemd-interfaces.c"
-}
-
-
-guint64 unit_get_inactive_exit_timestamp (Unit* self) {
-#line 119 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, 0ULL);
-#line 119 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_inactive_exit_timestamp (self);
-#line 3956 "systemd-interfaces.c"
-}
-
-
-guint64 unit_get_active_enter_timestamp (Unit* self) {
-#line 120 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, 0ULL);
-#line 120 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_active_enter_timestamp (self);
-#line 3965 "systemd-interfaces.c"
-}
-
-
-guint64 unit_get_active_exit_timestamp (Unit* self) {
-#line 121 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, 0ULL);
-#line 121 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_active_exit_timestamp (self);
-#line 3974 "systemd-interfaces.c"
-}
-
-
-guint64 unit_get_inactive_enter_timestamp (Unit* self) {
-#line 122 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, 0ULL);
-#line 122 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_inactive_enter_timestamp (self);
-#line 3983 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_can_start (Unit* self) {
-#line 123 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 123 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_can_start (self);
-#line 3992 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_can_stop (Unit* self) {
-#line 124 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 124 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_can_stop (self);
-#line 4001 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_can_reload (Unit* self) {
-#line 125 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 125 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_can_reload (self);
-#line 4010 "systemd-interfaces.c"
-}
-
-
-void unit_get_job (Unit* self, UnitJobLink* result) {
-#line 126 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 126 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       UNIT_GET_INTERFACE (self)->get_job (self, result);
-#line 4019 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_recursive_stop (Unit* self) {
-#line 127 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 127 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_recursive_stop (self);
-#line 4028 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_stop_when_unneeded (Unit* self) {
-#line 128 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 128 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_stop_when_unneeded (self);
-#line 4037 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_refuse_manual_start (Unit* self) {
-#line 129 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 129 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_refuse_manual_start (self);
-#line 4046 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_refuse_manual_stop (Unit* self) {
-#line 130 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 130 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_refuse_manual_stop (self);
-#line 4055 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_default_dependencies (Unit* self) {
-#line 131 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 131 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_default_dependencies (self);
-#line 4064 "systemd-interfaces.c"
-}
-
-
-gchar* unit_get_default_control_group (Unit* self) {
-#line 132 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 132 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_default_control_group (self);
-#line 4073 "systemd-interfaces.c"
-}
-
-
-gchar** unit_get_control_groups (Unit* self, int* result_length1) {
-#line 133 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 133 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_control_groups (self, result_length1);
-#line 4082 "systemd-interfaces.c"
-}
-
-
-gboolean unit_get_need_daemon_reload (Unit* self) {
-#line 134 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, FALSE);
-#line 134 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_need_daemon_reload (self);
-#line 4091 "systemd-interfaces.c"
-}
-
-
-guint64 unit_get_job_timeout_usec (Unit* self) {
-#line 135 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, 0ULL);
-#line 135 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return UNIT_GET_INTERFACE (self)->get_job_timeout_usec (self);
-#line 4100 "systemd-interfaces.c"
-}
-
-
-void unit_job_link_copy (const UnitJobLink* self, UnitJobLink* dest) {
-       guint32 _tmp0_;
-       const char* _tmp1_;
-       char* _tmp2_;
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp0_ = (*self).id;
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).id = _tmp0_;
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp1_ = (*self).path;
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp2_ = g_strdup (_tmp1_);
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).path);
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).path = _tmp2_;
-#line 4120 "systemd-interfaces.c"
-}
-
-
-void unit_job_link_destroy (UnitJobLink* self) {
-#line 95 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).path);
-#line 4127 "systemd-interfaces.c"
-}
-
-
-UnitJobLink* unit_job_link_dup (const UnitJobLink* self) {
-       UnitJobLink* dup;
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       dup = g_new0 (UnitJobLink, 1);
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       unit_job_link_copy (self, dup);
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return dup;
-#line 4139 "systemd-interfaces.c"
-}
-
-
-void unit_job_link_free (UnitJobLink* self) {
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       unit_job_link_destroy (self);
-#line 93 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_free (self);
-#line 4148 "systemd-interfaces.c"
-}
-
-
-GType unit_job_link_get_type (void) {
-       static volatile gsize unit_job_link_type_id__volatile = 0;
-       if (g_once_init_enter (&unit_job_link_type_id__volatile)) {
-               GType unit_job_link_type_id;
-               unit_job_link_type_id = g_boxed_type_register_static ("UnitJobLink", (GBoxedCopyFunc) unit_job_link_dup, (GBoxedFreeFunc) unit_job_link_free);
-               g_once_init_leave (&unit_job_link_type_id__volatile, unit_job_link_type_id);
-       }
-       return unit_job_link_type_id__volatile;
-}
-
-
-static void unit_base_init (UnitIface * iface) {
-#line 92 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       static gboolean initialized = FALSE;
-#line 92 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (!initialized) {
-#line 92 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               initialized = TRUE;
-#line 4170 "systemd-interfaces.c"
-       }
-}
-
-
-GType unit_get_type (void) {
-       static volatile gsize unit_type_id__volatile = 0;
-       if (g_once_init_enter (&unit_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (UnitIface), (GBaseInitFunc) unit_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
-               GType unit_type_id;
-               unit_type_id = g_type_register_static (G_TYPE_INTERFACE, "Unit", &g_define_type_info, 0);
-               g_type_interface_add_prerequisite (unit_type_id, G_TYPE_DBUS_PROXY);
-               g_type_set_qdata (unit_type_id, g_quark_from_static_string ("vala-dbus-proxy-type"), (void*) unit_proxy_get_type);
-               g_type_set_qdata (unit_type_id, g_quark_from_static_string ("vala-dbus-interface-name"), "org.freedesktop.systemd1.Unit");
-               g_type_set_qdata (unit_type_id, g_quark_from_static_string ("vala-dbus-register-object"), (void*) unit_register_object);
-               g_once_init_leave (&unit_type_id__volatile, unit_type_id);
-       }
-       return unit_type_id__volatile;
-}
-
-
-G_DEFINE_TYPE_EXTENDED (UnitProxy, unit_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_UNIT, unit_proxy_unit_interface_init) )
-static void unit_proxy_class_init (UnitProxyClass* klass) {
-       G_DBUS_PROXY_CLASS (klass)->g_signal = unit_proxy_g_signal;
-}
-
-
-static void unit_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
-}
-
-
-static void unit_proxy_init (UnitProxy* self) {
-}
-
-
-static char* unit_proxy_start (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp99_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "Start");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp99_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp99_, NULL);
-       g_variant_unref (_tmp99_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* unit_proxy_stop (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp100_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "Stop");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp100_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp100_, NULL);
-       g_variant_unref (_tmp100_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* unit_proxy_reload (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp101_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "Reload");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp101_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp101_, NULL);
-       g_variant_unref (_tmp101_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* unit_proxy_restart (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp102_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "Restart");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp102_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp102_, NULL);
-       g_variant_unref (_tmp102_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* unit_proxy_try_restart (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp103_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "TryRestart");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp103_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp103_, NULL);
-       g_variant_unref (_tmp103_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* unit_proxy_reload_or_restart (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp104_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "ReloadOrRestart");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp104_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp104_, NULL);
-       g_variant_unref (_tmp104_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static char* unit_proxy_reload_or_try_restart (Unit* self, const gchar* mode, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       char* _result;
-       GVariant* _tmp105_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "ReloadOrTryRestart");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (mode));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp105_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_dup_string (_tmp105_, NULL);
-       g_variant_unref (_tmp105_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static void unit_proxy_reset_failed (Unit* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Unit", "ResetFailed");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static gchar* unit_dbus_proxy_get_id (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Id");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Id"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_names (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp106_;
-       int _tmp106__length;
-       int _tmp106__size;
-       int _tmp106__length1;
-       GVariantIter _tmp107_;
-       GVariant* _tmp108_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Names");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Names"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp106_ = g_new (gchar*, 5);
-       _tmp106__length = 0;
-       _tmp106__size = 4;
-       _tmp106__length1 = 0;
-       g_variant_iter_init (&_tmp107_, _inner_reply);
-       for (; (_tmp108_ = g_variant_iter_next_value (&_tmp107_)) != NULL; _tmp106__length1++) {
-               if (_tmp106__size == _tmp106__length) {
-                       _tmp106__size = 2 * _tmp106__size;
-                       _tmp106_ = g_renew (gchar*, _tmp106_, _tmp106__size + 1);
-               }
-               _tmp106_[_tmp106__length++] = g_variant_dup_string (_tmp108_, NULL);
-               g_variant_unref (_tmp108_);
-       }
-       _result_length1 = _tmp106__length1;
-       _tmp106_[_tmp106__length] = NULL;
-       _result = _tmp106_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_following (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Following");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Following"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_requires (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp109_;
-       int _tmp109__length;
-       int _tmp109__size;
-       int _tmp109__length1;
-       GVariantIter _tmp110_;
-       GVariant* _tmp111_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Requires");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Requires"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp109_ = g_new (gchar*, 5);
-       _tmp109__length = 0;
-       _tmp109__size = 4;
-       _tmp109__length1 = 0;
-       g_variant_iter_init (&_tmp110_, _inner_reply);
-       for (; (_tmp111_ = g_variant_iter_next_value (&_tmp110_)) != NULL; _tmp109__length1++) {
-               if (_tmp109__size == _tmp109__length) {
-                       _tmp109__size = 2 * _tmp109__size;
-                       _tmp109_ = g_renew (gchar*, _tmp109_, _tmp109__size + 1);
-               }
-               _tmp109_[_tmp109__length++] = g_variant_dup_string (_tmp111_, NULL);
-               g_variant_unref (_tmp111_);
-       }
-       _result_length1 = _tmp109__length1;
-       _tmp109_[_tmp109__length] = NULL;
-       _result = _tmp109_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_requires_overridable (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp112_;
-       int _tmp112__length;
-       int _tmp112__size;
-       int _tmp112__length1;
-       GVariantIter _tmp113_;
-       GVariant* _tmp114_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RequiresOverridable");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RequiresOverridable"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp112_ = g_new (gchar*, 5);
-       _tmp112__length = 0;
-       _tmp112__size = 4;
-       _tmp112__length1 = 0;
-       g_variant_iter_init (&_tmp113_, _inner_reply);
-       for (; (_tmp114_ = g_variant_iter_next_value (&_tmp113_)) != NULL; _tmp112__length1++) {
-               if (_tmp112__size == _tmp112__length) {
-                       _tmp112__size = 2 * _tmp112__size;
-                       _tmp112_ = g_renew (gchar*, _tmp112_, _tmp112__size + 1);
-               }
-               _tmp112_[_tmp112__length++] = g_variant_dup_string (_tmp114_, NULL);
-               g_variant_unref (_tmp114_);
-       }
-       _result_length1 = _tmp112__length1;
-       _tmp112_[_tmp112__length] = NULL;
-       _result = _tmp112_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_requisite (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp115_;
-       int _tmp115__length;
-       int _tmp115__size;
-       int _tmp115__length1;
-       GVariantIter _tmp116_;
-       GVariant* _tmp117_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Requisite");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Requisite"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp115_ = g_new (gchar*, 5);
-       _tmp115__length = 0;
-       _tmp115__size = 4;
-       _tmp115__length1 = 0;
-       g_variant_iter_init (&_tmp116_, _inner_reply);
-       for (; (_tmp117_ = g_variant_iter_next_value (&_tmp116_)) != NULL; _tmp115__length1++) {
-               if (_tmp115__size == _tmp115__length) {
-                       _tmp115__size = 2 * _tmp115__size;
-                       _tmp115_ = g_renew (gchar*, _tmp115_, _tmp115__size + 1);
-               }
-               _tmp115_[_tmp115__length++] = g_variant_dup_string (_tmp117_, NULL);
-               g_variant_unref (_tmp117_);
-       }
-       _result_length1 = _tmp115__length1;
-       _tmp115_[_tmp115__length] = NULL;
-       _result = _tmp115_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_requisite_overridable (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp118_;
-       int _tmp118__length;
-       int _tmp118__size;
-       int _tmp118__length1;
-       GVariantIter _tmp119_;
-       GVariant* _tmp120_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RequisiteOverridable");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RequisiteOverridable"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp118_ = g_new (gchar*, 5);
-       _tmp118__length = 0;
-       _tmp118__size = 4;
-       _tmp118__length1 = 0;
-       g_variant_iter_init (&_tmp119_, _inner_reply);
-       for (; (_tmp120_ = g_variant_iter_next_value (&_tmp119_)) != NULL; _tmp118__length1++) {
-               if (_tmp118__size == _tmp118__length) {
-                       _tmp118__size = 2 * _tmp118__size;
-                       _tmp118_ = g_renew (gchar*, _tmp118_, _tmp118__size + 1);
-               }
-               _tmp118_[_tmp118__length++] = g_variant_dup_string (_tmp120_, NULL);
-               g_variant_unref (_tmp120_);
-       }
-       _result_length1 = _tmp118__length1;
-       _tmp118_[_tmp118__length] = NULL;
-       _result = _tmp118_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_wants (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp121_;
-       int _tmp121__length;
-       int _tmp121__size;
-       int _tmp121__length1;
-       GVariantIter _tmp122_;
-       GVariant* _tmp123_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Wants");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Wants"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp121_ = g_new (gchar*, 5);
-       _tmp121__length = 0;
-       _tmp121__size = 4;
-       _tmp121__length1 = 0;
-       g_variant_iter_init (&_tmp122_, _inner_reply);
-       for (; (_tmp123_ = g_variant_iter_next_value (&_tmp122_)) != NULL; _tmp121__length1++) {
-               if (_tmp121__size == _tmp121__length) {
-                       _tmp121__size = 2 * _tmp121__size;
-                       _tmp121_ = g_renew (gchar*, _tmp121_, _tmp121__size + 1);
-               }
-               _tmp121_[_tmp121__length++] = g_variant_dup_string (_tmp123_, NULL);
-               g_variant_unref (_tmp123_);
-       }
-       _result_length1 = _tmp121__length1;
-       _tmp121_[_tmp121__length] = NULL;
-       _result = _tmp121_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_required_by (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp124_;
-       int _tmp124__length;
-       int _tmp124__size;
-       int _tmp124__length1;
-       GVariantIter _tmp125_;
-       GVariant* _tmp126_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RequiredBy");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RequiredBy"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp124_ = g_new (gchar*, 5);
-       _tmp124__length = 0;
-       _tmp124__size = 4;
-       _tmp124__length1 = 0;
-       g_variant_iter_init (&_tmp125_, _inner_reply);
-       for (; (_tmp126_ = g_variant_iter_next_value (&_tmp125_)) != NULL; _tmp124__length1++) {
-               if (_tmp124__size == _tmp124__length) {
-                       _tmp124__size = 2 * _tmp124__size;
-                       _tmp124_ = g_renew (gchar*, _tmp124_, _tmp124__size + 1);
-               }
-               _tmp124_[_tmp124__length++] = g_variant_dup_string (_tmp126_, NULL);
-               g_variant_unref (_tmp126_);
-       }
-       _result_length1 = _tmp124__length1;
-       _tmp124_[_tmp124__length] = NULL;
-       _result = _tmp124_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_required_by_overridable (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp127_;
-       int _tmp127__length;
-       int _tmp127__size;
-       int _tmp127__length1;
-       GVariantIter _tmp128_;
-       GVariant* _tmp129_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RequiredByOverridable");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RequiredByOverridable"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp127_ = g_new (gchar*, 5);
-       _tmp127__length = 0;
-       _tmp127__size = 4;
-       _tmp127__length1 = 0;
-       g_variant_iter_init (&_tmp128_, _inner_reply);
-       for (; (_tmp129_ = g_variant_iter_next_value (&_tmp128_)) != NULL; _tmp127__length1++) {
-               if (_tmp127__size == _tmp127__length) {
-                       _tmp127__size = 2 * _tmp127__size;
-                       _tmp127_ = g_renew (gchar*, _tmp127_, _tmp127__size + 1);
-               }
-               _tmp127_[_tmp127__length++] = g_variant_dup_string (_tmp129_, NULL);
-               g_variant_unref (_tmp129_);
-       }
-       _result_length1 = _tmp127__length1;
-       _tmp127_[_tmp127__length] = NULL;
-       _result = _tmp127_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_wanted_by (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp130_;
-       int _tmp130__length;
-       int _tmp130__size;
-       int _tmp130__length1;
-       GVariantIter _tmp131_;
-       GVariant* _tmp132_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "WantedBy");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("WantedBy"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp130_ = g_new (gchar*, 5);
-       _tmp130__length = 0;
-       _tmp130__size = 4;
-       _tmp130__length1 = 0;
-       g_variant_iter_init (&_tmp131_, _inner_reply);
-       for (; (_tmp132_ = g_variant_iter_next_value (&_tmp131_)) != NULL; _tmp130__length1++) {
-               if (_tmp130__size == _tmp130__length) {
-                       _tmp130__size = 2 * _tmp130__size;
-                       _tmp130_ = g_renew (gchar*, _tmp130_, _tmp130__size + 1);
-               }
-               _tmp130_[_tmp130__length++] = g_variant_dup_string (_tmp132_, NULL);
-               g_variant_unref (_tmp132_);
-       }
-       _result_length1 = _tmp130__length1;
-       _tmp130_[_tmp130__length] = NULL;
-       _result = _tmp130_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_conflicts (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp133_;
-       int _tmp133__length;
-       int _tmp133__size;
-       int _tmp133__length1;
-       GVariantIter _tmp134_;
-       GVariant* _tmp135_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Conflicts");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Conflicts"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp133_ = g_new (gchar*, 5);
-       _tmp133__length = 0;
-       _tmp133__size = 4;
-       _tmp133__length1 = 0;
-       g_variant_iter_init (&_tmp134_, _inner_reply);
-       for (; (_tmp135_ = g_variant_iter_next_value (&_tmp134_)) != NULL; _tmp133__length1++) {
-               if (_tmp133__size == _tmp133__length) {
-                       _tmp133__size = 2 * _tmp133__size;
-                       _tmp133_ = g_renew (gchar*, _tmp133_, _tmp133__size + 1);
-               }
-               _tmp133_[_tmp133__length++] = g_variant_dup_string (_tmp135_, NULL);
-               g_variant_unref (_tmp135_);
-       }
-       _result_length1 = _tmp133__length1;
-       _tmp133_[_tmp133__length] = NULL;
-       _result = _tmp133_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_conflicted_by (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp136_;
-       int _tmp136__length;
-       int _tmp136__size;
-       int _tmp136__length1;
-       GVariantIter _tmp137_;
-       GVariant* _tmp138_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "ConflictedBy");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("ConflictedBy"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp136_ = g_new (gchar*, 5);
-       _tmp136__length = 0;
-       _tmp136__size = 4;
-       _tmp136__length1 = 0;
-       g_variant_iter_init (&_tmp137_, _inner_reply);
-       for (; (_tmp138_ = g_variant_iter_next_value (&_tmp137_)) != NULL; _tmp136__length1++) {
-               if (_tmp136__size == _tmp136__length) {
-                       _tmp136__size = 2 * _tmp136__size;
-                       _tmp136_ = g_renew (gchar*, _tmp136_, _tmp136__size + 1);
-               }
-               _tmp136_[_tmp136__length++] = g_variant_dup_string (_tmp138_, NULL);
-               g_variant_unref (_tmp138_);
-       }
-       _result_length1 = _tmp136__length1;
-       _tmp136_[_tmp136__length] = NULL;
-       _result = _tmp136_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_before (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp139_;
-       int _tmp139__length;
-       int _tmp139__size;
-       int _tmp139__length1;
-       GVariantIter _tmp140_;
-       GVariant* _tmp141_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Before");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Before"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp139_ = g_new (gchar*, 5);
-       _tmp139__length = 0;
-       _tmp139__size = 4;
-       _tmp139__length1 = 0;
-       g_variant_iter_init (&_tmp140_, _inner_reply);
-       for (; (_tmp141_ = g_variant_iter_next_value (&_tmp140_)) != NULL; _tmp139__length1++) {
-               if (_tmp139__size == _tmp139__length) {
-                       _tmp139__size = 2 * _tmp139__size;
-                       _tmp139_ = g_renew (gchar*, _tmp139_, _tmp139__size + 1);
-               }
-               _tmp139_[_tmp139__length++] = g_variant_dup_string (_tmp141_, NULL);
-               g_variant_unref (_tmp141_);
-       }
-       _result_length1 = _tmp139__length1;
-       _tmp139_[_tmp139__length] = NULL;
-       _result = _tmp139_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_after (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp142_;
-       int _tmp142__length;
-       int _tmp142__size;
-       int _tmp142__length1;
-       GVariantIter _tmp143_;
-       GVariant* _tmp144_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "After");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("After"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp142_ = g_new (gchar*, 5);
-       _tmp142__length = 0;
-       _tmp142__size = 4;
-       _tmp142__length1 = 0;
-       g_variant_iter_init (&_tmp143_, _inner_reply);
-       for (; (_tmp144_ = g_variant_iter_next_value (&_tmp143_)) != NULL; _tmp142__length1++) {
-               if (_tmp142__size == _tmp142__length) {
-                       _tmp142__size = 2 * _tmp142__size;
-                       _tmp142_ = g_renew (gchar*, _tmp142_, _tmp142__size + 1);
-               }
-               _tmp142_[_tmp142__length++] = g_variant_dup_string (_tmp144_, NULL);
-               g_variant_unref (_tmp144_);
-       }
-       _result_length1 = _tmp142__length1;
-       _tmp142_[_tmp142__length] = NULL;
-       _result = _tmp142_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_on_failure (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp145_;
-       int _tmp145__length;
-       int _tmp145__size;
-       int _tmp145__length1;
-       GVariantIter _tmp146_;
-       GVariant* _tmp147_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "OnFailure");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("OnFailure"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp145_ = g_new (gchar*, 5);
-       _tmp145__length = 0;
-       _tmp145__size = 4;
-       _tmp145__length1 = 0;
-       g_variant_iter_init (&_tmp146_, _inner_reply);
-       for (; (_tmp147_ = g_variant_iter_next_value (&_tmp146_)) != NULL; _tmp145__length1++) {
-               if (_tmp145__size == _tmp145__length) {
-                       _tmp145__size = 2 * _tmp145__size;
-                       _tmp145_ = g_renew (gchar*, _tmp145_, _tmp145__size + 1);
-               }
-               _tmp145_[_tmp145__length++] = g_variant_dup_string (_tmp147_, NULL);
-               g_variant_unref (_tmp147_);
-       }
-       _result_length1 = _tmp145__length1;
-       _tmp145_[_tmp145__length] = NULL;
-       _result = _tmp145_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_description (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Description");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Description"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_load_state (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "LoadState");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("LoadState"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_active_state (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "ActiveState");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("ActiveState"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_sub_state (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "SubState");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("SubState"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_fragment_path (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "FragmentPath");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("FragmentPath"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static guint64 unit_dbus_proxy_get_inactive_exit_timestamp (Unit* self) {
-       GVariant *_inner_reply;
-       guint64 _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "InactiveExitTimestamp");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("InactiveExitTimestamp"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return 0ULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_uint64 (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static guint64 unit_dbus_proxy_get_active_enter_timestamp (Unit* self) {
-       GVariant *_inner_reply;
-       guint64 _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "ActiveEnterTimestamp");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("ActiveEnterTimestamp"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return 0ULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_uint64 (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static guint64 unit_dbus_proxy_get_active_exit_timestamp (Unit* self) {
-       GVariant *_inner_reply;
-       guint64 _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "ActiveExitTimestamp");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("ActiveExitTimestamp"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return 0ULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_uint64 (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static guint64 unit_dbus_proxy_get_inactive_enter_timestamp (Unit* self) {
-       GVariant *_inner_reply;
-       guint64 _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "InactiveEnterTimestamp");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("InactiveEnterTimestamp"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return 0ULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_uint64 (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_can_start (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "CanStart");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("CanStart"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_can_stop (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "CanStop");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("CanStop"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_can_reload (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "CanReload");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("CanReload"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static void unit_dbus_proxy_get_job (Unit* self, UnitJobLink* result) {
-       GVariant *_inner_reply;
-       UnitJobLink _tmp148_;
-       GVariantIter _tmp149_;
-       GVariant* _tmp150_;
-       GVariant* _tmp151_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Job");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Job"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       g_variant_iter_init (&_tmp149_, _inner_reply);
-       _tmp150_ = g_variant_iter_next_value (&_tmp149_);
-       _tmp148_.id = g_variant_get_uint32 (_tmp150_);
-       g_variant_unref (_tmp150_);
-       _tmp151_ = g_variant_iter_next_value (&_tmp149_);
-       _tmp148_.path = g_variant_dup_string (_tmp151_, NULL);
-       g_variant_unref (_tmp151_);
-       *result = _tmp148_;
-       g_variant_unref (_inner_reply);
-       return;
-}
-
-
-static gboolean unit_dbus_proxy_get_recursive_stop (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RecursiveStop");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RecursiveStop"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_stop_when_unneeded (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "StopWhenUnneeded");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("StopWhenUnneeded"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_refuse_manual_start (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RefuseManualStart");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RefuseManualStart"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_refuse_manual_stop (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "RefuseManualStop");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("RefuseManualStop"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_default_dependencies (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "DefaultDependencies");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("DefaultDependencies"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* unit_dbus_proxy_get_default_control_group (Unit* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "DefaultControlGroup");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("DefaultControlGroup"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar** unit_dbus_proxy_get_control_groups (Unit* self, int* result_length1) {
-       GVariant *_inner_reply;
-       gchar** _result;
-       int _result_length1;
-       gchar** _tmp152_;
-       int _tmp152__length;
-       int _tmp152__size;
-       int _tmp152__length1;
-       GVariantIter _tmp153_;
-       GVariant* _tmp154_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "ControlGroups");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("ControlGroups"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result_length1 = 0;
-       _tmp152_ = g_new (gchar*, 5);
-       _tmp152__length = 0;
-       _tmp152__size = 4;
-       _tmp152__length1 = 0;
-       g_variant_iter_init (&_tmp153_, _inner_reply);
-       for (; (_tmp154_ = g_variant_iter_next_value (&_tmp153_)) != NULL; _tmp152__length1++) {
-               if (_tmp152__size == _tmp152__length) {
-                       _tmp152__size = 2 * _tmp152__size;
-                       _tmp152_ = g_renew (gchar*, _tmp152_, _tmp152__size + 1);
-               }
-               _tmp152_[_tmp152__length++] = g_variant_dup_string (_tmp154_, NULL);
-               g_variant_unref (_tmp154_);
-       }
-       _result_length1 = _tmp152__length1;
-       _tmp152_[_tmp152__length] = NULL;
-       _result = _tmp152_;
-       *result_length1 = _result_length1;
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gboolean unit_dbus_proxy_get_need_daemon_reload (Unit* self) {
-       GVariant *_inner_reply;
-       gboolean _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "NeedDaemonReload");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("NeedDaemonReload"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return FALSE;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_boolean (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static guint64 unit_dbus_proxy_get_job_timeout_usec (Unit* self) {
-       GVariant *_inner_reply;
-       guint64 _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "JobTimeoutUsec");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Unit"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("JobTimeoutUsec"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return 0ULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_uint64 (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static void unit_proxy_unit_interface_init (UnitIface* iface) {
-       iface->start = unit_proxy_start;
-       iface->stop = unit_proxy_stop;
-       iface->reload = unit_proxy_reload;
-       iface->restart = unit_proxy_restart;
-       iface->try_restart = unit_proxy_try_restart;
-       iface->reload_or_restart = unit_proxy_reload_or_restart;
-       iface->reload_or_try_restart = unit_proxy_reload_or_try_restart;
-       iface->reset_failed = unit_proxy_reset_failed;
-       iface->get_id = unit_dbus_proxy_get_id;
-       iface->get_names = unit_dbus_proxy_get_names;
-       iface->get_following = unit_dbus_proxy_get_following;
-       iface->get_requires = unit_dbus_proxy_get_requires;
-       iface->get_requires_overridable = unit_dbus_proxy_get_requires_overridable;
-       iface->get_requisite = unit_dbus_proxy_get_requisite;
-       iface->get_requisite_overridable = unit_dbus_proxy_get_requisite_overridable;
-       iface->get_wants = unit_dbus_proxy_get_wants;
-       iface->get_required_by = unit_dbus_proxy_get_required_by;
-       iface->get_required_by_overridable = unit_dbus_proxy_get_required_by_overridable;
-       iface->get_wanted_by = unit_dbus_proxy_get_wanted_by;
-       iface->get_conflicts = unit_dbus_proxy_get_conflicts;
-       iface->get_conflicted_by = unit_dbus_proxy_get_conflicted_by;
-       iface->get_before = unit_dbus_proxy_get_before;
-       iface->get_after = unit_dbus_proxy_get_after;
-       iface->get_on_failure = unit_dbus_proxy_get_on_failure;
-       iface->get_description = unit_dbus_proxy_get_description;
-       iface->get_load_state = unit_dbus_proxy_get_load_state;
-       iface->get_active_state = unit_dbus_proxy_get_active_state;
-       iface->get_sub_state = unit_dbus_proxy_get_sub_state;
-       iface->get_fragment_path = unit_dbus_proxy_get_fragment_path;
-       iface->get_inactive_exit_timestamp = unit_dbus_proxy_get_inactive_exit_timestamp;
-       iface->get_active_enter_timestamp = unit_dbus_proxy_get_active_enter_timestamp;
-       iface->get_active_exit_timestamp = unit_dbus_proxy_get_active_exit_timestamp;
-       iface->get_inactive_enter_timestamp = unit_dbus_proxy_get_inactive_enter_timestamp;
-       iface->get_can_start = unit_dbus_proxy_get_can_start;
-       iface->get_can_stop = unit_dbus_proxy_get_can_stop;
-       iface->get_can_reload = unit_dbus_proxy_get_can_reload;
-       iface->get_job = unit_dbus_proxy_get_job;
-       iface->get_recursive_stop = unit_dbus_proxy_get_recursive_stop;
-       iface->get_stop_when_unneeded = unit_dbus_proxy_get_stop_when_unneeded;
-       iface->get_refuse_manual_start = unit_dbus_proxy_get_refuse_manual_start;
-       iface->get_refuse_manual_stop = unit_dbus_proxy_get_refuse_manual_stop;
-       iface->get_default_dependencies = unit_dbus_proxy_get_default_dependencies;
-       iface->get_default_control_group = unit_dbus_proxy_get_default_control_group;
-       iface->get_control_groups = unit_dbus_proxy_get_control_groups;
-       iface->get_need_daemon_reload = unit_dbus_proxy_get_need_daemon_reload;
-       iface->get_job_timeout_usec = unit_dbus_proxy_get_job_timeout_usec;
-}
-
-
-static void _dbus_unit_start (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp155_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp155_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp155_, NULL);
-       g_variant_unref (_tmp155_);
-       result = unit_start (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_stop (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp156_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp156_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp156_, NULL);
-       g_variant_unref (_tmp156_);
-       result = unit_stop (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_reload (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp157_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp157_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp157_, NULL);
-       g_variant_unref (_tmp157_);
-       result = unit_reload (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp158_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp158_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp158_, NULL);
-       g_variant_unref (_tmp158_);
-       result = unit_restart (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_try_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp159_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp159_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp159_, NULL);
-       g_variant_unref (_tmp159_);
-       result = unit_try_restart (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_reload_or_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp160_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp160_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp160_, NULL);
-       g_variant_unref (_tmp160_);
-       result = unit_reload_or_restart (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_reload_or_try_restart (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* mode = NULL;
-       GVariant* _tmp161_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       char* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp161_ = g_variant_iter_next_value (&_arguments_iter);
-       mode = g_variant_dup_string (_tmp161_, NULL);
-       g_variant_unref (_tmp161_);
-       result = unit_reload_or_try_restart (self, mode, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_object_path (result));
-       _g_free0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (mode);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void _dbus_unit_reset_failed (Unit* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       unit_reset_failed (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void unit_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (method_name, "Start") == 0) {
-               _dbus_unit_start (object, parameters, invocation);
-       } else if (strcmp (method_name, "Stop") == 0) {
-               _dbus_unit_stop (object, parameters, invocation);
-       } else if (strcmp (method_name, "Reload") == 0) {
-               _dbus_unit_reload (object, parameters, invocation);
-       } else if (strcmp (method_name, "Restart") == 0) {
-               _dbus_unit_restart (object, parameters, invocation);
-       } else if (strcmp (method_name, "TryRestart") == 0) {
-               _dbus_unit_try_restart (object, parameters, invocation);
-       } else if (strcmp (method_name, "ReloadOrRestart") == 0) {
-               _dbus_unit_reload_or_restart (object, parameters, invocation);
-       } else if (strcmp (method_name, "ReloadOrTryRestart") == 0) {
-               _dbus_unit_reload_or_try_restart (object, parameters, invocation);
-       } else if (strcmp (method_name, "ResetFailed") == 0) {
-               _dbus_unit_reset_failed (object, parameters, invocation);
-       } else {
-               g_object_unref (invocation);
-       }
-}
-
-
-static GVariant* _dbus_unit_get_id (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_id (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_names (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp162_;
-       GVariantBuilder _tmp163_;
-       int _tmp164_;
-       GVariant* _reply;
-       result = unit_get_names (self, &result_length1);
-       _tmp162_ = result;
-       g_variant_builder_init (&_tmp163_, G_VARIANT_TYPE ("as"));
-       for (_tmp164_ = 0; _tmp164_ < result_length1; _tmp164_++) {
-               g_variant_builder_add_value (&_tmp163_, g_variant_new_string (*_tmp162_));
-               _tmp162_++;
-       }
-       _reply = g_variant_builder_end (&_tmp163_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_following (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_following (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_requires (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp165_;
-       GVariantBuilder _tmp166_;
-       int _tmp167_;
-       GVariant* _reply;
-       result = unit_get_requires (self, &result_length1);
-       _tmp165_ = result;
-       g_variant_builder_init (&_tmp166_, G_VARIANT_TYPE ("as"));
-       for (_tmp167_ = 0; _tmp167_ < result_length1; _tmp167_++) {
-               g_variant_builder_add_value (&_tmp166_, g_variant_new_string (*_tmp165_));
-               _tmp165_++;
-       }
-       _reply = g_variant_builder_end (&_tmp166_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_requires_overridable (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp168_;
-       GVariantBuilder _tmp169_;
-       int _tmp170_;
-       GVariant* _reply;
-       result = unit_get_requires_overridable (self, &result_length1);
-       _tmp168_ = result;
-       g_variant_builder_init (&_tmp169_, G_VARIANT_TYPE ("as"));
-       for (_tmp170_ = 0; _tmp170_ < result_length1; _tmp170_++) {
-               g_variant_builder_add_value (&_tmp169_, g_variant_new_string (*_tmp168_));
-               _tmp168_++;
-       }
-       _reply = g_variant_builder_end (&_tmp169_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_requisite (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp171_;
-       GVariantBuilder _tmp172_;
-       int _tmp173_;
-       GVariant* _reply;
-       result = unit_get_requisite (self, &result_length1);
-       _tmp171_ = result;
-       g_variant_builder_init (&_tmp172_, G_VARIANT_TYPE ("as"));
-       for (_tmp173_ = 0; _tmp173_ < result_length1; _tmp173_++) {
-               g_variant_builder_add_value (&_tmp172_, g_variant_new_string (*_tmp171_));
-               _tmp171_++;
-       }
-       _reply = g_variant_builder_end (&_tmp172_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_requisite_overridable (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp174_;
-       GVariantBuilder _tmp175_;
-       int _tmp176_;
-       GVariant* _reply;
-       result = unit_get_requisite_overridable (self, &result_length1);
-       _tmp174_ = result;
-       g_variant_builder_init (&_tmp175_, G_VARIANT_TYPE ("as"));
-       for (_tmp176_ = 0; _tmp176_ < result_length1; _tmp176_++) {
-               g_variant_builder_add_value (&_tmp175_, g_variant_new_string (*_tmp174_));
-               _tmp174_++;
-       }
-       _reply = g_variant_builder_end (&_tmp175_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_wants (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp177_;
-       GVariantBuilder _tmp178_;
-       int _tmp179_;
-       GVariant* _reply;
-       result = unit_get_wants (self, &result_length1);
-       _tmp177_ = result;
-       g_variant_builder_init (&_tmp178_, G_VARIANT_TYPE ("as"));
-       for (_tmp179_ = 0; _tmp179_ < result_length1; _tmp179_++) {
-               g_variant_builder_add_value (&_tmp178_, g_variant_new_string (*_tmp177_));
-               _tmp177_++;
-       }
-       _reply = g_variant_builder_end (&_tmp178_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_required_by (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp180_;
-       GVariantBuilder _tmp181_;
-       int _tmp182_;
-       GVariant* _reply;
-       result = unit_get_required_by (self, &result_length1);
-       _tmp180_ = result;
-       g_variant_builder_init (&_tmp181_, G_VARIANT_TYPE ("as"));
-       for (_tmp182_ = 0; _tmp182_ < result_length1; _tmp182_++) {
-               g_variant_builder_add_value (&_tmp181_, g_variant_new_string (*_tmp180_));
-               _tmp180_++;
-       }
-       _reply = g_variant_builder_end (&_tmp181_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_required_by_overridable (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp183_;
-       GVariantBuilder _tmp184_;
-       int _tmp185_;
-       GVariant* _reply;
-       result = unit_get_required_by_overridable (self, &result_length1);
-       _tmp183_ = result;
-       g_variant_builder_init (&_tmp184_, G_VARIANT_TYPE ("as"));
-       for (_tmp185_ = 0; _tmp185_ < result_length1; _tmp185_++) {
-               g_variant_builder_add_value (&_tmp184_, g_variant_new_string (*_tmp183_));
-               _tmp183_++;
-       }
-       _reply = g_variant_builder_end (&_tmp184_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_wanted_by (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp186_;
-       GVariantBuilder _tmp187_;
-       int _tmp188_;
-       GVariant* _reply;
-       result = unit_get_wanted_by (self, &result_length1);
-       _tmp186_ = result;
-       g_variant_builder_init (&_tmp187_, G_VARIANT_TYPE ("as"));
-       for (_tmp188_ = 0; _tmp188_ < result_length1; _tmp188_++) {
-               g_variant_builder_add_value (&_tmp187_, g_variant_new_string (*_tmp186_));
-               _tmp186_++;
-       }
-       _reply = g_variant_builder_end (&_tmp187_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_conflicts (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp189_;
-       GVariantBuilder _tmp190_;
-       int _tmp191_;
-       GVariant* _reply;
-       result = unit_get_conflicts (self, &result_length1);
-       _tmp189_ = result;
-       g_variant_builder_init (&_tmp190_, G_VARIANT_TYPE ("as"));
-       for (_tmp191_ = 0; _tmp191_ < result_length1; _tmp191_++) {
-               g_variant_builder_add_value (&_tmp190_, g_variant_new_string (*_tmp189_));
-               _tmp189_++;
-       }
-       _reply = g_variant_builder_end (&_tmp190_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_conflicted_by (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp192_;
-       GVariantBuilder _tmp193_;
-       int _tmp194_;
-       GVariant* _reply;
-       result = unit_get_conflicted_by (self, &result_length1);
-       _tmp192_ = result;
-       g_variant_builder_init (&_tmp193_, G_VARIANT_TYPE ("as"));
-       for (_tmp194_ = 0; _tmp194_ < result_length1; _tmp194_++) {
-               g_variant_builder_add_value (&_tmp193_, g_variant_new_string (*_tmp192_));
-               _tmp192_++;
-       }
-       _reply = g_variant_builder_end (&_tmp193_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_before (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp195_;
-       GVariantBuilder _tmp196_;
-       int _tmp197_;
-       GVariant* _reply;
-       result = unit_get_before (self, &result_length1);
-       _tmp195_ = result;
-       g_variant_builder_init (&_tmp196_, G_VARIANT_TYPE ("as"));
-       for (_tmp197_ = 0; _tmp197_ < result_length1; _tmp197_++) {
-               g_variant_builder_add_value (&_tmp196_, g_variant_new_string (*_tmp195_));
-               _tmp195_++;
-       }
-       _reply = g_variant_builder_end (&_tmp196_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_after (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp198_;
-       GVariantBuilder _tmp199_;
-       int _tmp200_;
-       GVariant* _reply;
-       result = unit_get_after (self, &result_length1);
-       _tmp198_ = result;
-       g_variant_builder_init (&_tmp199_, G_VARIANT_TYPE ("as"));
-       for (_tmp200_ = 0; _tmp200_ < result_length1; _tmp200_++) {
-               g_variant_builder_add_value (&_tmp199_, g_variant_new_string (*_tmp198_));
-               _tmp198_++;
-       }
-       _reply = g_variant_builder_end (&_tmp199_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_on_failure (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp201_;
-       GVariantBuilder _tmp202_;
-       int _tmp203_;
-       GVariant* _reply;
-       result = unit_get_on_failure (self, &result_length1);
-       _tmp201_ = result;
-       g_variant_builder_init (&_tmp202_, G_VARIANT_TYPE ("as"));
-       for (_tmp203_ = 0; _tmp203_ < result_length1; _tmp203_++) {
-               g_variant_builder_add_value (&_tmp202_, g_variant_new_string (*_tmp201_));
-               _tmp201_++;
-       }
-       _reply = g_variant_builder_end (&_tmp202_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_description (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_description (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_load_state (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_load_state (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_active_state (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_active_state (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_sub_state (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_sub_state (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_fragment_path (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_fragment_path (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_inactive_exit_timestamp (Unit* self) {
-       guint64 result;
-       GVariant* _reply;
-       result = unit_get_inactive_exit_timestamp (self);
-       _reply = g_variant_new_uint64 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_active_enter_timestamp (Unit* self) {
-       guint64 result;
-       GVariant* _reply;
-       result = unit_get_active_enter_timestamp (self);
-       _reply = g_variant_new_uint64 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_active_exit_timestamp (Unit* self) {
-       guint64 result;
-       GVariant* _reply;
-       result = unit_get_active_exit_timestamp (self);
-       _reply = g_variant_new_uint64 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_inactive_enter_timestamp (Unit* self) {
-       guint64 result;
-       GVariant* _reply;
-       result = unit_get_inactive_enter_timestamp (self);
-       _reply = g_variant_new_uint64 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_can_start (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_can_start (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_can_stop (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_can_stop (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_can_reload (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_can_reload (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_job (Unit* self) {
-       UnitJobLink result = {0};
-       GVariantBuilder _tmp204_;
-       GVariant* _reply;
-       unit_get_job (self, &result);
-       g_variant_builder_init (&_tmp204_, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_tmp204_, g_variant_new_uint32 (result.id));
-       g_variant_builder_add_value (&_tmp204_, g_variant_new_object_path (result.path));
-       _reply = g_variant_builder_end (&_tmp204_);
-       unit_job_link_destroy (&result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_recursive_stop (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_recursive_stop (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_stop_when_unneeded (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_stop_when_unneeded (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_refuse_manual_start (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_refuse_manual_start (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_refuse_manual_stop (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_refuse_manual_stop (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_default_dependencies (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_default_dependencies (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_default_control_group (Unit* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = unit_get_default_control_group (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_control_groups (Unit* self) {
-       gchar** result;
-       int result_length1;
-       gchar** _tmp205_;
-       GVariantBuilder _tmp206_;
-       int _tmp207_;
-       GVariant* _reply;
-       result = unit_get_control_groups (self, &result_length1);
-       _tmp205_ = result;
-       g_variant_builder_init (&_tmp206_, G_VARIANT_TYPE ("as"));
-       for (_tmp207_ = 0; _tmp207_ < result_length1; _tmp207_++) {
-               g_variant_builder_add_value (&_tmp206_, g_variant_new_string (*_tmp205_));
-               _tmp205_++;
-       }
-       _reply = g_variant_builder_end (&_tmp206_);
-       result = (_vala_array_free (result, result_length1, (GDestroyNotify) g_free), NULL);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_need_daemon_reload (Unit* self) {
-       gboolean result;
-       GVariant* _reply;
-       result = unit_get_need_daemon_reload (self);
-       _reply = g_variant_new_boolean (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_unit_get_job_timeout_usec (Unit* self) {
-       guint64 result;
-       GVariant* _reply;
-       result = unit_get_job_timeout_usec (self);
-       _reply = g_variant_new_uint64 (result);
-       return _reply;
-}
-
-
-static GVariant* unit_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (property_name, "Id") == 0) {
-               return _dbus_unit_get_id (object);
-       } else if (strcmp (property_name, "Names") == 0) {
-               return _dbus_unit_get_names (object);
-       } else if (strcmp (property_name, "Following") == 0) {
-               return _dbus_unit_get_following (object);
-       } else if (strcmp (property_name, "Requires") == 0) {
-               return _dbus_unit_get_requires (object);
-       } else if (strcmp (property_name, "RequiresOverridable") == 0) {
-               return _dbus_unit_get_requires_overridable (object);
-       } else if (strcmp (property_name, "Requisite") == 0) {
-               return _dbus_unit_get_requisite (object);
-       } else if (strcmp (property_name, "RequisiteOverridable") == 0) {
-               return _dbus_unit_get_requisite_overridable (object);
-       } else if (strcmp (property_name, "Wants") == 0) {
-               return _dbus_unit_get_wants (object);
-       } else if (strcmp (property_name, "RequiredBy") == 0) {
-               return _dbus_unit_get_required_by (object);
-       } else if (strcmp (property_name, "RequiredByOverridable") == 0) {
-               return _dbus_unit_get_required_by_overridable (object);
-       } else if (strcmp (property_name, "WantedBy") == 0) {
-               return _dbus_unit_get_wanted_by (object);
-       } else if (strcmp (property_name, "Conflicts") == 0) {
-               return _dbus_unit_get_conflicts (object);
-       } else if (strcmp (property_name, "ConflictedBy") == 0) {
-               return _dbus_unit_get_conflicted_by (object);
-       } else if (strcmp (property_name, "Before") == 0) {
-               return _dbus_unit_get_before (object);
-       } else if (strcmp (property_name, "After") == 0) {
-               return _dbus_unit_get_after (object);
-       } else if (strcmp (property_name, "OnFailure") == 0) {
-               return _dbus_unit_get_on_failure (object);
-       } else if (strcmp (property_name, "Description") == 0) {
-               return _dbus_unit_get_description (object);
-       } else if (strcmp (property_name, "LoadState") == 0) {
-               return _dbus_unit_get_load_state (object);
-       } else if (strcmp (property_name, "ActiveState") == 0) {
-               return _dbus_unit_get_active_state (object);
-       } else if (strcmp (property_name, "SubState") == 0) {
-               return _dbus_unit_get_sub_state (object);
-       } else if (strcmp (property_name, "FragmentPath") == 0) {
-               return _dbus_unit_get_fragment_path (object);
-       } else if (strcmp (property_name, "InactiveExitTimestamp") == 0) {
-               return _dbus_unit_get_inactive_exit_timestamp (object);
-       } else if (strcmp (property_name, "ActiveEnterTimestamp") == 0) {
-               return _dbus_unit_get_active_enter_timestamp (object);
-       } else if (strcmp (property_name, "ActiveExitTimestamp") == 0) {
-               return _dbus_unit_get_active_exit_timestamp (object);
-       } else if (strcmp (property_name, "InactiveEnterTimestamp") == 0) {
-               return _dbus_unit_get_inactive_enter_timestamp (object);
-       } else if (strcmp (property_name, "CanStart") == 0) {
-               return _dbus_unit_get_can_start (object);
-       } else if (strcmp (property_name, "CanStop") == 0) {
-               return _dbus_unit_get_can_stop (object);
-       } else if (strcmp (property_name, "CanReload") == 0) {
-               return _dbus_unit_get_can_reload (object);
-       } else if (strcmp (property_name, "Job") == 0) {
-               return _dbus_unit_get_job (object);
-       } else if (strcmp (property_name, "RecursiveStop") == 0) {
-               return _dbus_unit_get_recursive_stop (object);
-       } else if (strcmp (property_name, "StopWhenUnneeded") == 0) {
-               return _dbus_unit_get_stop_when_unneeded (object);
-       } else if (strcmp (property_name, "RefuseManualStart") == 0) {
-               return _dbus_unit_get_refuse_manual_start (object);
-       } else if (strcmp (property_name, "RefuseManualStop") == 0) {
-               return _dbus_unit_get_refuse_manual_stop (object);
-       } else if (strcmp (property_name, "DefaultDependencies") == 0) {
-               return _dbus_unit_get_default_dependencies (object);
-       } else if (strcmp (property_name, "DefaultControlGroup") == 0) {
-               return _dbus_unit_get_default_control_group (object);
-       } else if (strcmp (property_name, "ControlGroups") == 0) {
-               return _dbus_unit_get_control_groups (object);
-       } else if (strcmp (property_name, "NeedDaemonReload") == 0) {
-               return _dbus_unit_get_need_daemon_reload (object);
-       } else if (strcmp (property_name, "JobTimeoutUsec") == 0) {
-               return _dbus_unit_get_job_timeout_usec (object);
-       }
-       return NULL;
-}
-
-
-static gboolean unit_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       return FALSE;
-}
-
-
-guint unit_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) {
-       guint result;
-       gpointer *data;
-       data = g_new (gpointer, 3);
-       data[0] = g_object_ref (object);
-       data[1] = g_object_ref (connection);
-       data[2] = g_strdup (path);
-       result = g_dbus_connection_register_object (connection, path, (GDBusInterfaceInfo *) (&_unit_dbus_interface_info), &_unit_dbus_interface_vtable, data, _unit_unregister_object, error);
-       if (!result) {
-               return 0;
-       }
-       return result;
-}
-
-
-static void _unit_unregister_object (gpointer user_data) {
-       gpointer* data;
-       data = user_data;
-       g_object_unref (data[0]);
-       g_object_unref (data[1]);
-       g_free (data[2]);
-       g_free (data);
-}
-
-
-void job_cancel (Job* self, GError** error) {
-#line 160 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 160 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       JOB_GET_INTERFACE (self)->cancel (self, error);
-#line 6747 "systemd-interfaces.c"
-}
-
-
-guint32 job_get_id (Job* self) {
-#line 155 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, 0U);
-#line 155 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return JOB_GET_INTERFACE (self)->get_id (self);
-#line 6756 "systemd-interfaces.c"
-}
-
-
-gchar* job_get_state (Job* self) {
-#line 156 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 156 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return JOB_GET_INTERFACE (self)->get_state (self);
-#line 6765 "systemd-interfaces.c"
-}
-
-
-gchar* job_get_job_type (Job* self) {
-#line 157 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 157 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return JOB_GET_INTERFACE (self)->get_job_type (self);
-#line 6774 "systemd-interfaces.c"
-}
-
-
-void job_get_unit (Job* self, JobUnitLink* result) {
-#line 158 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (self != NULL);
-#line 158 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       JOB_GET_INTERFACE (self)->get_unit (self, result);
-#line 6783 "systemd-interfaces.c"
-}
-
-
-void job_unit_link_copy (const JobUnitLink* self, JobUnitLink* dest) {
-       const gchar* _tmp0_;
-       gchar* _tmp1_;
-       const char* _tmp2_;
-       char* _tmp3_;
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp0_ = (*self).id;
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp1_ = g_strdup (_tmp0_);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).id);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).id = _tmp1_;
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp2_ = (*self).path;
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _tmp3_ = g_strdup (_tmp2_);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*dest).path);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       (*dest).path = _tmp3_;
-#line 6808 "systemd-interfaces.c"
-}
-
-
-void job_unit_link_destroy (JobUnitLink* self) {
-#line 151 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).id);
-#line 152 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       _g_free0 ((*self).path);
-#line 6817 "systemd-interfaces.c"
-}
-
-
-JobUnitLink* job_unit_link_dup (const JobUnitLink* self) {
-       JobUnitLink* dup;
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       dup = g_new0 (JobUnitLink, 1);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       job_unit_link_copy (self, dup);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return dup;
-#line 6829 "systemd-interfaces.c"
-}
-
-
-void job_unit_link_free (JobUnitLink* self) {
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       job_unit_link_destroy (self);
-#line 150 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_free (self);
-#line 6838 "systemd-interfaces.c"
-}
-
-
-GType job_unit_link_get_type (void) {
-       static volatile gsize job_unit_link_type_id__volatile = 0;
-       if (g_once_init_enter (&job_unit_link_type_id__volatile)) {
-               GType job_unit_link_type_id;
-               job_unit_link_type_id = g_boxed_type_register_static ("JobUnitLink", (GBoxedCopyFunc) job_unit_link_dup, (GBoxedFreeFunc) job_unit_link_free);
-               g_once_init_leave (&job_unit_link_type_id__volatile, job_unit_link_type_id);
-       }
-       return job_unit_link_type_id__volatile;
-}
-
-
-static void job_base_init (JobIface * iface) {
-#line 149 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       static gboolean initialized = FALSE;
-#line 149 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (!initialized) {
-#line 149 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               initialized = TRUE;
-#line 6860 "systemd-interfaces.c"
-       }
-}
-
-
-GType job_get_type (void) {
-       static volatile gsize job_type_id__volatile = 0;
-       if (g_once_init_enter (&job_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (JobIface), (GBaseInitFunc) job_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
-               GType job_type_id;
-               job_type_id = g_type_register_static (G_TYPE_INTERFACE, "Job", &g_define_type_info, 0);
-               g_type_interface_add_prerequisite (job_type_id, G_TYPE_DBUS_PROXY);
-               g_type_set_qdata (job_type_id, g_quark_from_static_string ("vala-dbus-proxy-type"), (void*) job_proxy_get_type);
-               g_type_set_qdata (job_type_id, g_quark_from_static_string ("vala-dbus-interface-name"), "org.freedesktop.systemd1.Job");
-               g_type_set_qdata (job_type_id, g_quark_from_static_string ("vala-dbus-register-object"), (void*) job_register_object);
-               g_once_init_leave (&job_type_id__volatile, job_type_id);
-       }
-       return job_type_id__volatile;
-}
-
-
-G_DEFINE_TYPE_EXTENDED (JobProxy, job_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_JOB, job_proxy_job_interface_init) )
-static void job_proxy_class_init (JobProxyClass* klass) {
-       G_DBUS_PROXY_CLASS (klass)->g_signal = job_proxy_g_signal;
-}
-
-
-static void job_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
-}
-
-
-static void job_proxy_init (JobProxy* self) {
-}
-
-
-static void job_proxy_cancel (Job* self, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.systemd1.Job", "Cancel");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return;
-       }
-       g_object_unref (_reply_message);
-}
-
-
-static guint32 job_dbus_proxy_get_id (Job* self) {
-       GVariant *_inner_reply;
-       guint32 _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Id");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Job"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Id"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return 0U;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_get_uint32 (_inner_reply);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* job_dbus_proxy_get_state (Job* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "State");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Job"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("State"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static gchar* job_dbus_proxy_get_job_type (Job* self) {
-       GVariant *_inner_reply;
-       gchar* _result;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "JobType");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Job"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("JobType"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return NULL;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       _result = g_variant_dup_string (_inner_reply, NULL);
-       g_variant_unref (_inner_reply);
-       return _result;
-}
-
-
-static void job_dbus_proxy_get_unit (Job* self, JobUnitLink* result) {
-       GVariant *_inner_reply;
-       JobUnitLink _tmp208_;
-       GVariantIter _tmp209_;
-       GVariant* _tmp210_;
-       GVariant* _tmp211_;
-       _inner_reply = g_dbus_proxy_get_cached_property ((GDBusProxy *) self, "Unit");
-       if (!_inner_reply) {
-               GVariant *_arguments;
-               GVariant *_reply;
-               GVariantBuilder _arguments_builder;
-               g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.freedesktop.systemd1.Job"));
-               g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("Unit"));
-               _arguments = g_variant_builder_end (&_arguments_builder);
-               _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
-               if (!_reply) {
-                       return;
-               }
-               g_variant_get (_reply, "(v)", &_inner_reply);
-               g_variant_unref (_reply);
-       }
-       g_variant_iter_init (&_tmp209_, _inner_reply);
-       _tmp210_ = g_variant_iter_next_value (&_tmp209_);
-       _tmp208_.id = g_variant_dup_string (_tmp210_, NULL);
-       g_variant_unref (_tmp210_);
-       _tmp211_ = g_variant_iter_next_value (&_tmp209_);
-       _tmp208_.path = g_variant_dup_string (_tmp211_, NULL);
-       g_variant_unref (_tmp211_);
-       *result = _tmp208_;
-       g_variant_unref (_inner_reply);
-       return;
-}
-
-
-static void job_proxy_job_interface_init (JobIface* iface) {
-       iface->cancel = job_proxy_cancel;
-       iface->get_id = job_dbus_proxy_get_id;
-       iface->get_state = job_dbus_proxy_get_state;
-       iface->get_job_type = job_dbus_proxy_get_job_type;
-       iface->get_unit = job_dbus_proxy_get_unit;
-}
-
-
-static void _dbus_job_cancel (Job* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       job_cancel (self, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void job_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (method_name, "Cancel") == 0) {
-               _dbus_job_cancel (object, parameters, invocation);
-       } else {
-               g_object_unref (invocation);
-       }
-}
-
-
-static GVariant* _dbus_job_get_id (Job* self) {
-       guint32 result;
-       GVariant* _reply;
-       result = job_get_id (self);
-       _reply = g_variant_new_uint32 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_job_get_state (Job* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = job_get_state (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_job_get_job_type (Job* self) {
-       gchar* result;
-       GVariant* _reply;
-       result = job_get_job_type (self);
-       _reply = g_variant_new_string (result);
-       _g_free0 (result);
-       return _reply;
-}
-
-
-static GVariant* _dbus_job_get_unit (Job* self) {
-       JobUnitLink result = {0};
-       GVariantBuilder _tmp212_;
-       GVariant* _reply;
-       job_get_unit (self, &result);
-       g_variant_builder_init (&_tmp212_, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_tmp212_, g_variant_new_string (result.id));
-       g_variant_builder_add_value (&_tmp212_, g_variant_new_object_path (result.path));
-       _reply = g_variant_builder_end (&_tmp212_);
-       job_unit_link_destroy (&result);
-       return _reply;
-}
-
-
-static GVariant* job_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (property_name, "Id") == 0) {
-               return _dbus_job_get_id (object);
-       } else if (strcmp (property_name, "State") == 0) {
-               return _dbus_job_get_state (object);
-       } else if (strcmp (property_name, "JobType") == 0) {
-               return _dbus_job_get_job_type (object);
-       } else if (strcmp (property_name, "Unit") == 0) {
-               return _dbus_job_get_unit (object);
-       }
-       return NULL;
-}
-
-
-static gboolean job_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       return FALSE;
-}
-
-
-guint job_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) {
-       guint result;
-       gpointer *data;
-       data = g_new (gpointer, 3);
-       data[0] = g_object_ref (object);
-       data[1] = g_object_ref (connection);
-       data[2] = g_strdup (path);
-       result = g_dbus_connection_register_object (connection, path, (GDBusInterfaceInfo *) (&_job_dbus_interface_info), &_job_dbus_interface_vtable, data, _job_unregister_object, error);
-       if (!result) {
-               return 0;
-       }
-       return result;
-}
-
-
-static void _job_unregister_object (gpointer user_data) {
-       gpointer* data;
-       data = user_data;
-       g_object_unref (data[0]);
-       g_object_unref (data[1]);
-       g_free (data[2]);
-       g_free (data);
-}
-
-
-GVariant* properties_get (Properties* self, const gchar* iface, const gchar* property, GError** error) {
-#line 165 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_val_if_fail (self != NULL, NULL);
-#line 165 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       return PROPERTIES_GET_INTERFACE (self)->get (self, iface, property, error);
-#line 7172 "systemd-interfaces.c"
-}
-
-
-static void g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
-       typedef void (*GMarshalFunc_VOID__STRING_BOXED_BOXED_INT) (gpointer data1, const char* arg_1, gpointer arg_2, gpointer arg_3, gint arg_4, gpointer data2);
-       register GMarshalFunc_VOID__STRING_BOXED_BOXED_INT callback;
-       register GCClosure * cc;
-       register gpointer data1;
-       register gpointer data2;
-       cc = (GCClosure *) closure;
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       g_return_if_fail (n_param_values == 5);
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = closure->data;
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = param_values->data[0].v_pointer;
-#line 7191 "systemd-interfaces.c"
-       } else {
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data1 = param_values->data[0].v_pointer;
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               data2 = closure->data;
-#line 7197 "systemd-interfaces.c"
-       }
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback = (GMarshalFunc_VOID__STRING_BOXED_BOXED_INT) (marshal_data ? marshal_data : cc->callback);
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       callback (data1, g_value_get_string (param_values + 1), g_value_get_boxed (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_int (param_values + 4), data2);
-#line 7203 "systemd-interfaces.c"
-}
-
-
-static void properties_base_init (PropertiesIface * iface) {
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       static gboolean initialized = FALSE;
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-       if (!initialized) {
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               initialized = TRUE;
-#line 164 "/home/lennart/projects/systemd/src/systemd-interfaces.vala"
-               g_signal_new ("properties_changed", TYPE_PROPERTIES, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_BOXED_BOXED_INT, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_HASH_TABLE, G_TYPE_STRV, G_TYPE_INT);
-#line 7216 "systemd-interfaces.c"
-       }
-}
-
-
-GType properties_get_type (void) {
-       static volatile gsize properties_type_id__volatile = 0;
-       if (g_once_init_enter (&properties_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (PropertiesIface), (GBaseInitFunc) properties_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
-               GType properties_type_id;
-               properties_type_id = g_type_register_static (G_TYPE_INTERFACE, "Properties", &g_define_type_info, 0);
-               g_type_interface_add_prerequisite (properties_type_id, G_TYPE_DBUS_PROXY);
-               g_type_set_qdata (properties_type_id, g_quark_from_static_string ("vala-dbus-proxy-type"), (void*) properties_proxy_get_type);
-               g_type_set_qdata (properties_type_id, g_quark_from_static_string ("vala-dbus-interface-name"), "org.freedesktop.Properties");
-               g_type_set_qdata (properties_type_id, g_quark_from_static_string ("vala-dbus-register-object"), (void*) properties_register_object);
-               g_once_init_leave (&properties_type_id__volatile, properties_type_id);
-       }
-       return properties_type_id__volatile;
-}
-
-
-G_DEFINE_TYPE_EXTENDED (PropertiesProxy, properties_proxy, G_TYPE_DBUS_PROXY, 0, G_IMPLEMENT_INTERFACE (TYPE_PROPERTIES, properties_proxy_properties_interface_init) )
-static void properties_proxy_class_init (PropertiesProxyClass* klass) {
-       G_DBUS_PROXY_CLASS (klass)->g_signal = properties_proxy_g_signal;
-}
-
-
-static void _dbus_handle_properties_properties_changed (Properties* self, GVariant* parameters) {
-       GVariantIter _arguments_iter;
-       gchar* iface = NULL;
-       GVariant* _tmp213_;
-       GHashTable* changed_properties = NULL;
-       GVariant* _tmp214_;
-       GHashTable* _tmp215_;
-       GVariantIter _tmp216_;
-       GVariant* _tmp217_;
-       GVariant* _tmp218_;
-       gchar** invalidated_properties = NULL;
-       int invalidated_properties_length1;
-       GVariant* _tmp219_;
-       gchar** _tmp220_;
-       int _tmp220__length;
-       int _tmp220__size;
-       int _tmp220__length1;
-       GVariantIter _tmp221_;
-       GVariant* _tmp222_;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp213_ = g_variant_iter_next_value (&_arguments_iter);
-       iface = g_variant_dup_string (_tmp213_, NULL);
-       g_variant_unref (_tmp213_);
-       _tmp214_ = g_variant_iter_next_value (&_arguments_iter);
-       _tmp215_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-       g_variant_iter_init (&_tmp216_, _tmp214_);
-       while (g_variant_iter_loop (&_tmp216_, "{?*}", &_tmp217_, &_tmp218_)) {
-               g_hash_table_insert (_tmp215_, g_variant_dup_string (_tmp217_, NULL), g_variant_get_variant (_tmp218_));
-       }
-       changed_properties = _tmp215_;
-       g_variant_unref (_tmp214_);
-       invalidated_properties_length1 = 0;
-       _tmp219_ = g_variant_iter_next_value (&_arguments_iter);
-       _tmp220_ = g_new (gchar*, 5);
-       _tmp220__length = 0;
-       _tmp220__size = 4;
-       _tmp220__length1 = 0;
-       g_variant_iter_init (&_tmp221_, _tmp219_);
-       for (; (_tmp222_ = g_variant_iter_next_value (&_tmp221_)) != NULL; _tmp220__length1++) {
-               if (_tmp220__size == _tmp220__length) {
-                       _tmp220__size = 2 * _tmp220__size;
-                       _tmp220_ = g_renew (gchar*, _tmp220_, _tmp220__size + 1);
-               }
-               _tmp220_[_tmp220__length++] = g_variant_dup_string (_tmp222_, NULL);
-               g_variant_unref (_tmp222_);
-       }
-       invalidated_properties_length1 = _tmp220__length1;
-       _tmp220_[_tmp220__length] = NULL;
-       invalidated_properties = _tmp220_;
-       g_variant_unref (_tmp219_);
-       g_signal_emit_by_name (self, "properties-changed", iface, changed_properties, invalidated_properties, invalidated_properties_length1);
-       _g_free0 (iface);
-       _g_hash_table_unref0 (changed_properties);
-       invalidated_properties = (_vala_array_free (invalidated_properties, invalidated_properties_length1, (GDestroyNotify) g_free), NULL);
-}
-
-
-static void properties_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters) {
-       if (strcmp (signal_name, "PropertiesChanged") == 0) {
-               _dbus_handle_properties_properties_changed ((Properties*) proxy, parameters);
-       }
-}
-
-
-static void properties_proxy_init (PropertiesProxy* self) {
-}
-
-
-static GVariant* properties_proxy_get (Properties* self, const gchar* iface, const gchar* property, GError** error) {
-       GDBusMessage *_message;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GDBusMessage *_reply_message;
-       GVariant *_reply;
-       GVariantIter _reply_iter;
-       GVariant* _result;
-       GVariant* _tmp223_;
-       G_IO_ERROR;
-       _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.Properties", "Get");
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (iface));
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (property));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_message_set_body (_message, _arguments);
-       _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
-       g_object_unref (_message);
-       if (!_reply_message) {
-               return NULL;
-       }
-       if (g_dbus_message_to_gerror (_reply_message, error)) {
-               g_object_unref (_reply_message);
-               return NULL;
-       }
-       _reply = g_dbus_message_get_body (_reply_message);
-       g_variant_iter_init (&_reply_iter, _reply);
-       _tmp223_ = g_variant_iter_next_value (&_reply_iter);
-       _result = g_variant_get_variant (_tmp223_);
-       g_variant_unref (_tmp223_);
-       g_object_unref (_reply_message);
-       return _result;
-}
-
-
-static void properties_proxy_properties_interface_init (PropertiesIface* iface) {
-       iface->get = properties_proxy_get;
-}
-
-
-static void _dbus_properties_get (Properties* self, GVariant* parameters, GDBusMethodInvocation* invocation) {
-       GError* error = NULL;
-       GVariantIter _arguments_iter;
-       gchar* iface = NULL;
-       GVariant* _tmp224_;
-       gchar* property = NULL;
-       GVariant* _tmp225_;
-       GDBusMessage* _reply_message;
-       GVariant* _reply;
-       GVariantBuilder _reply_builder;
-       GVariant* result;
-       g_variant_iter_init (&_arguments_iter, parameters);
-       _tmp224_ = g_variant_iter_next_value (&_arguments_iter);
-       iface = g_variant_dup_string (_tmp224_, NULL);
-       g_variant_unref (_tmp224_);
-       _tmp225_ = g_variant_iter_next_value (&_arguments_iter);
-       property = g_variant_dup_string (_tmp225_, NULL);
-       g_variant_unref (_tmp225_);
-       result = properties_get (self, iface, property, &error);
-       if (error) {
-               g_dbus_method_invocation_return_gerror (invocation, error);
-               return;
-       }
-       _reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
-       g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_reply_builder, g_variant_new_variant (result));
-       _g_variant_unref0 (result);
-       _reply = g_variant_builder_end (&_reply_builder);
-       g_dbus_message_set_body (_reply_message, _reply);
-       _g_free0 (iface);
-       _g_free0 (property);
-       g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), _reply_message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
-       g_object_unref (invocation);
-       g_object_unref (_reply_message);
-}
-
-
-static void properties_dbus_interface_method_call (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* method_name, GVariant* parameters, GDBusMethodInvocation* invocation, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       if (strcmp (method_name, "Get") == 0) {
-               _dbus_properties_get (object, parameters, invocation);
-       } else {
-               g_object_unref (invocation);
-       }
-}
-
-
-static GVariant* properties_dbus_interface_get_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       return NULL;
-}
-
-
-static gboolean properties_dbus_interface_set_property (GDBusConnection* connection, const gchar* sender, const gchar* object_path, const gchar* interface_name, const gchar* property_name, GVariant* value, GError** error, gpointer user_data) {
-       gpointer* data;
-       gpointer object;
-       data = user_data;
-       object = data[0];
-       return FALSE;
-}
-
-
-static void _dbus_properties_properties_changed (GObject* _sender, const gchar* iface, GHashTable* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1, gpointer* _data) {
-       GDBusConnection * _connection;
-       const gchar * _path;
-       GVariant *_arguments;
-       GVariantBuilder _arguments_builder;
-       GVariantBuilder _tmp226_;
-       GHashTableIter _tmp227_;
-       gpointer _tmp228_;
-       gpointer _tmp229_;
-       gchar** _tmp230_;
-       GVariantBuilder _tmp231_;
-       int _tmp232_;
-       _connection = _data[1];
-       _path = _data[2];
-       g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
-       g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (iface));
-       g_hash_table_iter_init (&_tmp227_, changed_properties);
-       g_variant_builder_init (&_tmp226_, G_VARIANT_TYPE ("a{sv}"));
-       while (g_hash_table_iter_next (&_tmp227_, &_tmp228_, &_tmp229_)) {
-               gchar* _key;
-               GVariant* _value;
-               _key = (gchar*) _tmp228_;
-               _value = (GVariant*) _tmp229_;
-               g_variant_builder_add (&_tmp226_, "{?*}", g_variant_new_string (_key), g_variant_new_variant (_value));
-       }
-       g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp226_));
-       _tmp230_ = invalidated_properties;
-       g_variant_builder_init (&_tmp231_, G_VARIANT_TYPE ("as"));
-       for (_tmp232_ = 0; _tmp232_ < invalidated_properties_length1; _tmp232_++) {
-               g_variant_builder_add_value (&_tmp231_, g_variant_new_string (*_tmp230_));
-               _tmp230_++;
-       }
-       g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp231_));
-       _arguments = g_variant_builder_end (&_arguments_builder);
-       g_dbus_connection_emit_signal (_connection, NULL, _path, "org.freedesktop.Properties", "PropertiesChanged", _arguments, NULL);
-}
-
-
-guint properties_register_object (gpointer object, GDBusConnection* connection, const gchar* path, GError** error) {
-       guint result;
-       gpointer *data;
-       data = g_new (gpointer, 3);
-       data[0] = g_object_ref (object);
-       data[1] = g_object_ref (connection);
-       data[2] = g_strdup (path);
-       result = g_dbus_connection_register_object (connection, path, (GDBusInterfaceInfo *) (&_properties_dbus_interface_info), &_properties_dbus_interface_vtable, data, _properties_unregister_object, error);
-       if (!result) {
-               return 0;
-       }
-       g_signal_connect (object, "properties-changed", (GCallback) _dbus_properties_properties_changed, data);
-       return result;
-}
-
-
-static void _properties_unregister_object (gpointer user_data) {
-       gpointer* data;
-       data = user_data;
-       g_signal_handlers_disconnect_by_func (data[0], _dbus_properties_properties_changed, data);
-       g_object_unref (data[0]);
-       g_object_unref (data[1]);
-       g_free (data[2]);
-       g_free (data);
-}
-
-
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-       if ((array != NULL) && (destroy_func != NULL)) {
-               int i;
-               for (i = 0; i < array_length; i = i + 1) {
-                       if (((gpointer*) array)[i] != NULL) {
-                               destroy_func (((gpointer*) array)[i]);
-                       }
-               }
-       }
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-       _vala_array_destroy (array, array_length, destroy_func);
-       g_free (array);
-}
-
-
-
diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
deleted file mode 100644 (file)
index af2841e..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef fooid128hfoo
-#define fooid128hfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <stdbool.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef union sd_id128 sd_id128_t;
-
-union sd_id128 {
-        uint8_t bytes[16];
-        uint64_t qwords[2];
-};
-
-char *sd_id128_to_string(sd_id128_t id, char s[33]);
-
-int sd_id128_from_string(const char s[33], sd_id128_t *ret);
-
-int sd_id128_randomize(sd_id128_t *ret);
-
-int sd_id128_get_machine(sd_id128_t *ret);
-
-int sd_id128_get_boot(sd_id128_t *ret);
-
-#define SD_ID128_MAKE(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
-        ((sd_id128_t) { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \
-                                   0x##v8, 0x##v9, 0x##v10, 0x##v11, 0x##v12, 0x##v13, 0x##v14, 0x##v15 }})
-
-/* Note that SD_ID128_FORMAT_VAL will evaluate the passed argument 16
- * times. It is hence not a good idea to call this macro with an
- * expensive function as paramater or an expression with side
- * effects */
-#define SD_ID128_FORMAT_STR "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
-#define SD_ID128_FORMAT_VAL(x) (x).bytes[0], (x).bytes[1], (x).bytes[2], (x).bytes[3], (x).bytes[4], (x).bytes[5], (x).bytes[6], (x).bytes[7], (x).bytes[8], (x).bytes[9], (x).bytes[10], (x).bytes[11], (x).bytes[12], (x).bytes[13], (x).bytes[14], (x).bytes[15]
-
-static inline bool sd_id128_equal(sd_id128_t a, sd_id128_t b) {
-        return memcmp(&a, &b, 16) == 0;
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h
deleted file mode 100644 (file)
index 5a2dab1..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foojournalhfoo
-#define foojournalhfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <sys/uio.h>
-
-#include <systemd/sd-id128.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Write to daemon */
-
-int sd_journal_print(int piority, const char *format, ...) __attribute__ ((format (printf, 2, 3)));
-int sd_journal_printv(int priority, const char *format, va_list ap);
-
-int sd_journal_send(const char *format, ...) __attribute__((sentinel));
-int sd_journal_sendv(const struct iovec *iov, int n);
-
-int sd_journal_stream_fd(const char *identifier, int priority, int level_prefix);
-
-/* Browse journal stream */
-
-typedef struct sd_journal sd_journal;
-
-enum {
-        SD_JOURNAL_LOCAL_ONLY = 1,
-        SD_JOURNAL_RUNTIME_ONLY = 2,
-        SD_JOURNAL_SYSTEM_ONLY = 4
-};
-
-int sd_journal_open(sd_journal **ret, int flags);
-void sd_journal_close(sd_journal *j);
-
-int sd_journal_previous(sd_journal *j);
-int sd_journal_next(sd_journal *j);
-
-int sd_journal_previous_skip(sd_journal *j, uint64_t skip);
-int sd_journal_next_skip(sd_journal *j, uint64_t skip);
-
-int sd_journal_get_realtime_usec(sd_journal *j, uint64_t *ret);
-int sd_journal_get_monotonic_usec(sd_journal *j, uint64_t *ret, sd_id128_t *ret_boot_id);
-int sd_journal_get_data(sd_journal *j, const char *field, const void **data, size_t *l);
-int sd_journal_enumerate_data(sd_journal *j, const void **data, size_t *l);
-void sd_journal_restart_data(sd_journal *j);
-
-int sd_journal_add_match(sd_journal *j, const void *data, size_t size);
-void sd_journal_flush_matches(sd_journal *j);
-
-int sd_journal_seek_head(sd_journal *j);
-int sd_journal_seek_tail(sd_journal *j);
-int sd_journal_seek_monotonic_usec(sd_journal *j, sd_id128_t boot_id, uint64_t usec);
-int sd_journal_seek_realtime_usec(sd_journal *j, uint64_t usec);
-int sd_journal_seek_cursor(sd_journal *j, const char *cursor);
-
-int sd_journal_get_cursor(sd_journal *j, char **cursor);
-
-/* int sd_journal_query_unique(sd_journal *j, const char *field);      /\* missing *\/ */
-/* int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_t *l); /\* missing *\/ */
-/* void sd_journal_restart_unique(sd_journal *j);                      /\* missing *\/ */
-
-enum {
-        SD_JOURNAL_NOP,
-        SD_JOURNAL_APPEND,
-        SD_JOURNAL_INVALIDATE_ADD,
-        SD_JOURNAL_INVALIDATE_REMOVE
-};
-
-int sd_journal_get_fd(sd_journal *j);
-int sd_journal_process(sd_journal *j);
-
-#define SD_JOURNAL_FOREACH(j)                                           \
-        if (sd_journal_seek_head(j) >= 0)                               \
-                while (sd_journal_next(j) > 0)
-
-#define SD_JOURNAL_FOREACH_BACKWARDS(j)                                 \
-        if (sd_journal_seek_tail(j) >= 0)                               \
-                while (sd_journal_previous(j) > 0)
-
-#define SD_JOURNAL_FOREACH_DATA(j, data, l)                             \
-        for (sd_journal_restart_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
-
-#define SD_JOURNAL_FOREACH_UNIQUE(j, data, l)                           \
-        for (sd_journal_restart_unique(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; )
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h
deleted file mode 100644 (file)
index c5ac3ab..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-#ifndef foosdmessageshfoo
-#define foosdmessageshfoo
-
-/***
-  This file is part of systemd.
-
-  Copyright 2012 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <systemd/sd-id128.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define SD_MESSAGE_JOURNAL_START   SD_ID128_MAKE(f7,73,79,a8,49,0b,40,8b,be,5f,69,40,50,5a,77,7b)
-#define SD_MESSAGE_JOURNAL_STOP    SD_ID128_MAKE(d9,3f,b3,c9,c2,4d,45,1a,97,ce,a6,15,ce,59,c0,0b)
-#define SD_MESSAGE_JOURNAL_DROPPED SD_ID128_MAKE(a5,96,d6,fe,7b,fa,49,94,82,8e,72,30,9e,95,d6,1e)
-
-#define SD_MESSAGE_COREDUMP        SD_ID128_MAKE(fc,2e,22,bc,6e,e6,47,b6,b9,07,29,ab,34,a2,50,b1)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
index 6c1e0c3..340e990 100644 (file)
@@ -45,7 +45,7 @@ static void target_set_state(Target *t, TargetState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(t)->id,
+                          t->meta.id,
                           target_state_to_string(old_state),
                           target_state_to_string(state));
 
@@ -75,7 +75,7 @@ static int target_add_default_dependencies(Target *t) {
          * sure we don't create a loop. */
 
         for (k = 0; k < ELEMENTSOF(deps); k++)
-                SET_FOREACH(other, UNIT(t)->dependencies[deps[k]], i)
+                SET_FOREACH(other, t->meta.dependencies[deps[k]], i)
                         if ((r = unit_add_default_target_dependency(other, UNIT(t))) < 0)
                                 return r;
 
@@ -93,8 +93,8 @@ static int target_load(Unit *u) {
                 return r;
 
         /* This is a new unit? Then let's add in some extras */
-        if (u->load_state == UNIT_LOADED) {
-                if (u->default_dependencies)
+        if (u->meta.load_state == UNIT_LOADED) {
+                if (u->meta.default_dependencies)
                         if ((r = target_add_default_dependencies(t)) < 0)
                                 return r;
         }
@@ -199,7 +199,6 @@ DEFINE_STRING_TABLE_LOOKUP(target_state, TargetState);
 
 const UnitVTable target_vtable = {
         .suffix = ".target",
-        .object_size = sizeof(Target),
         .sections =
                 "Unit\0"
                 "Target\0"
index 5b97c86..b1d055f 100644 (file)
@@ -34,7 +34,7 @@ typedef enum TargetState {
 } TargetState;
 
 struct Target {
-        Unit meta;
+        Meta meta;
 
         TargetState state, deserialized_state;
 };
index 20c5d15..c7600d4 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <unistd.h>
 
-#include <systemd/sd-daemon.h>
+#include "sd-daemon.h"
 
 int main(int argc, char*argv[]) {
 
index 46a2d2c..60619b9 100644 (file)
@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) {
         Unit *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL, *g = NULL, *h = NULL;
         Job *j;
 
-        assert_se(set_unit_path("test") >= 0);
+        assert_se(set_unit_path("test2") >= 0);
 
         assert_se(manager_new(MANAGER_SYSTEM, &m) >= 0);
 
diff --git a/src/test-id128.c b/src/test-id128.c
deleted file mode 100644 (file)
index 617c955..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2011 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <string.h>
-
-#include <systemd/sd-id128.h>
-
-#include "util.h"
-#include "macro.h"
-
-#define ID128_WALDI SD_ID128_MAKE(01, 02, 03, 04, 05, 06, 07, 08, 09, 0a, 0b, 0c, 0d, 0e, 0f, 10)
-
-int main(int argc, char *argv[]) {
-        sd_id128_t id, id2;
-        char t[33];
-
-        assert_se(sd_id128_randomize(&id) == 0);
-        printf("random: %s\n", sd_id128_to_string(id, t));
-
-        assert_se(sd_id128_from_string(t, &id2) == 0);
-        assert_se(sd_id128_equal(id, id2));
-
-        assert_se(sd_id128_get_machine(&id) == 0);
-        printf("machine: %s\n", sd_id128_to_string(id, t));
-
-        assert_se(sd_id128_get_boot(&id) == 0);
-        printf("boot: %s\n", sd_id128_to_string(id, t));
-
-        printf("waldi: %s\n", sd_id128_to_string(ID128_WALDI, t));
-
-        printf("waldi2: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(ID128_WALDI));
-
-        return 0;
-}
similarity index 89%
rename from src/login/test-login.c
rename to src/test-login.c
index dd84042..7d6f082 100644 (file)
 #include <sys/poll.h>
 #include <string.h>
 
-#include <systemd/sd-login.h>
-
+#include "sd-login.h"
 #include "util.h"
 #include "strv.h"
 
 int main(int argc, char* argv[]) {
         int r, k;
         uid_t u, u2;
-        char *seat, *type, *class, *display;
+        char *seat;
         char *session;
         char *state;
         char *session2;
@@ -75,18 +74,6 @@ int main(int argc, char* argv[]) {
         printf("uid = %lu\n", (unsigned long) u);
         assert_se(u == u2);
 
-        assert_se(sd_session_get_type(session, &type) >= 0);
-        printf("type = %s\n", type);
-        free(type);
-
-        assert_se(sd_session_get_class(session, &class) >= 0);
-        printf("class = %s\n", class);
-        free(class);
-
-        assert_se(sd_session_get_display(session, &display) >= 0);
-        printf("display = %s\n", display);
-        free(display);
-
         assert_se(sd_session_get_seat(session, &seat) >= 0);
         printf("seat = %s\n", seat);
 
@@ -139,11 +126,6 @@ int main(int argc, char* argv[]) {
 
         assert_se(sd_get_seats(NULL) == r);
 
-        r = sd_seat_get_active(NULL, &t, NULL);
-        assert_se(r >= 0);
-        printf("active session on current seat = %s\n", t);
-        free(t);
-
         r = sd_get_sessions(&sessions);
         assert_se(r >= 0);
         assert_se(r == (int) strv_length(sessions));
similarity index 90%
rename from src/timedate/timedated.c
rename to src/timedated.c
index 6a7d980..16f54b5 100644 (file)
 
 const char timedate_interface[] _introspect_("timedate1") = INTERFACE;
 
-typedef struct TZ {
-        char *zone;
-        bool local_rtc;
-        int use_ntp;
-} TZ;
+static char *zone = NULL;
+static bool local_rtc = false;
+static int use_ntp = -1;
 
-static TZ tz = {
-        .use_ntp = -1,
-};
-
-static usec_t remain_until;
+static usec_t remain_until = 0;
 
 static void free_data(void) {
-        free(tz.zone);
-        tz.zone = NULL;
+        free(zone);
+        zone = NULL;
 
-        tz.local_rtc = false;
+        local_rtc = false;
 }
 
 static bool valid_timezone(const char *name) {
@@ -146,10 +140,10 @@ static void verify_timezone(void) {
         size_t l, q;
         int j, k;
 
-        if (!tz.zone)
+        if (!zone)
                 return;
 
-        p = strappend("/usr/share/zoneinfo/", tz.zone);
+        p = strappend("/usr/share/zoneinfo/", zone);
         if (!p) {
                 log_error("Out of memory");
                 return;
@@ -162,8 +156,8 @@ static void verify_timezone(void) {
 
         if (j < 0 || k < 0 || l != q || memcmp(a, b, l)) {
                 log_warning("/etc/localtime and /etc/timezone out of sync.");
-                free(tz.zone);
-                tz.zone = NULL;
+                free(zone);
+                zone = NULL;
         }
 
         free(a);
@@ -175,14 +169,14 @@ static int read_data(void) {
 
         free_data();
 
-        r = read_one_line_file("/etc/timezone", &tz.zone);
+        r = read_one_line_file("/etc/timezone", &zone);
         if (r < 0) {
                 if (r != -ENOENT)
                         log_warning("Failed to read /etc/timezone: %s", strerror(-r));
 
 #ifdef TARGET_FEDORA
                 r = parse_env_file("/etc/sysconfig/clock", NEWLINE,
-                                   "ZONE", &tz.zone,
+                                   "ZONE", &zone,
                                    NULL);
 
                 if (r < 0 && r != -ENOENT)
@@ -190,14 +184,14 @@ static int read_data(void) {
 #endif
         }
 
-        if (isempty(tz.zone)) {
-                free(tz.zone);
-                tz.zone = NULL;
+        if (isempty(zone)) {
+                free(zone);
+                zone = NULL;
         }
 
         verify_timezone();
 
-        tz.local_rtc = hwclock_is_localtime() > 0;
+        local_rtc = hwclock_is_localtime() > 0;
 
         return 0;
 }
@@ -206,7 +200,7 @@ static int write_data_timezone(void) {
         int r = 0;
         char *p;
 
-        if (!tz.zone) {
+        if (!zone) {
                 if (unlink("/etc/timezone") < 0 && errno != ENOENT)
                         r = -errno;
 
@@ -216,7 +210,7 @@ static int write_data_timezone(void) {
                 return r;
         }
 
-        p = strappend("/usr/share/zoneinfo/", tz.zone);
+        p = strappend("/usr/share/zoneinfo/", zone);
         if (!p) {
                 log_error("Out of memory");
                 return -ENOMEM;
@@ -228,7 +222,7 @@ static int write_data_timezone(void) {
         if (r < 0)
                 return r;
 
-        r = write_one_line_file_atomic("/etc/timezone", tz.zone);
+        r = write_one_line_file_atomic("/etc/timezone", zone);
         if (r < 0)
                 return r;
 
@@ -244,7 +238,7 @@ static int write_data_local_rtc(void) {
                 if (r != -ENOENT)
                         return r;
 
-                if (!tz.local_rtc)
+                if (!local_rtc)
                         return 0;
 
                 w = strdup(NULL_ADJTIME_LOCAL);
@@ -276,13 +270,13 @@ static int write_data_local_rtc(void) {
                 a = p - s;
                 b = strlen(e);
 
-                w = new(char, a + (tz.local_rtc ? 5 : 3) + b + 1);
+                w = new(char, a + (local_rtc ? 5 : 3) + b + 1);
                 if (!w) {
                         free(s);
                         return -ENOMEM;
                 }
 
-                *(char*) mempcpy(stpcpy(mempcpy(w, s, a), tz.local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
+                *(char*) mempcpy(stpcpy(mempcpy(w, s, a), local_rtc ? "LOCAL" : "UTC"), e, b) = 0;
 
                 if (streq(w, NULL_ADJTIME_UTC)) {
                         free(w);
@@ -334,14 +328,6 @@ static int read_ntp(DBusConnection *bus) {
 
         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
         if (!reply) {
-
-                if (streq(error.name, "org.freedesktop.DBus.Error.FileNotFound")) {
-                        /* NTP is not installed. */
-                        tz.use_ntp = false;
-                        r = 0;
-                        goto finish;
-                }
-
                 log_error("Failed to issue method call: %s", bus_error_message(&error));
                 r = -EIO;
                 goto finish;
@@ -355,7 +341,7 @@ static int read_ntp(DBusConnection *bus) {
                 goto finish;
         }
 
-        tz.use_ntp =
+        use_ntp =
                 streq(s, "enabled") ||
                 streq(s, "enabled-runtime");
         r = 0;
@@ -384,7 +370,7 @@ static int start_ntp(DBusConnection *bus, DBusError *error) {
                         "org.freedesktop.systemd1",
                         "/org/freedesktop/systemd1",
                         "org.freedesktop.systemd1.Manager",
-                        tz.use_ntp ? "StartUnit" : "StopUnit");
+                        use_ntp ? "StartUnit" : "StopUnit");
         if (!m) {
                 log_error("Could not allocate message.");
                 r = -ENOMEM;
@@ -433,7 +419,7 @@ static int enable_ntp(DBusConnection *bus, DBusError *error) {
                         "org.freedesktop.systemd1",
                         "/org/freedesktop/systemd1",
                         "org.freedesktop.systemd1.Manager",
-                        tz.use_ntp ? "EnableUnitFiles" : "DisableUnitFiles");
+                        use_ntp ? "EnableUnitFiles" : "DisableUnitFiles");
 
         if (!m) {
                 log_error("Could not allocate message.");
@@ -455,7 +441,7 @@ static int enable_ntp(DBusConnection *bus, DBusError *error) {
                 goto finish;
         }
 
-        if (tz.use_ntp) {
+        if (use_ntp) {
                 /* send force bool */
                 if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &t)) {
                         log_error("Failed to append force boolean.");
@@ -509,7 +495,7 @@ static int property_append_ntp(DBusMessageIter *i, const char *property, void *d
         assert(i);
         assert(property);
 
-        db = tz.use_ntp > 0;
+        db = use_ntp > 0;
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_BOOLEAN, &db))
                 return -ENOMEM;
@@ -517,23 +503,18 @@ static int property_append_ntp(DBusMessageIter *i, const char *property, void *d
         return 0;
 }
 
-static const BusProperty bus_timedate_properties[] = {
-        { "Timezone", bus_property_append_string, "s", offsetof(TZ, zone),     true },
-        { "LocalRTC", bus_property_append_bool,   "b", offsetof(TZ, local_rtc) },
-        { "NTP",      property_append_ntp,        "b", offsetof(TZ, use_ntp)   },
-        { NULL, }
-};
-
-static const BusBoundProperties bps[] = {
-        { "org.freedesktop.timedate1", bus_timedate_properties, &tz },
-        { NULL, }
-};
-
 static DBusHandlerResult timedate_message_handler(
                 DBusConnection *connection,
                 DBusMessage *message,
                 void *userdata) {
 
+        const BusProperty properties[] = {
+                { "org.freedesktop.timedate1", "Timezone", bus_property_append_string, "s", zone       },
+                { "org.freedesktop.timedate1", "LocalRTC", bus_property_append_bool,   "b", &local_rtc },
+                { "org.freedesktop.timedate1", "NTP",      property_append_ntp,        "b", NULL       },
+                { NULL, NULL, NULL, NULL, NULL }
+        };
+
         DBusMessage *reply = NULL, *changed = NULL;
         DBusError error;
         int r;
@@ -558,10 +539,10 @@ static DBusHandlerResult timedate_message_handler(
                 if (!valid_timezone(z))
                         return bus_send_error_reply(connection, message, NULL, -EINVAL);
 
-                if (!streq_ptr(z, tz.zone)) {
+                if (!streq_ptr(z, zone)) {
                         char *t;
 
-                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-timezone", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-timezone", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
@@ -569,8 +550,8 @@ static DBusHandlerResult timedate_message_handler(
                         if (!t)
                                 goto oom;
 
-                        free(tz.zone);
-                        tz.zone = t;
+                        free(zone);
+                        zone = t;
 
                         /* 1. Write new configuration file */
                         r = write_data_timezone();
@@ -579,7 +560,7 @@ static DBusHandlerResult timedate_message_handler(
                                 return bus_send_error_reply(connection, message, NULL, r);
                         }
 
-                        if (tz.local_rtc) {
+                        if (local_rtc) {
                                 struct timespec ts;
                                 struct tm *tm;
 
@@ -592,7 +573,7 @@ static DBusHandlerResult timedate_message_handler(
                                 hwclock_set_time(tm);
                         }
 
-                        log_info("Changed timezone to '%s'.", tz.zone);
+                        log_info("Changed timezone to '%s'.", zone);
 
                         changed = bus_properties_changed_new(
                                         "/org/freedesktop/timedate1",
@@ -616,14 +597,14 @@ static DBusHandlerResult timedate_message_handler(
                                     DBUS_TYPE_INVALID))
                         return bus_send_error_reply(connection, message, &error, -EINVAL);
 
-                if (lrtc != tz.local_rtc) {
+                if (lrtc != local_rtc) {
                         struct timespec ts;
 
-                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-local-rtc", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-local-rtc", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
-                        tz.local_rtc = lrtc;
+                        local_rtc = lrtc;
 
                         /* 1. Write new configuration file */
                         r = write_data_local_rtc();
@@ -633,7 +614,7 @@ static DBusHandlerResult timedate_message_handler(
                         }
 
                         /* 2. Teach kernel new timezone */
-                        if (tz.local_rtc)
+                        if (local_rtc)
                                 hwclock_apply_localtime_delta(NULL);
                         else
                                 hwclock_reset_localtime_delta();
@@ -647,7 +628,7 @@ static DBusHandlerResult timedate_message_handler(
                                 /* Sync system clock from RTC; first,
                                  * initialize the timezone fields of
                                  * struct tm. */
-                                if (tz.local_rtc)
+                                if (local_rtc)
                                         tm = *localtime(&ts.tv_sec);
                                 else
                                         tm = *gmtime(&ts.tv_sec);
@@ -659,7 +640,7 @@ static DBusHandlerResult timedate_message_handler(
 
                                         /* And set the system clock
                                          * with this */
-                                        if (tz.local_rtc)
+                                        if (local_rtc)
                                                 ts.tv_sec = mktime(&tm);
                                         else
                                                 ts.tv_sec = timegm(&tm);
@@ -671,7 +652,7 @@ static DBusHandlerResult timedate_message_handler(
                                 struct tm *tm;
 
                                 /* Sync RTC from system clock */
-                                if (tz.local_rtc)
+                                if (local_rtc)
                                         tm = localtime(&ts.tv_sec);
                                 else
                                         tm = gmtime(&ts.tv_sec);
@@ -679,7 +660,7 @@ static DBusHandlerResult timedate_message_handler(
                                 hwclock_set_time(tm);
                         }
 
-                        log_info("RTC configured to %s time.", tz.local_rtc ? "local" : "UTC");
+                        log_info("RTC configured to %s time.", local_rtc ? "local" : "UTC");
 
                         changed = bus_properties_changed_new(
                                         "/org/freedesktop/timedate1",
@@ -710,7 +691,7 @@ static DBusHandlerResult timedate_message_handler(
                         struct timespec ts;
                         struct tm* tm;
 
-                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-time", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-time", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
@@ -726,7 +707,7 @@ static DBusHandlerResult timedate_message_handler(
                         }
 
                         /* Sync down to RTC */
-                        if (tz.local_rtc)
+                        if (local_rtc)
                                 tm = localtime(&ts.tv_sec);
                         else
                                 tm = gmtime(&ts.tv_sec);
@@ -747,13 +728,13 @@ static DBusHandlerResult timedate_message_handler(
                                     DBUS_TYPE_INVALID))
                         return bus_send_error_reply(connection, message, &error, -EINVAL);
 
-                if (ntp != !!tz.use_ntp) {
+                if (ntp != !!use_ntp) {
 
-                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-ntp", interactive, NULL, &error);
+                        r = verify_polkit(connection, message, "org.freedesktop.timedate1.set-ntp", interactive, &error);
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
-                        tz.use_ntp = !!ntp;
+                        use_ntp = !!ntp;
 
                         r = enable_ntp(connection, &error);
                         if (r < 0)
@@ -763,7 +744,7 @@ static DBusHandlerResult timedate_message_handler(
                         if (r < 0)
                                 return bus_send_error_reply(connection, message, &error, r);
 
-                        log_info("Set NTP to %s", tz.use_ntp ? "enabled" : "disabled");
+                        log_info("Set NTP to %s", use_ntp ? "enabled" : "disabled");
 
                         changed = bus_properties_changed_new(
                                         "/org/freedesktop/timedate1",
@@ -774,7 +755,7 @@ static DBusHandlerResult timedate_message_handler(
                 }
 
         } else
-                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps);
+                return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, properties);
 
         if (!(reply = dbus_message_new_method_return(message)))
                 goto oom;
index e318fee..e6f207f 100644 (file)
@@ -40,7 +40,7 @@ static void timer_init(Unit *u) {
         Timer *t = TIMER(u);
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         t->next_elapse = (usec_t) -1;
 }
@@ -57,18 +57,16 @@ static void timer_done(Unit *u) {
         }
 
         unit_unwatch_timer(u, &t->timer_watch);
-
-        unit_ref_unset(&t->unit);
 }
 
 static int timer_verify(Timer *t) {
         assert(t);
 
-        if (UNIT(t)->load_state != UNIT_LOADED)
+        if (t->meta.load_state != UNIT_LOADED)
                 return 0;
 
         if (!t->values) {
-                log_error("%s lacks value setting. Refusing.", UNIT(t)->id);
+                log_error("%s lacks value setting. Refusing.", t->meta.id);
                 return -EINVAL;
         }
 
@@ -80,7 +78,7 @@ static int timer_add_default_dependencies(Timer *t) {
 
         assert(t);
 
-        if (UNIT(t)->manager->running_as == MANAGER_SYSTEM) {
+        if (t->meta.manager->running_as == MANAGER_SYSTEM) {
                 if ((r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
                         return r;
 
@@ -96,28 +94,21 @@ static int timer_load(Unit *u) {
         int r;
 
         assert(u);
-        assert(u->load_state == UNIT_STUB);
+        assert(u->meta.load_state == UNIT_STUB);
 
         if ((r = unit_load_fragment_and_dropin(u)) < 0)
                 return r;
 
-        if (u->load_state == UNIT_LOADED) {
-
-                if (!UNIT_DEREF(t->unit)) {
-                        Unit *x;
+        if (u->meta.load_state == UNIT_LOADED) {
 
-                        r = unit_load_related_unit(u, ".service", &x);
-                        if (r < 0)
+                if (!t->unit)
+                        if ((r = unit_load_related_unit(u, ".service", &t->unit)))
                                 return r;
 
-                        unit_ref_set(&t->unit, x);
-                }
-
-                r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(t->unit), true);
-                if (r < 0)
+                if ((r = unit_add_dependency(u, UNIT_BEFORE, t->unit, true)) < 0)
                         return r;
 
-                if (UNIT(t)->default_dependencies)
+                if (t->meta.default_dependencies)
                         if ((r = timer_add_default_dependencies(t)) < 0)
                                 return r;
         }
@@ -133,11 +124,9 @@ static void timer_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sTimer State: %s\n"
-                "%sResult: %s\n"
                 "%sUnit: %s\n",
                 prefix, timer_state_to_string(t->state),
-                prefix, timer_result_to_string(t->result),
-                prefix, UNIT_DEREF(t->unit)->id);
+                prefix, t->unit->meta.id);
 
         LIST_FOREACH(value, v, t->values)
                 fprintf(f,
@@ -159,7 +148,7 @@ static void timer_set_state(Timer *t, TimerState state) {
 
         if (state != old_state)
                 log_debug("%s changed %s -> %s",
-                          UNIT(t)->id,
+                          t->meta.id,
                           timer_state_to_string(old_state),
                           timer_state_to_string(state));
 
@@ -185,13 +174,13 @@ static int timer_coldplug(Unit *u) {
         return 0;
 }
 
-static void timer_enter_dead(Timer *t, TimerResult f) {
+static void timer_enter_dead(Timer *t, bool success) {
         assert(t);
 
-        if (f != TIMER_SUCCESS)
-                t->result = f;
+        if (!success)
+                t->failure = true;
 
-        timer_set_state(t, t->result != TIMER_SUCCESS ? TIMER_FAILED : TIMER_DEAD);
+        timer_set_state(t, t->failure ? TIMER_FAILED : TIMER_DEAD);
 }
 
 static void timer_enter_waiting(Timer *t, bool initial) {
@@ -211,7 +200,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
 
                 case TIMER_ACTIVE:
                         if (state_translation_table[t->state] == UNIT_ACTIVE)
-                                base = UNIT(t)->inactive_exit_timestamp.monotonic;
+                                base = t->meta.inactive_exit_timestamp.monotonic;
                         else
                                 base = n;
                         break;
@@ -222,23 +211,23 @@ static void timer_enter_waiting(Timer *t, bool initial) {
                         break;
 
                 case TIMER_STARTUP:
-                        base = UNIT(t)->manager->startup_timestamp.monotonic;
+                        base = t->meta.manager->startup_timestamp.monotonic;
                         break;
 
                 case TIMER_UNIT_ACTIVE:
 
-                        if (UNIT_DEREF(t->unit)->inactive_exit_timestamp.monotonic <= 0)
+                        if (t->unit->meta.inactive_exit_timestamp.monotonic <= 0)
                                 continue;
 
-                        base = UNIT_DEREF(t->unit)->inactive_exit_timestamp.monotonic;
+                        base = t->unit->meta.inactive_exit_timestamp.monotonic;
                         break;
 
                 case TIMER_UNIT_INACTIVE:
 
-                        if (UNIT_DEREF(t->unit)->inactive_enter_timestamp.monotonic <= 0)
+                        if (t->unit->meta.inactive_enter_timestamp.monotonic <= 0)
                                 continue;
 
-                        base = UNIT_DEREF(t->unit)->inactive_enter_timestamp.monotonic;
+                        base = t->unit->meta.inactive_enter_timestamp.monotonic;
                         break;
 
                 default:
@@ -274,8 +263,8 @@ static void timer_enter_waiting(Timer *t, bool initial) {
         return;
 
 fail:
-        log_warning("%s failed to enter waiting state: %s", UNIT(t)->id, strerror(-r));
-        timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
+        log_warning("%s failed to enter waiting state: %s", t->meta.id, strerror(-r));
+        timer_enter_dead(t, false);
 }
 
 static void timer_enter_running(Timer *t) {
@@ -286,18 +275,18 @@ static void timer_enter_running(Timer *t) {
         dbus_error_init(&error);
 
         /* Don't start job if we are supposed to go down */
-        if (UNIT(t)->job && UNIT(t)->job->type == JOB_STOP)
+        if (t->meta.job && t->meta.job->type == JOB_STOP)
                 return;
 
-        if ((r = manager_add_job(UNIT(t)->manager, JOB_START, UNIT_DEREF(t->unit), JOB_REPLACE, true, &error, NULL)) < 0)
+        if ((r = manager_add_job(t->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, &error, NULL)) < 0)
                 goto fail;
 
         timer_set_state(t, TIMER_RUNNING);
         return;
 
 fail:
-        log_warning("%s failed to queue unit startup job: %s", UNIT(t)->id, bus_error(&error, r));
-        timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
+        log_warning("%s failed to queue unit startup job: %s", t->meta.id, bus_error(&error, r));
+        timer_enter_dead(t, false);
 
         dbus_error_free(&error);
 }
@@ -308,10 +297,10 @@ static int timer_start(Unit *u) {
         assert(t);
         assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED);
 
-        if (UNIT_DEREF(t->unit)->load_state != UNIT_LOADED)
+        if (t->unit->meta.load_state != UNIT_LOADED)
                 return -ENOENT;
 
-        t->result = TIMER_SUCCESS;
+        t->failure = false;
         timer_enter_waiting(t, true);
         return 0;
 }
@@ -322,7 +311,7 @@ static int timer_stop(Unit *u) {
         assert(t);
         assert(t->state == TIMER_WAITING || t->state == TIMER_RUNNING || t->state == TIMER_ELAPSED);
 
-        timer_enter_dead(t, TIMER_SUCCESS);
+        timer_enter_dead(t, true);
         return 0;
 }
 
@@ -334,7 +323,6 @@ static int timer_serialize(Unit *u, FILE *f, FDSet *fds) {
         assert(fds);
 
         unit_serialize_item(u, f, "state", timer_state_to_string(t->state));
-        unit_serialize_item(u, f, "result", timer_result_to_string(t->result));
 
         return 0;
 }
@@ -354,15 +342,6 @@ static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
                         log_debug("Failed to parse state value %s", value);
                 else
                         t->deserialized_state = state;
-        } else if (streq(key, "result")) {
-                TimerResult f;
-
-                f = timer_result_from_string(value);
-                if (f < 0)
-                        log_debug("Failed to parse result value %s", value);
-                else if (f != TIMER_SUCCESS)
-                        t->result = f;
-
         } else
                 log_debug("Unknown serialization key '%s'", key);
 
@@ -390,28 +369,42 @@ static void timer_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
         if (t->state != TIMER_WAITING)
                 return;
 
-        log_debug("Timer elapsed on %s", u->id);
+        log_debug("Timer elapsed on %s", u->meta.id);
         timer_enter_running(t);
 }
 
 void timer_unit_notify(Unit *u, UnitActiveState new_state) {
+        char *n;
+        int r;
         Iterator i;
-        Unit *k;
 
-        if (u->type == UNIT_TIMER)
+        if (u->meta.type == UNIT_TIMER)
                 return;
 
-        SET_FOREACH(k, u->dependencies[UNIT_TRIGGERED_BY], i) {
+        SET_FOREACH(n, u->meta.names, i) {
+                char *k;
+                Unit *p;
                 Timer *t;
                 TimerValue *v;
 
-                if (k->type != UNIT_TIMER)
+                if (!(k = unit_name_change_suffix(n, ".timer"))) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                p = manager_get_unit(u->meta.manager, k);
+                free(k);
+
+                if (!p)
                         continue;
 
-                if (k->load_state != UNIT_LOADED)
+                if (p->meta.load_state != UNIT_LOADED)
                         continue;
 
-                t = TIMER(k);
+                t = TIMER(p);
+
+                if (t->unit != u)
+                        continue;
 
                 /* Reenable all timers that depend on unit state */
                 LIST_FOREACH(value, v, t->values)
@@ -431,7 +424,7 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) {
                 case TIMER_RUNNING:
 
                         if (UNIT_IS_INACTIVE_OR_FAILED(new_state)) {
-                                log_debug("%s got notified about unit deactivation.", UNIT(t)->id);
+                                log_debug("%s got notified about unit deactivation.", t->meta.id);
                                 timer_enter_waiting(t, false);
                         }
 
@@ -445,6 +438,11 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) {
                         assert_not_reached("Unknown timer state");
                 }
         }
+
+        return;
+
+fail:
+        log_error("Failed find timer unit: %s", strerror(-r));
 }
 
 static void timer_reset_failed(Unit *u) {
@@ -455,7 +453,7 @@ static void timer_reset_failed(Unit *u) {
         if (t->state == TIMER_FAILED)
                 timer_set_state(t, TIMER_DEAD);
 
-        t->result = TIMER_SUCCESS;
+        t->failure = false;
 }
 
 static const char* const timer_state_table[_TIMER_STATE_MAX] = {
@@ -478,16 +476,8 @@ static const char* const timer_base_table[_TIMER_BASE_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(timer_base, TimerBase);
 
-static const char* const timer_result_table[_TIMER_RESULT_MAX] = {
-        [TIMER_SUCCESS] = "success",
-        [TIMER_FAILURE_RESOURCES] = "resources"
-};
-
-DEFINE_STRING_TABLE_LOOKUP(timer_result, TimerResult);
-
 const UnitVTable timer_vtable = {
         .suffix = ".timer",
-        .object_size = sizeof(Timer),
         .sections =
                 "Unit\0"
                 "Timer\0"
index f5c5c64..6295605 100644 (file)
@@ -56,25 +56,18 @@ typedef struct TimerValue {
         bool disabled;
 } TimerValue;
 
-typedef enum TimerResult {
-        TIMER_SUCCESS,
-        TIMER_FAILURE_RESOURCES,
-        _TIMER_RESULT_MAX,
-        _TIMER_RESULT_INVALID = -1
-} TimerResult;
-
 struct Timer {
-        Unit meta;
+        Meta meta;
 
         LIST_HEAD(TimerValue, values);
         usec_t next_elapse;
 
         TimerState state, deserialized_state;
-        UnitRef unit;
+        Unit *unit;
 
         Watch timer_watch;
 
-        TimerResult result;
+        bool failure;
 };
 
 void timer_unit_notify(Unit *u, UnitActiveState new_state);
@@ -87,7 +80,4 @@ TimerState timer_state_from_string(const char *s);
 const char *timer_base_to_string(TimerBase i);
 TimerBase timer_base_from_string(const char *s);
 
-const char* timer_result_to_string(TimerResult i);
-TimerResult timer_result_from_string(const char *s);
-
 #endif
index 8cbce12..21bf44d 100644 (file)
  * properly owned directories beneath /tmp, /var/tmp, /run, which are
  * volatile and hence need to be recreated on bootup. */
 
-typedef enum ItemType {
+enum {
         /* These ones take file names */
         CREATE_FILE = 'f',
         TRUNCATE_FILE = 'F',
-        WRITE_FILE = 'w',
         CREATE_DIRECTORY = 'd',
         TRUNCATE_DIRECTORY = 'D',
         CREATE_FIFO = 'p',
-        CREATE_SYMLINK = 'L',
-        CREATE_CHAR_DEVICE = 'c',
-        CREATE_BLOCK_DEVICE = 'b',
 
         /* These ones take globs */
         IGNORE_PATH = 'x',
         REMOVE_PATH = 'r',
-        RECURSIVE_REMOVE_PATH = 'R',
-        RELABEL_PATH = 'z',
-        RECURSIVE_RELABEL_PATH = 'Z'
-} ItemType;
+        RECURSIVE_REMOVE_PATH = 'R'
+};
 
 typedef struct Item {
-        ItemType type;
+        char type;
 
         char *path;
-        char *argument;
         uid_t uid;
         gid_t gid;
         mode_t mode;
         usec_t age;
 
-        dev_t major_minor;
-
         bool uid_set:1;
         bool gid_set:1;
         bool mode_set:1;
@@ -99,8 +90,8 @@ static const char *arg_prefix = NULL;
 
 #define MAX_DEPTH 256
 
-static bool needs_glob(ItemType t) {
-        return t == IGNORE_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH || t == RELABEL_PATH || t == RECURSIVE_RELABEL_PATH;
+static bool needs_glob(int t) {
+        return t == IGNORE_PATH || t == REMOVE_PATH || t == RECURSIVE_REMOVE_PATH;
 }
 
 static struct Item* find_glob(Hashmap *h, const char *match) {
@@ -124,50 +115,41 @@ static void load_unix_sockets(void) {
         /* We maintain a cache of the sockets we found in
          * /proc/net/unix to speed things up a little. */
 
-        unix_sockets = set_new(string_hash_func, string_compare_func);
-        if (!unix_sockets)
+        if (!(unix_sockets = set_new(string_hash_func, string_compare_func)))
                 return;
 
-        f = fopen("/proc/net/unix", "re");
-        if (!f)
+        if (!(f = fopen("/proc/net/unix", "re")))
                 return;
 
-        /* Skip header */
-        if (!fgets(line, sizeof(line), f))
+        if (!(fgets(line, sizeof(line), f)))
                 goto fail;
 
         for (;;) {
                 char *p, *s;
                 int k;
 
-                if (!fgets(line, sizeof(line), f))
+                if (!(fgets(line, sizeof(line), f)))
                         break;
 
                 truncate_nl(line);
 
-                p = strchr(line, ':');
-                if (!p)
-                        continue;
-
-                if (strlen(p) < 37)
+                if (strlen(line) < 53)
                         continue;
 
-                p += 37;
+                p = line + 53;
                 p += strspn(p, WHITESPACE);
-                p += strcspn(p, WHITESPACE); /* skip one more word */
+                p += strcspn(p, WHITESPACE);
                 p += strspn(p, WHITESPACE);
 
                 if (*p != '/')
                         continue;
 
-                s = strdup(p);
-                if (!s)
+                if (!(s = strdup(p)))
                         goto fail;
 
                 path_kill_slashes(s);
 
-                k = set_put(unix_sockets, s);
-                if (k < 0) {
+                if ((k = set_put(unix_sockets, s)) < 0) {
                         free(s);
 
                         if (k != -EEXIST)
@@ -423,145 +405,8 @@ finish:
         return r;
 }
 
-static int item_set_perms(Item *i, const char *path) {
-        /* not using i->path directly because it may be a glob */
-        if (i->mode_set)
-                if (chmod(path, i->mode) < 0) {
-                        log_error("chmod(%s) failed: %m", path);
-                        return -errno;
-                }
-
-        if (i->uid_set || i->gid_set)
-                if (chown(path,
-                          i->uid_set ? i->uid : (uid_t) -1,
-                          i->gid_set ? i->gid : (gid_t) -1) < 0) {
-
-                        log_error("chown(%s) failed: %m", path);
-                        return -errno;
-                }
-
-        return label_fix(path, false);
-}
-
-static int recursive_relabel_children(Item *i, const char *path) {
-        DIR *d;
-        int ret = 0;
-
-        /* This returns the first error we run into, but nevertheless
-         * tries to go on */
-
-        d = opendir(path);
-        if (!d)
-                return errno == ENOENT ? 0 : -errno;
-
-        for (;;) {
-                struct dirent buf, *de;
-                bool is_dir;
-                int r;
-                char *entry_path;
-
-                r = readdir_r(d, &buf, &de);
-                if (r != 0) {
-                        if (ret == 0)
-                                ret = -r;
-                        break;
-                }
-
-                if (!de)
-                        break;
-
-                if (streq(de->d_name, ".") || streq(de->d_name, ".."))
-                        continue;
-
-                if (asprintf(&entry_path, "%s/%s", path, de->d_name) < 0) {
-                        if (ret == 0)
-                                ret = -ENOMEM;
-                        continue;
-                }
-
-                if (de->d_type == DT_UNKNOWN) {
-                        struct stat st;
-
-                        if (lstat(entry_path, &st) < 0) {
-                                if (ret == 0 && errno != ENOENT)
-                                        ret = -errno;
-                                free(entry_path);
-                                continue;
-                        }
-
-                        is_dir = S_ISDIR(st.st_mode);
-
-                } else
-                        is_dir = de->d_type == DT_DIR;
-
-                r = item_set_perms(i, entry_path);
-                if (r < 0) {
-                        if (ret == 0 && r != -ENOENT)
-                                ret = r;
-                        free(entry_path);
-                        continue;
-                }
-
-                if (is_dir) {
-                        r = recursive_relabel_children(i, entry_path);
-                        if (r < 0 && ret == 0)
-                                ret = r;
-                }
-
-                free(entry_path);
-        }
-
-        closedir(d);
-
-        return ret;
-}
-
-static int recursive_relabel(Item *i, const char *path) {
-        int r;
-        struct stat st;
-
-        r = item_set_perms(i, path);
-        if (r < 0)
-                return r;
-
-        if (lstat(path, &st) < 0)
-                return -errno;
-
-        if (S_ISDIR(st.st_mode))
-                r = recursive_relabel_children(i, path);
-
-        return r;
-}
-
-static int glob_item(Item *i, int (*action)(Item *, const char *)) {
-        int r = 0, k;
-        glob_t g;
-        char **fn;
-
-        zero(g);
-
-        errno = 0;
-        if ((k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g)) != 0) {
-
-                if (k != GLOB_NOMATCH) {
-                        if (errno != 0)
-                                errno = EIO;
-
-                        log_error("glob(%s) failed: %m", i->path);
-                        return -errno;
-                }
-        }
-
-        STRV_FOREACH(fn, g.gl_pathv)
-                if ((k = action(i, *fn)) < 0)
-                        r = k;
-
-        globfree(&g);
-        return r;
-}
-
 static int create_item(Item *i) {
-        int r;
+        int fd = -1, r;
         mode_t u;
         struct stat st;
 
@@ -576,65 +421,47 @@ static int create_item(Item *i) {
 
         case CREATE_FILE:
         case TRUNCATE_FILE:
-        case WRITE_FILE: {
-                int fd, flags;
-
-                flags = i->type == CREATE_FILE ? O_CREAT|O_APPEND :
-                        i->type == TRUNCATE_FILE ? O_CREAT|O_TRUNC : 0;
 
                 u = umask(0);
-                fd = open(i->path, flags|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW, i->mode);
+                fd = open(i->path, O_CREAT|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY|O_NOFOLLOW|
+                          (i->type == TRUNCATE_FILE ? O_TRUNC : 0), i->mode);
                 umask(u);
 
                 if (fd < 0) {
-                        if (i->type == WRITE_FILE && errno == ENOENT)
-                                break;
-
                         log_error("Failed to create file %s: %m", i->path);
-                        return -errno;
-                }
-
-                if (i->argument) {
-                        ssize_t n;
-                        size_t l;
-                        struct iovec iovec[2];
-                        static const char new_line = '\n';
-
-                        l = strlen(i->argument);
-
-                        zero(iovec);
-                        iovec[0].iov_base = i->argument;
-                        iovec[0].iov_len = l;
-
-                        iovec[1].iov_base = (void*) &new_line;
-                        iovec[1].iov_len = 1;
-
-                        n = writev(fd, iovec, 2);
-                        if (n < 0 || (size_t) n != l+1) {
-                                log_error("Failed to write file %s: %s", i->path, n < 0 ? strerror(-n) : "Short");
-                                close_nointr_nofail(fd);
-                                return n < 0 ? n : -EIO;
-                        }
+                        r = -errno;
+                        goto finish;
                 }
 
-                close_nointr_nofail(fd);
-
-                if (stat(i->path, &st) < 0) {
+                if (fstat(fd, &st) < 0) {
                         log_error("stat(%s) failed: %m", i->path);
-                        return -errno;
+                        r = -errno;
+                        goto finish;
                 }
 
                 if (!S_ISREG(st.st_mode)) {
                         log_error("%s is not a file.", i->path);
-                        return -EEXIST;
+                        r = -EEXIST;
+                        goto finish;
                 }
 
-                r = item_set_perms(i, i->path);
-                if (r < 0)
-                        return r;
+                if (i->mode_set)
+                        if (fchmod(fd, i->mode) < 0) {
+                                log_error("chmod(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
+
+                if (i->uid_set || i->gid_set)
+                        if (fchown(fd,
+                                   i->uid_set ? i->uid : (uid_t) -1,
+                                   i->gid_set ? i->gid : (gid_t) -1) < 0) {
+                                log_error("chown(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
 
                 break;
-        }
 
         case TRUNCATE_DIRECTORY:
         case CREATE_DIRECTORY:
@@ -646,22 +473,38 @@ static int create_item(Item *i) {
 
                 if (r < 0 && errno != EEXIST) {
                         log_error("Failed to create directory %s: %m", i->path);
-                        return -errno;
+                        r = -errno;
+                        goto finish;
                 }
 
                 if (stat(i->path, &st) < 0) {
                         log_error("stat(%s) failed: %m", i->path);
-                        return -errno;
+                        r = -errno;
+                        goto finish;
                 }
 
                 if (!S_ISDIR(st.st_mode)) {
                         log_error("%s is not a directory.", i->path);
-                        return -EEXIST;
+                        r = -EEXIST;
+                        goto finish;
                 }
 
-                r = item_set_perms(i, i->path);
-                if (r < 0)
-                        return r;
+                if (i->mode_set)
+                        if (chmod(i->path, i->mode) < 0) {
+                                log_error("chmod(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
+
+                if (i->uid_set || i->gid_set)
+                        if (chown(i->path,
+                                  i->uid_set ? i->uid : (uid_t) -1,
+                                  i->gid_set ? i->gid : (gid_t) -1) < 0) {
+
+                                log_error("chown(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
 
                 break;
 
@@ -673,99 +516,54 @@ static int create_item(Item *i) {
 
                 if (r < 0 && errno != EEXIST) {
                         log_error("Failed to create fifo %s: %m", i->path);
-                        return -errno;
+                        r = -errno;
+                        goto finish;
                 }
 
                 if (stat(i->path, &st) < 0) {
                         log_error("stat(%s) failed: %m", i->path);
-                        return -errno;
+                        r = -errno;
+                        goto finish;
                 }
 
                 if (!S_ISFIFO(st.st_mode)) {
                         log_error("%s is not a fifo.", i->path);
-                        return -EEXIST;
-                }
-
-                r = item_set_perms(i, i->path);
-                if (r < 0)
-                        return r;
-
-                break;
-
-        case CREATE_SYMLINK: {
-                char *x;
-
-                r = symlink(i->argument, i->path);
-                if (r < 0 && errno != EEXIST) {
-                        log_error("symlink(%s, %s) failed: %m", i->argument, i->path);
-                        return -errno;
-                }
-
-                r = readlink_malloc(i->path, &x);
-                if (r < 0) {
-                        log_error("readlink(%s) failed: %s", i->path, strerror(-r));
-                        return -errno;
-                }
-
-                if (!streq(i->argument, x)) {
-                        free(x);
-                        log_error("%s is not the right symlinks.", i->path);
-                        return -EEXIST;
-                }
-
-                free(x);
-                break;
-        }
-
-        case CREATE_BLOCK_DEVICE:
-        case CREATE_CHAR_DEVICE: {
-
-                u = umask(0);
-                r = mknod(i->path, i->mode | (i->type == CREATE_BLOCK_DEVICE ? S_IFBLK : S_IFCHR), i->major_minor);
-                umask(u);
-
-                if (r < 0 && errno != EEXIST) {
-                        log_error("Failed to create device node %s: %m", i->path);
-                        return -errno;
-                }
-
-                if (stat(i->path, &st) < 0) {
-                        log_error("stat(%s) failed: %m", i->path);
-                        return -errno;
+                        r = -EEXIST;
+                        goto finish;
                 }
 
-                if (i->type == CREATE_BLOCK_DEVICE ? !S_ISBLK(st.st_mode) : !S_ISCHR(st.st_mode)) {
-                        log_error("%s is not a device node.", i->path);
-                        return -EEXIST;
-                }
+                if (i->mode_set)
+                        if (chmod(i->path, i->mode) < 0) {
+                                log_error("chmod(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
 
-                r = item_set_perms(i, i->path);
-                if (r < 0)
-                        return r;
+                if (i->uid_set || i->gid_set)
+                        if (chown(i->path,
+                                   i->uid_set ? i->uid : (uid_t) -1,
+                                   i->gid_set ? i->gid : (gid_t) -1) < 0) {
+                                log_error("chown(%s) failed: %m", i->path);
+                                r = -errno;
+                                goto finish;
+                        }
 
                 break;
         }
 
-        case RELABEL_PATH:
-
-                r = glob_item(i, item_set_perms);
-                if (r < 0)
-                        return 0;
-                break;
-
-        case RECURSIVE_RELABEL_PATH:
-
-                r = glob_item(i, recursive_relabel);
-                if (r < 0)
-                        return r;
-        }
+        if ((r = label_fix(i->path, false)) < 0)
+                goto finish;
 
         log_debug("%s created successfully.", i->path);
 
-        return 0;
+finish:
+        if (fd >= 0)
+                close_nointr_nofail(fd);
+
+        return r;
 }
 
-static int remove_item_instance(Item *i, const char *instance) {
+static int remove_item(Item *i, const char *instance) {
         int r;
 
         assert(i);
@@ -776,13 +574,7 @@ static int remove_item_instance(Item *i, const char *instance) {
         case TRUNCATE_FILE:
         case CREATE_DIRECTORY:
         case CREATE_FIFO:
-        case CREATE_SYMLINK:
-        case CREATE_BLOCK_DEVICE:
-        case CREATE_CHAR_DEVICE:
         case IGNORE_PATH:
-        case RELABEL_PATH:
-        case RECURSIVE_RELABEL_PATH:
-        case WRITE_FILE:
                 break;
 
         case REMOVE_PATH:
@@ -795,8 +587,8 @@ static int remove_item_instance(Item *i, const char *instance) {
 
         case TRUNCATE_DIRECTORY:
         case RECURSIVE_REMOVE_PATH:
-                r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH, false);
-                if (r < 0 && r != -ENOENT) {
+                if ((r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH, false)) < 0 &&
+                    r != -ENOENT) {
                         log_error("rm_rf(%s): %s", instance, strerror(-r));
                         return r;
                 }
@@ -807,9 +599,7 @@ static int remove_item_instance(Item *i, const char *instance) {
         return 0;
 }
 
-static int remove_item(Item *i) {
-        int r = 0;
-
+static int remove_item_glob(Item *i) {
         assert(i);
 
         switch (i->type) {
@@ -818,23 +608,40 @@ static int remove_item(Item *i) {
         case TRUNCATE_FILE:
         case CREATE_DIRECTORY:
         case CREATE_FIFO:
-        case CREATE_SYMLINK:
-        case CREATE_CHAR_DEVICE:
-        case CREATE_BLOCK_DEVICE:
         case IGNORE_PATH:
-        case RELABEL_PATH:
-        case RECURSIVE_RELABEL_PATH:
-        case WRITE_FILE:
                 break;
 
         case REMOVE_PATH:
         case TRUNCATE_DIRECTORY:
-        case RECURSIVE_REMOVE_PATH:
-                r = glob_item(i, remove_item_instance);
-                break;
+        case RECURSIVE_REMOVE_PATH: {
+                int r = 0, k;
+                glob_t g;
+                char **fn;
+
+                zero(g);
+
+                errno = 0;
+                if ((k = glob(i->path, GLOB_NOSORT|GLOB_BRACE, NULL, &g)) != 0) {
+
+                        if (k != GLOB_NOMATCH) {
+                                if (errno != 0)
+                                        errno = EIO;
+
+                                log_error("glob(%s) failed: %m", i->path);
+                                return -errno;
+                        }
+                }
+
+                STRV_FOREACH(fn, g.gl_pathv)
+                        if ((k = remove_item(i, *fn)) < 0)
+                                r = k;
+
+                globfree(&g);
+                return r;
+        }
         }
 
-        return r;
+        return 0;
 }
 
 static int process_item(Item *i) {
@@ -843,7 +650,7 @@ static int process_item(Item *i) {
         assert(i);
 
         r = arg_create ? create_item(i) : 0;
-        q = arg_remove ? remove_item(i) : 0;
+        q = arg_remove ? remove_item_glob(i) : 0;
         p = arg_clean ? clean_item(i) : 0;
 
         if (r < 0)
@@ -859,7 +666,6 @@ static void item_free(Item *i) {
         assert(i);
 
         free(i->path);
-        free(i->argument);
         free(i);
 }
 
@@ -889,34 +695,20 @@ static bool item_equal(Item *a, Item *b) {
             (a->age_set && a->age != b->age))
             return false;
 
-        if ((a->type == CREATE_FILE ||
-             a->type == TRUNCATE_FILE ||
-             a->type == WRITE_FILE ||
-             a->type == CREATE_SYMLINK) &&
-            !streq_ptr(a->argument, b->argument))
-                return false;
-
-        if ((a->type == CREATE_CHAR_DEVICE ||
-             a->type == CREATE_BLOCK_DEVICE) &&
-            a->major_minor != b->major_minor)
-                return false;
-
         return true;
 }
 
 static int parse_line(const char *fname, unsigned line, const char *buffer) {
         Item *i, *existing;
         char *mode = NULL, *user = NULL, *group = NULL, *age = NULL;
-        char type;
         Hashmap *h;
-        int r, n = -1;
+        int r;
 
         assert(fname);
         assert(line >= 1);
         assert(buffer);
 
-        i = new0(Item, 1);
-        if (!i) {
+        if (!(i = new0(Item, 1))) {
                 log_error("Out of memory");
                 return -ENOMEM;
         }
@@ -927,89 +719,31 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                    "%ms "
                    "%ms "
                    "%ms "
-                   "%ms "
-                   "%n",
-                   &type,
+                   "%ms",
+                   &i->type,
                    &i->path,
                    &mode,
                    &user,
                    &group,
-                   &age,
-                   &n) < 2) {
+                   &age) < 2) {
                 log_error("[%s:%u] Syntax error.", fname, line);
                 r = -EIO;
                 goto finish;
         }
 
-        if (n >= 0)  {
-                n += strspn(buffer+n, WHITESPACE);
-                if (buffer[n] != 0 && (buffer[n] != '-' || buffer[n+1] != 0)) {
-                        i->argument = unquote(buffer+n, "\"");
-                        if (!i->argument) {
-                                log_error("Out of memory");
-                                return -ENOMEM;
-                        }
-                }
-        }
-
-        switch(type) {
-
-        case CREATE_FILE:
-        case TRUNCATE_FILE:
-        case CREATE_DIRECTORY:
-        case TRUNCATE_DIRECTORY:
-        case CREATE_FIFO:
-        case IGNORE_PATH:
-        case REMOVE_PATH:
-        case RECURSIVE_REMOVE_PATH:
-        case RELABEL_PATH:
-        case RECURSIVE_RELABEL_PATH:
-                break;
-
-        case CREATE_SYMLINK:
-                if (!i->argument) {
-                        log_error("[%s:%u] Symlink file requires argument.", fname, line);
-                        r = -EBADMSG;
-                        goto finish;
-                }
-                break;
-
-        case WRITE_FILE:
-                if (!i->argument) {
-                        log_error("[%s:%u] Write file requires argument.", fname, line);
-                        r = -EBADMSG;
-                        goto finish;
-                }
-                break;
-
-        case CREATE_CHAR_DEVICE:
-        case CREATE_BLOCK_DEVICE: {
-                unsigned major, minor;
-
-                if (!i->argument) {
-                        log_error("[%s:%u] Device file requires argument.", fname, line);
-                        r = -EBADMSG;
-                        goto finish;
-                }
-
-                if (sscanf(i->argument, "%u:%u", &major, &minor) != 2) {
-                        log_error("[%s:%u] Can't parse device file major/minor '%s'.", fname, line, i->argument);
-                        r = -EBADMSG;
-                        goto finish;
-                }
-
-                i->major_minor = makedev(major, minor);
-                break;
-        }
-
-        default:
-                log_error("[%s:%u] Unknown file type '%c'.", fname, line, type);
+        if (i->type != CREATE_FILE &&
+            i->type != TRUNCATE_FILE &&
+            i->type != CREATE_DIRECTORY &&
+            i->type != TRUNCATE_DIRECTORY &&
+            i->type != CREATE_FIFO &&
+            i->type != IGNORE_PATH &&
+            i->type != REMOVE_PATH &&
+            i->type != RECURSIVE_REMOVE_PATH) {
+                log_error("[%s:%u] Unknown file type '%c'.", fname, line, i->type);
                 r = -EBADMSG;
                 goto finish;
         }
 
-        i->type = type;
-
         if (!path_is_absolute(i->path)) {
                 log_error("[%s:%u] Path '%s' not absolute.", fname, line, i->path);
                 r = -EBADMSG;
@@ -1059,9 +793,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 i->mode = m;
                 i->mode_set = true;
         } else
-                i->mode =
-                        i->type == CREATE_DIRECTORY ||
-                        i->type == TRUNCATE_DIRECTORY ? 0755 : 0644;
+                i->mode = i->type == CREATE_DIRECTORY ? 0755 : 0644;
 
         if (age && !streq(age, "-")) {
                 if (parse_usec(age, &i->age) < 0) {
@@ -1075,8 +807,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
 
         h = needs_glob(i->type) ? globs : items;
 
-        existing = hashmap_get(h, i->path);
-        if (existing) {
+        if ((existing = hashmap_get(h, i->path))) {
 
                 /* Two identical items are fine */
                 if (!item_equal(existing, i))
@@ -1086,8 +817,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
                 goto finish;
         }
 
-        r = hashmap_put(h, i->path, i);
-        if (r < 0) {
+        if ((r = hashmap_put(h, i->path, i)) < 0) {
                 log_error("Failed to insert item %s: %s", i->path, strerror(-r));
                 goto finish;
         }
@@ -1192,8 +922,7 @@ static int read_config_file(const char *fn, bool ignore_enoent) {
 
         assert(fn);
 
-        f = fopen(fn, "re");
-        if (!f) {
+        if (!(f = fopen(fn, "re"))) {
 
                 if (ignore_enoent && errno == ENOENT)
                         return 0;
@@ -1237,8 +966,7 @@ int main(int argc, char *argv[]) {
         Item *i;
         Iterator iterator;
 
-        r = parse_argv(argc, argv);
-        if (r <= 0)
+        if ((r = parse_argv(argc, argv)) <= 0)
                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
         log_set_target(LOG_TARGET_AUTO);
index 13481b2..43d008f 100644 (file)
@@ -206,7 +206,6 @@ static int ask_password_plymouth(
                                 continue;
 
                         memcpy(&size, buffer+1, sizeof(size));
-                        size = le32toh(size);
                         if (size+5 > sizeof(buffer)) {
                                 r = -EIO;
                                 goto finish;
similarity index 97%
rename from src/login/uaccess.c
rename to src/uaccess.c
index e1af5bf..49ac4af 100644 (file)
 #include <errno.h>
 #include <string.h>
 
-#include <systemd/sd-daemon.h>
-#include <systemd/sd-login.h>
-
 #include "logind-acl.h"
 #include "util.h"
 #include "log.h"
+#include "sd-daemon.h"
+#include "sd-login.h"
 
 int main(int argc, char *argv[]) {
         int r;
index 9e33701..903a8e4 100644 (file)
@@ -57,27 +57,24 @@ const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
         [UNIT_PATH] = &path_vtable
 };
 
-Unit *unit_new(Manager *m, size_t size) {
+Unit *unit_new(Manager *m) {
         Unit *u;
 
         assert(m);
-        assert(size >= sizeof(Unit));
 
-        u = malloc0(size);
-        if (!u)
+        if (!(u = new0(Unit, 1)))
                 return NULL;
 
-        u->names = set_new(string_hash_func, string_compare_func);
-        if (!u->names) {
+        if (!(u->meta.names = set_new(string_hash_func, string_compare_func))) {
                 free(u);
                 return NULL;
         }
 
-        u->manager = m;
-        u->type = _UNIT_TYPE_INVALID;
-        u->deserialized_job = _JOB_TYPE_INVALID;
-        u->default_dependencies = true;
-        u->unit_file_state = _UNIT_FILE_STATE_INVALID;
+        u->meta.manager = m;
+        u->meta.type = _UNIT_TYPE_INVALID;
+        u->meta.deserialized_job = _JOB_TYPE_INVALID;
+        u->meta.default_dependencies = true;
+        u->meta.unit_file_state = _UNIT_FILE_STATE_INVALID;
 
         return u;
 }
@@ -86,7 +83,7 @@ bool unit_has_name(Unit *u, const char *name) {
         assert(u);
         assert(name);
 
-        return !!set_get(u->names, (char*) name);
+        return !!set_get(u->meta.names, (char*) name);
 }
 
 int unit_add_name(Unit *u, const char *text) {
@@ -98,10 +95,10 @@ int unit_add_name(Unit *u, const char *text) {
         assert(text);
 
         if (unit_name_is_template(text)) {
-                if (!u->instance)
+                if (!u->meta.instance)
                         return -EINVAL;
 
-                s = unit_name_replace_instance(text, u->instance);
+                s = unit_name_replace_instance(text, u->meta.instance);
         } else
                 s = strdup(text);
 
@@ -115,7 +112,7 @@ int unit_add_name(Unit *u, const char *text) {
 
         assert_se((t = unit_name_to_type(s)) >= 0);
 
-        if (u->type != _UNIT_TYPE_INVALID && t != u->type) {
+        if (u->meta.type != _UNIT_TYPE_INVALID && t != u->meta.type) {
                 r = -EINVAL;
                 goto fail;
         }
@@ -130,41 +127,41 @@ int unit_add_name(Unit *u, const char *text) {
 
         /* Ensure that this unit is either instanced or not instanced,
          * but not both. */
-        if (u->type != _UNIT_TYPE_INVALID && !u->instance != !i) {
+        if (u->meta.type != _UNIT_TYPE_INVALID && !u->meta.instance != !i) {
                 r = -EINVAL;
                 goto fail;
         }
 
         if (unit_vtable[t]->no_alias &&
-            !set_isempty(u->names) &&
-            !set_get(u->names, s)) {
+            !set_isempty(u->meta.names) &&
+            !set_get(u->meta.names, s)) {
                 r = -EEXIST;
                 goto fail;
         }
 
-        if (hashmap_size(u->manager->units) >= MANAGER_MAX_NAMES) {
+        if (hashmap_size(u->meta.manager->units) >= MANAGER_MAX_NAMES) {
                 r = -E2BIG;
                 goto fail;
         }
 
-        if ((r = set_put(u->names, s)) < 0) {
+        if ((r = set_put(u->meta.names, s)) < 0) {
                 if (r == -EEXIST)
                         r = 0;
                 goto fail;
         }
 
-        if ((r = hashmap_put(u->manager->units, s, u)) < 0) {
-                set_remove(u->names, s);
+        if ((r = hashmap_put(u->meta.manager->units, s, u)) < 0) {
+                set_remove(u->meta.names, s);
                 goto fail;
         }
 
-        if (u->type == _UNIT_TYPE_INVALID) {
+        if (u->meta.type == _UNIT_TYPE_INVALID) {
 
-                u->type = t;
-                u->id = s;
-                u->instance = i;
+                u->meta.type = t;
+                u->meta.id = s;
+                u->meta.instance = i;
 
-                LIST_PREPEND(Unit, units_by_type, u->manager->units_by_type[t], u);
+                LIST_PREPEND(Meta, units_by_type, u->meta.manager->units_by_type[t], &u->meta);
 
                 if (UNIT_VTABLE(u)->init)
                         UNIT_VTABLE(u)->init(u);
@@ -190,17 +187,17 @@ int unit_choose_id(Unit *u, const char *name) {
 
         if (unit_name_is_template(name)) {
 
-                if (!u->instance)
+                if (!u->meta.instance)
                         return -EINVAL;
 
-                if (!(t = unit_name_replace_instance(name, u->instance)))
+                if (!(t = unit_name_replace_instance(name, u->meta.instance)))
                         return -ENOMEM;
 
                 name = t;
         }
 
         /* Selects one of the names of this unit as the id */
-        s = set_get(u->names, (char*) name);
+        s = set_get(u->meta.names, (char*) name);
         free(t);
 
         if (!s)
@@ -209,10 +206,10 @@ int unit_choose_id(Unit *u, const char *name) {
         if ((r = unit_name_to_instance(s, &i)) < 0)
                 return r;
 
-        u->id = s;
+        u->meta.id = s;
 
-        free(u->instance);
-        u->instance = i;
+        free(u->meta.instance);
+        u->meta.instance = i;
 
         unit_add_to_dbus_queue(u);
 
@@ -227,8 +224,8 @@ int unit_set_description(Unit *u, const char *description) {
         if (!(s = strdup(description)))
                 return -ENOMEM;
 
-        free(u->description);
-        u->description = s;
+        free(u->meta.description);
+        u->meta.description = s;
 
         unit_add_to_dbus_queue(u);
         return 0;
@@ -237,16 +234,16 @@ int unit_set_description(Unit *u, const char *description) {
 bool unit_check_gc(Unit *u) {
         assert(u);
 
-        if (u->load_state == UNIT_STUB)
+        if (u->meta.load_state == UNIT_STUB)
                 return true;
 
         if (UNIT_VTABLE(u)->no_gc)
                 return true;
 
-        if (u->no_gc)
+        if (u->meta.no_gc)
                 return true;
 
-        if (u->job)
+        if (u->meta.job)
                 return true;
 
         if (unit_active_state(u) != UNIT_INACTIVE)
@@ -261,58 +258,58 @@ bool unit_check_gc(Unit *u) {
 
 void unit_add_to_load_queue(Unit *u) {
         assert(u);
-        assert(u->type != _UNIT_TYPE_INVALID);
+        assert(u->meta.type != _UNIT_TYPE_INVALID);
 
-        if (u->load_state != UNIT_STUB || u->in_load_queue)
+        if (u->meta.load_state != UNIT_STUB || u->meta.in_load_queue)
                 return;
 
-        LIST_PREPEND(Unit, load_queue, u->manager->load_queue, u);
-        u->in_load_queue = true;
+        LIST_PREPEND(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
+        u->meta.in_load_queue = true;
 }
 
 void unit_add_to_cleanup_queue(Unit *u) {
         assert(u);
 
-        if (u->in_cleanup_queue)
+        if (u->meta.in_cleanup_queue)
                 return;
 
-        LIST_PREPEND(Unit, cleanup_queue, u->manager->cleanup_queue, u);
-        u->in_cleanup_queue = true;
+        LIST_PREPEND(Meta, cleanup_queue, u->meta.manager->cleanup_queue, &u->meta);
+        u->meta.in_cleanup_queue = true;
 }
 
 void unit_add_to_gc_queue(Unit *u) {
         assert(u);
 
-        if (u->in_gc_queue || u->in_cleanup_queue)
+        if (u->meta.in_gc_queue || u->meta.in_cleanup_queue)
                 return;
 
         if (unit_check_gc(u))
                 return;
 
-        LIST_PREPEND(Unit, gc_queue, u->manager->gc_queue, u);
-        u->in_gc_queue = true;
+        LIST_PREPEND(Meta, gc_queue, u->meta.manager->gc_queue, &u->meta);
+        u->meta.in_gc_queue = true;
 
-        u->manager->n_in_gc_queue ++;
+        u->meta.manager->n_in_gc_queue ++;
 
-        if (u->manager->gc_queue_timestamp <= 0)
-                u->manager->gc_queue_timestamp = now(CLOCK_MONOTONIC);
+        if (u->meta.manager->gc_queue_timestamp <= 0)
+                u->meta.manager->gc_queue_timestamp = now(CLOCK_MONOTONIC);
 }
 
 void unit_add_to_dbus_queue(Unit *u) {
         assert(u);
-        assert(u->type != _UNIT_TYPE_INVALID);
+        assert(u->meta.type != _UNIT_TYPE_INVALID);
 
-        if (u->load_state == UNIT_STUB || u->in_dbus_queue)
+        if (u->meta.load_state == UNIT_STUB || u->meta.in_dbus_queue)
                 return;
 
         /* Shortcut things if nobody cares */
-        if (!bus_has_subscriber(u->manager)) {
-                u->sent_dbus_new_signal = true;
+        if (!bus_has_subscriber(u->meta.manager)) {
+                u->meta.sent_dbus_new_signal = true;
                 return;
         }
 
-        LIST_PREPEND(Unit, dbus_queue, u->manager->dbus_unit_queue, u);
-        u->in_dbus_queue = true;
+        LIST_PREPEND(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
+        u->meta.in_dbus_queue = true;
 }
 
 static void bidi_set_free(Unit *u, Set *s) {
@@ -328,7 +325,7 @@ static void bidi_set_free(Unit *u, Set *s) {
                 UnitDependency d;
 
                 for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
-                        set_remove(other->dependencies[d], u);
+                        set_remove(other->meta.dependencies[d], u);
 
                 unit_add_to_gc_queue(other);
         }
@@ -345,57 +342,54 @@ void unit_free(Unit *u) {
 
         bus_unit_send_removed_signal(u);
 
-        if (u->load_state != UNIT_STUB)
+        if (u->meta.load_state != UNIT_STUB)
                 if (UNIT_VTABLE(u)->done)
                         UNIT_VTABLE(u)->done(u);
 
-        SET_FOREACH(t, u->names, i)
-                hashmap_remove_value(u->manager->units, t, u);
+        SET_FOREACH(t, u->meta.names, i)
+                hashmap_remove_value(u->meta.manager->units, t, u);
 
-        if (u->job)
-                job_free(u->job);
+        if (u->meta.job)
+                job_free(u->meta.job);
 
         for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
-                bidi_set_free(u, u->dependencies[d]);
+                bidi_set_free(u, u->meta.dependencies[d]);
 
-        if (u->type != _UNIT_TYPE_INVALID)
-                LIST_REMOVE(Unit, units_by_type, u->manager->units_by_type[u->type], u);
+        if (u->meta.type != _UNIT_TYPE_INVALID)
+                LIST_REMOVE(Meta, units_by_type, u->meta.manager->units_by_type[u->meta.type], &u->meta);
 
-        if (u->in_load_queue)
-                LIST_REMOVE(Unit, load_queue, u->manager->load_queue, u);
+        if (u->meta.in_load_queue)
+                LIST_REMOVE(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
 
-        if (u->in_dbus_queue)
-                LIST_REMOVE(Unit, dbus_queue, u->manager->dbus_unit_queue, u);
+        if (u->meta.in_dbus_queue)
+                LIST_REMOVE(Meta, dbus_queue, u->meta.manager->dbus_unit_queue, &u->meta);
 
-        if (u->in_cleanup_queue)
-                LIST_REMOVE(Unit, cleanup_queue, u->manager->cleanup_queue, u);
+        if (u->meta.in_cleanup_queue)
+                LIST_REMOVE(Meta, cleanup_queue, u->meta.manager->cleanup_queue, &u->meta);
 
-        if (u->in_gc_queue) {
-                LIST_REMOVE(Unit, gc_queue, u->manager->gc_queue, u);
-                u->manager->n_in_gc_queue--;
+        if (u->meta.in_gc_queue) {
+                LIST_REMOVE(Meta, gc_queue, u->meta.manager->gc_queue, &u->meta);
+                u->meta.manager->n_in_gc_queue--;
         }
 
-        cgroup_bonding_free_list(u->cgroup_bondings, u->manager->n_reloading <= 0);
-        cgroup_attribute_free_list(u->cgroup_attributes);
+        cgroup_bonding_free_list(u->meta.cgroup_bondings, u->meta.manager->n_reloading <= 0);
+        cgroup_attribute_free_list(u->meta.cgroup_attributes);
 
-        free(u->description);
-        free(u->fragment_path);
-        free(u->instance);
+        free(u->meta.description);
+        free(u->meta.fragment_path);
 
-        set_free_free(u->names);
+        set_free_free(u->meta.names);
 
-        condition_free_list(u->conditions);
-
-        while (u->refs)
-                unit_ref_unset(u->refs);
+        condition_free_list(u->meta.conditions);
 
+        free(u->meta.instance);
         free(u);
 }
 
 UnitActiveState unit_active_state(Unit *u) {
         assert(u);
 
-        if (u->load_state == UNIT_MERGED)
+        if (u->meta.load_state == UNIT_MERGED)
                 return unit_active_state(unit_follow_merge(u));
 
         /* After a reload it might happen that a unit is not correctly
@@ -433,14 +427,14 @@ static void merge_names(Unit *u, Unit *other) {
         assert(u);
         assert(other);
 
-        complete_move(&u->names, &other->names);
+        complete_move(&u->meta.names, &other->meta.names);
 
-        set_free_free(other->names);
-        other->names = NULL;
-        other->id = NULL;
+        set_free_free(other->meta.names);
+        other->meta.names = NULL;
+        other->meta.id = NULL;
 
-        SET_FOREACH(t, u->names, i)
-                assert_se(hashmap_replace(u->manager->units, t, u) == 0);
+        SET_FOREACH(t, u->meta.names, i)
+                assert_se(hashmap_replace(u->meta.manager->units, t, u) == 0);
 }
 
 static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) {
@@ -453,23 +447,23 @@ static void merge_dependencies(Unit *u, Unit *other, UnitDependency d) {
         assert(d < _UNIT_DEPENDENCY_MAX);
 
         /* Fix backwards pointers */
-        SET_FOREACH(back, other->dependencies[d], i) {
+        SET_FOREACH(back, other->meta.dependencies[d], i) {
                 UnitDependency k;
 
                 for (k = 0; k < _UNIT_DEPENDENCY_MAX; k++)
-                        if ((r = set_remove_and_put(back->dependencies[k], other, u)) < 0) {
+                        if ((r = set_remove_and_put(back->meta.dependencies[k], other, u)) < 0) {
 
                                 if (r == -EEXIST)
-                                        set_remove(back->dependencies[k], other);
+                                        set_remove(back->meta.dependencies[k], other);
                                 else
                                         assert(r == -ENOENT);
                         }
         }
 
-        complete_move(&u->dependencies[d], &other->dependencies[d]);
+        complete_move(&u->meta.dependencies[d], &other->meta.dependencies[d]);
 
-        set_free(other->dependencies[d]);
-        other->dependencies[d] = NULL;
+        set_free(other->meta.dependencies[d]);
+        other->meta.dependencies[d] = NULL;
 }
 
 int unit_merge(Unit *u, Unit *other) {
@@ -477,25 +471,25 @@ int unit_merge(Unit *u, Unit *other) {
 
         assert(u);
         assert(other);
-        assert(u->manager == other->manager);
-        assert(u->type != _UNIT_TYPE_INVALID);
+        assert(u->meta.manager == other->meta.manager);
+        assert(u->meta.type != _UNIT_TYPE_INVALID);
 
         other = unit_follow_merge(other);
 
         if (other == u)
                 return 0;
 
-        if (u->type != other->type)
+        if (u->meta.type != other->meta.type)
                 return -EINVAL;
 
-        if (!u->instance != !other->instance)
+        if (!u->meta.instance != !other->meta.instance)
                 return -EINVAL;
 
-        if (other->load_state != UNIT_STUB &&
-            other->load_state != UNIT_ERROR)
+        if (other->meta.load_state != UNIT_STUB &&
+            other->meta.load_state != UNIT_ERROR)
                 return -EEXIST;
 
-        if (other->job)
+        if (other->meta.job)
                 return -EEXIST;
 
         if (!UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other)))
@@ -504,20 +498,16 @@ int unit_merge(Unit *u, Unit *other) {
         /* Merge names */
         merge_names(u, other);
 
-        /* Redirect all references */
-        while (other->refs)
-                unit_ref_set(other->refs, u);
-
         /* Merge dependencies */
         for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
                 merge_dependencies(u, other, d);
 
-        other->load_state = UNIT_MERGED;
-        other->merged_into = u;
+        other->meta.load_state = UNIT_MERGED;
+        other->meta.merged_into = u;
 
         /* If there is still some data attached to the other node, we
          * don't need it anymore, and can free it. */
-        if (other->load_state != UNIT_STUB)
+        if (other->meta.load_state != UNIT_STUB)
                 if (UNIT_VTABLE(other)->done)
                         UNIT_VTABLE(other)->done(other);
 
@@ -536,16 +526,16 @@ int unit_merge_by_name(Unit *u, const char *name) {
         assert(name);
 
         if (unit_name_is_template(name)) {
-                if (!u->instance)
+                if (!u->meta.instance)
                         return -EINVAL;
 
-                if (!(s = unit_name_replace_instance(name, u->instance)))
+                if (!(s = unit_name_replace_instance(name, u->meta.instance)))
                         return -ENOMEM;
 
                 name = s;
         }
 
-        if (!(other = manager_get_unit(u->manager, name)))
+        if (!(other = manager_get_unit(u->meta.manager, name)))
                 r = unit_add_name(u, name);
         else
                 r = unit_merge(u, other);
@@ -557,8 +547,8 @@ int unit_merge_by_name(Unit *u, const char *name) {
 Unit* unit_follow_merge(Unit *u) {
         assert(u);
 
-        while (u->load_state == UNIT_MERGED)
-                assert_se(u = u->merged_into);
+        while (u->meta.load_state == UNIT_MERGED)
+                assert_se(u = u->meta.merged_into);
 
         return u;
 }
@@ -571,23 +561,19 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
 
         if (c->std_output != EXEC_OUTPUT_KMSG &&
             c->std_output != EXEC_OUTPUT_SYSLOG &&
-            c->std_output != EXEC_OUTPUT_JOURNAL &&
             c->std_output != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
             c->std_output != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
-            c->std_output != EXEC_OUTPUT_JOURNAL_AND_CONSOLE &&
             c->std_error != EXEC_OUTPUT_KMSG &&
-            c->std_error != EXEC_OUTPUT_SYSLOG &&
-            c->std_error != EXEC_OUTPUT_JOURNAL &&
-            c->std_error != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
-            c->std_error != EXEC_OUTPUT_JOURNAL_AND_CONSOLE &&
+            c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
+            c->std_error != EXEC_OUTPUT_KMSG &&
             c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE)
                 return 0;
 
         /* If syslog or kernel logging is requested, make sure our own
          * logging daemon is run first. */
 
-        if (u->manager->running_as == MANAGER_SYSTEM)
-                if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true)) < 0)
+        if (u->meta.manager->running_as == MANAGER_SYSTEM)
+                if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET, NULL, true)) < 0)
                         return r;
 
         return 0;
@@ -596,10 +582,10 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
 const char *unit_description(Unit *u) {
         assert(u);
 
-        if (u->description)
-                return u->description;
+        if (u->meta.description)
+                return u->meta.description;
 
-        return strna(u->id);
+        return strna(u->meta.id);
 }
 
 void unit_dump(Unit *u, FILE *f, const char *prefix) {
@@ -617,7 +603,7 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
         Unit *following;
 
         assert(u);
-        assert(u->type >= 0);
+        assert(u->meta.type >= 0);
 
         if (!prefix)
                 prefix = "";
@@ -636,47 +622,47 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
                 "%s\tInactive Enter Timestamp: %s\n"
                 "%s\tGC Check Good: %s\n"
                 "%s\tNeed Daemon Reload: %s\n",
-                prefix, u->id,
+                prefix, u->meta.id,
                 prefix, unit_description(u),
-                prefix, strna(u->instance),
-                prefix, unit_load_state_to_string(u->load_state),
+                prefix, strna(u->meta.instance),
+                prefix, unit_load_state_to_string(u->meta.load_state),
                 prefix, unit_active_state_to_string(unit_active_state(u)),
-                prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->inactive_exit_timestamp.realtime)),
-                prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->active_enter_timestamp.realtime)),
-                prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->active_exit_timestamp.realtime)),
-                prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->inactive_enter_timestamp.realtime)),
+                prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->meta.inactive_exit_timestamp.realtime)),
+                prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->meta.active_enter_timestamp.realtime)),
+                prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->meta.active_exit_timestamp.realtime)),
+                prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->meta.inactive_enter_timestamp.realtime)),
                 prefix, yes_no(unit_check_gc(u)),
                 prefix, yes_no(unit_need_daemon_reload(u)));
 
-        SET_FOREACH(t, u->names, i)
+        SET_FOREACH(t, u->meta.names, i)
                 fprintf(f, "%s\tName: %s\n", prefix, t);
 
         if ((following = unit_following(u)))
-                fprintf(f, "%s\tFollowing: %s\n", prefix, following->id);
+                fprintf(f, "%s\tFollowing: %s\n", prefix, following->meta.id);
 
-        if (u->fragment_path)
-                fprintf(f, "%s\tFragment Path: %s\n", prefix, u->fragment_path);
+        if (u->meta.fragment_path)
+                fprintf(f, "%s\tFragment Path: %s\n", prefix, u->meta.fragment_path);
 
-        if (u->job_timeout > 0)
-                fprintf(f, "%s\tJob Timeout: %s\n", prefix, format_timespan(timespan, sizeof(timespan), u->job_timeout));
+        if (u->meta.job_timeout > 0)
+                fprintf(f, "%s\tJob Timeout: %s\n", prefix, format_timespan(timespan, sizeof(timespan), u->meta.job_timeout));
 
-        condition_dump_list(u->conditions, f, prefix);
+        condition_dump_list(u->meta.conditions, f, prefix);
 
-        if (dual_timestamp_is_set(&u->condition_timestamp))
+        if (dual_timestamp_is_set(&u->meta.condition_timestamp))
                 fprintf(f,
                         "%s\tCondition Timestamp: %s\n"
                         "%s\tCondition Result: %s\n",
-                        prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->condition_timestamp.realtime)),
-                        prefix, yes_no(u->condition_result));
+                        prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->meta.condition_timestamp.realtime)),
+                        prefix, yes_no(u->meta.condition_result));
 
         for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) {
                 Unit *other;
 
-                SET_FOREACH(other, u->dependencies[d], i)
-                        fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), other->id);
+                SET_FOREACH(other, u->meta.dependencies[d], i)
+                        fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), other->meta.id);
         }
 
-        if (u->load_state == UNIT_LOADED) {
+        if (u->meta.load_state == UNIT_LOADED) {
                 CGroupBonding *b;
                 CGroupAttribute *a;
 
@@ -688,19 +674,19 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
                         "%s\tOnFailureIsolate: %s\n"
                         "%s\tIgnoreOnIsolate: %s\n"
                         "%s\tIgnoreOnSnapshot: %s\n",
-                        prefix, yes_no(u->stop_when_unneeded),
-                        prefix, yes_no(u->refuse_manual_start),
-                        prefix, yes_no(u->refuse_manual_stop),
-                        prefix, yes_no(u->default_dependencies),
-                        prefix, yes_no(u->on_failure_isolate),
-                        prefix, yes_no(u->ignore_on_isolate),
-                        prefix, yes_no(u->ignore_on_snapshot));
-
-                LIST_FOREACH(by_unit, b, u->cgroup_bondings)
+                        prefix, yes_no(u->meta.stop_when_unneeded),
+                        prefix, yes_no(u->meta.refuse_manual_start),
+                        prefix, yes_no(u->meta.refuse_manual_stop),
+                        prefix, yes_no(u->meta.default_dependencies),
+                        prefix, yes_no(u->meta.on_failure_isolate),
+                        prefix, yes_no(u->meta.ignore_on_isolate),
+                        prefix, yes_no(u->meta.ignore_on_snapshot));
+
+                LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings)
                         fprintf(f, "%s\tControlGroup: %s:%s\n",
                                 prefix, b->controller, b->path);
 
-                LIST_FOREACH(by_unit, a, u->cgroup_attributes) {
+                LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes) {
                         char *v = NULL;
 
                         if (a->map_callback)
@@ -715,16 +701,16 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
                 if (UNIT_VTABLE(u)->dump)
                         UNIT_VTABLE(u)->dump(u, f, prefix2);
 
-        } else if (u->load_state == UNIT_MERGED)
+        } else if (u->meta.load_state == UNIT_MERGED)
                 fprintf(f,
                         "%s\tMerged into: %s\n",
-                        prefix, u->merged_into->id);
-        else if (u->load_state == UNIT_ERROR)
-                fprintf(f, "%s\tLoad Error Code: %s\n", prefix, strerror(-u->load_error));
+                        prefix, u->meta.merged_into->meta.id);
+        else if (u->meta.load_state == UNIT_ERROR)
+                fprintf(f, "%s\tLoad Error Code: %s\n", prefix, strerror(-u->meta.load_error));
 
 
-        if (u->job)
-                job_dump(u->job, f, prefix2);
+        if (u->meta.job)
+                job_dump(u->meta.job, f, prefix2);
 
         free(p2);
 }
@@ -739,7 +725,7 @@ int unit_load_fragment_and_dropin(Unit *u) {
         if ((r = unit_load_fragment(u)) < 0)
                 return r;
 
-        if (u->load_state == UNIT_STUB)
+        if (u->meta.load_state == UNIT_STUB)
                 return -ENOENT;
 
         /* Load drop-in directory data */
@@ -762,8 +748,8 @@ int unit_load_fragment_and_dropin_optional(Unit *u) {
         if ((r = unit_load_fragment(u)) < 0)
                 return r;
 
-        if (u->load_state == UNIT_STUB)
-                u->load_state = UNIT_LOADED;
+        if (u->meta.load_state == UNIT_STUB)
+                u->meta.load_state = UNIT_LOADED;
 
         /* Load drop-in directory data */
         if ((r = unit_load_dropin(unit_follow_merge(u))) < 0)
@@ -776,23 +762,23 @@ int unit_add_default_target_dependency(Unit *u, Unit *target) {
         assert(u);
         assert(target);
 
-        if (target->type != UNIT_TARGET)
+        if (target->meta.type != UNIT_TARGET)
                 return 0;
 
         /* Only add the dependency if both units are loaded, so that
          * that loop check below is reliable */
-        if (u->load_state != UNIT_LOADED ||
-            target->load_state != UNIT_LOADED)
+        if (u->meta.load_state != UNIT_LOADED ||
+            target->meta.load_state != UNIT_LOADED)
                 return 0;
 
         /* If either side wants no automatic dependencies, then let's
          * skip this */
-        if (!u->default_dependencies ||
-            !target->default_dependencies)
+        if (!u->meta.default_dependencies ||
+            !target->meta.default_dependencies)
                 return 0;
 
         /* Don't create loops */
-        if (set_get(target->dependencies[UNIT_BEFORE], u))
+        if (set_get(target->meta.dependencies[UNIT_BEFORE], u))
                 return 0;
 
         return unit_add_dependency(target, UNIT_AFTER, u, true);
@@ -814,7 +800,7 @@ static int unit_add_default_dependencies(Unit *u) {
         assert(u);
 
         for (k = 0; k < ELEMENTSOF(deps); k++)
-                SET_FOREACH(target, u->dependencies[deps[k]], i)
+                SET_FOREACH(target, u->meta.dependencies[deps[k]], i)
                         if ((r = unit_add_default_target_dependency(u, target)) < 0)
                                 return r;
 
@@ -826,42 +812,42 @@ int unit_load(Unit *u) {
 
         assert(u);
 
-        if (u->in_load_queue) {
-                LIST_REMOVE(Unit, load_queue, u->manager->load_queue, u);
-                u->in_load_queue = false;
+        if (u->meta.in_load_queue) {
+                LIST_REMOVE(Meta, load_queue, u->meta.manager->load_queue, &u->meta);
+                u->meta.in_load_queue = false;
         }
 
-        if (u->type == _UNIT_TYPE_INVALID)
+        if (u->meta.type == _UNIT_TYPE_INVALID)
                 return -EINVAL;
 
-        if (u->load_state != UNIT_STUB)
+        if (u->meta.load_state != UNIT_STUB)
                 return 0;
 
         if (UNIT_VTABLE(u)->load)
                 if ((r = UNIT_VTABLE(u)->load(u)) < 0)
                         goto fail;
 
-        if (u->load_state == UNIT_STUB) {
+        if (u->meta.load_state == UNIT_STUB) {
                 r = -ENOENT;
                 goto fail;
         }
 
-        if (u->load_state == UNIT_LOADED &&
-            u->default_dependencies)
+        if (u->meta.load_state == UNIT_LOADED &&
+            u->meta.default_dependencies)
                 if ((r = unit_add_default_dependencies(u)) < 0)
                         goto fail;
 
-        if (u->on_failure_isolate &&
-            set_size(u->dependencies[UNIT_ON_FAILURE]) > 1) {
+        if (u->meta.on_failure_isolate &&
+            set_size(u->meta.dependencies[UNIT_ON_FAILURE]) > 1) {
 
                 log_error("More than one OnFailure= dependencies specified for %s but OnFailureIsolate= enabled. Refusing.",
-                          u->id);
+                          u->meta.id);
 
                 r = -EINVAL;
                 goto fail;
         }
 
-        assert((u->load_state != UNIT_MERGED) == !u->merged_into);
+        assert((u->meta.load_state != UNIT_MERGED) == !u->meta.merged_into);
 
         unit_add_to_dbus_queue(unit_follow_merge(u));
         unit_add_to_gc_queue(u);
@@ -869,12 +855,11 @@ int unit_load(Unit *u) {
         return 0;
 
 fail:
-        u->load_state = UNIT_ERROR;
-        u->load_error = r;
+        u->meta.load_state = UNIT_ERROR;
+        u->meta.load_error = r;
         unit_add_to_dbus_queue(u);
-        unit_add_to_gc_queue(u);
 
-        log_debug("Failed to load configuration for %s: %s", u->id, strerror(-r));
+        log_debug("Failed to load configuration for %s: %s", u->meta.id, strerror(-r));
 
         return r;
 }
@@ -882,10 +867,10 @@ fail:
 bool unit_condition_test(Unit *u) {
         assert(u);
 
-        dual_timestamp_get(&u->condition_timestamp);
-        u->condition_result = condition_test_list(u->conditions);
+        dual_timestamp_get(&u->meta.condition_timestamp);
+        u->meta.condition_result = condition_test_list(u->meta.conditions);
 
-        return u->condition_result;
+        return u->meta.condition_result;
 }
 
 /* Errors:
@@ -900,7 +885,7 @@ int unit_start(Unit *u) {
 
         assert(u);
 
-        if (u->load_state != UNIT_LOADED)
+        if (u->meta.load_state != UNIT_LOADED)
                 return -EINVAL;
 
         /* If this is already started, then this will succeed. Note
@@ -917,13 +902,13 @@ int unit_start(Unit *u) {
          * but we don't want to recheck the condition in that case. */
         if (state != UNIT_ACTIVATING &&
             !unit_condition_test(u)) {
-                log_debug("Starting of %s requested but condition failed. Ignoring.", u->id);
+                log_debug("Starting of %s requested but condition failed. Ignoring.", u->meta.id);
                 return -EALREADY;
         }
 
         /* Forward to the main object, if we aren't it. */
         if ((following = unit_following(u))) {
-                log_debug("Redirecting start request from %s to %s.", u->id, following->id);
+                log_debug("Redirecting start request from %s to %s.", u->meta.id, following->meta.id);
                 return unit_start(following);
         }
 
@@ -939,7 +924,7 @@ int unit_start(Unit *u) {
 
         unit_add_to_dbus_queue(u);
 
-        unit_status_printf(u, NULL, "Starting %s...", unit_description(u));
+        unit_status_printf(u, "Starting %s...\n", unit_description(u));
         return UNIT_VTABLE(u)->start(u);
 }
 
@@ -953,7 +938,7 @@ bool unit_can_isolate(Unit *u) {
         assert(u);
 
         return unit_can_start(u) &&
-                u->allow_isolate;
+                u->meta.allow_isolate;
 }
 
 /* Errors:
@@ -972,7 +957,7 @@ int unit_stop(Unit *u) {
                 return -EALREADY;
 
         if ((following = unit_following(u))) {
-                log_debug("Redirecting stop request from %s to %s.", u->id, following->id);
+                log_debug("Redirecting stop request from %s to %s.", u->meta.id, following->meta.id);
                 return unit_stop(following);
         }
 
@@ -981,7 +966,7 @@ int unit_stop(Unit *u) {
 
         unit_add_to_dbus_queue(u);
 
-        unit_status_printf(u, NULL, "Stopping %s...", unit_description(u));
+        unit_status_printf(u, "Stopping %s...\n", unit_description(u));
         return UNIT_VTABLE(u)->stop(u);
 }
 
@@ -996,7 +981,7 @@ int unit_reload(Unit *u) {
 
         assert(u);
 
-        if (u->load_state != UNIT_LOADED)
+        if (u->meta.load_state != UNIT_LOADED)
                 return -EINVAL;
 
         if (!unit_can_reload(u))
@@ -1010,7 +995,7 @@ int unit_reload(Unit *u) {
                 return -ENOEXEC;
 
         if ((following = unit_following(u))) {
-                log_debug("Redirecting reload request from %s to %s.", u->id, following->id);
+                log_debug("Redirecting reload request from %s to %s.", u->meta.id, following->meta.id);
                 return unit_reload(following);
         }
 
@@ -1039,32 +1024,32 @@ static void unit_check_unneeded(Unit *u) {
         /* If this service shall be shut down when unneeded then do
          * so. */
 
-        if (!u->stop_when_unneeded)
+        if (!u->meta.stop_when_unneeded)
                 return;
 
         if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
                 return;
 
-        SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY], i)
-                if (unit_pending_active(other))
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
+                if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         return;
 
-        SET_FOREACH(other, u->dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
-                if (unit_pending_active(other))
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY_OVERRIDABLE], i)
+                if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         return;
 
-        SET_FOREACH(other, u->dependencies[UNIT_WANTED_BY], i)
-                if (unit_pending_active(other))
+        SET_FOREACH(other, u->meta.dependencies[UNIT_WANTED_BY], i)
+                if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         return;
 
-        SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i)
-                if (unit_pending_active(other))
+        SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
+                if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         return;
 
-        log_info("Service %s is not needed anymore. Stopping.", u->id);
+        log_info("Service %s is not needed anymore. Stopping.", u->meta.id);
 
         /* Ok, nobody needs us anymore. Sniff. Then let's commit suicide */
-        manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
+        manager_add_job(u->meta.manager, JOB_STOP, u, JOB_FAIL, true, NULL, NULL);
 }
 
 static void retroactively_start_dependencies(Unit *u) {
@@ -1074,38 +1059,38 @@ static void retroactively_start_dependencies(Unit *u) {
         assert(u);
         assert(UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)));
 
-        SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i)
-                if (!set_get(u->dependencies[UNIT_AFTER], other) &&
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i)
+                if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_BIND_TO], i)
-                if (!set_get(u->dependencies[UNIT_AFTER], other) &&
+        SET_FOREACH(other, u->meta.dependencies[UNIT_BIND_TO], i)
+                if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
-                if (!set_get(u->dependencies[UNIT_AFTER], other) &&
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+                if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i)
-                if (!set_get(u->dependencies[UNIT_AFTER], other) &&
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE], i)
+                if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
-                if (!set_get(u->dependencies[UNIT_AFTER], other) &&
+        SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i)
+                if (!set_get(u->meta.dependencies[UNIT_AFTER], other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_CONFLICTS], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_CONFLICTED_BY], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTED_BY], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
+                        manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
 }
 
 static void retroactively_stop_dependencies(Unit *u) {
@@ -1116,35 +1101,27 @@ static void retroactively_stop_dependencies(Unit *u) {
         assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
 
         /* Pull down units which are bound to us recursively if enabled */
-        SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_BOUND_BY], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
-}
-
-static void check_unneeded_dependencies(Unit *u) {
-        Iterator i;
-        Unit *other;
-
-        assert(u);
-        assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
+                        manager_add_job(u->meta.manager, JOB_STOP, other, JOB_REPLACE, true, NULL, NULL);
 
         /* Garbage collect services that might not be needed anymore, if enabled */
-        SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         unit_check_unneeded(other);
-        SET_FOREACH(other, u->dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         unit_check_unneeded(other);
-        SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         unit_check_unneeded(other);
-        SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         unit_check_unneeded(other);
-        SET_FOREACH(other, u->dependencies[UNIT_REQUISITE_OVERRIDABLE], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE_OVERRIDABLE], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         unit_check_unneeded(other);
-        SET_FOREACH(other, u->dependencies[UNIT_BIND_TO], i)
+        SET_FOREACH(other, u->meta.dependencies[UNIT_BIND_TO], i)
                 if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
                         unit_check_unneeded(other);
 }
@@ -1155,15 +1132,15 @@ void unit_trigger_on_failure(Unit *u) {
 
         assert(u);
 
-        if (set_size(u->dependencies[UNIT_ON_FAILURE]) <= 0)
+        if (set_size(u->meta.dependencies[UNIT_ON_FAILURE]) <= 0)
                 return;
 
-        log_info("Triggering OnFailure= dependencies of %s.", u->id);
+        log_info("Triggering OnFailure= dependencies of %s.", u->meta.id);
 
-        SET_FOREACH(other, u->dependencies[UNIT_ON_FAILURE], i) {
+        SET_FOREACH(other, u->meta.dependencies[UNIT_ON_FAILURE], i) {
                 int r;
 
-                if ((r = manager_add_job(u->manager, JOB_START, other, u->on_failure_isolate ? JOB_ISOLATE : JOB_REPLACE, true, NULL, NULL)) < 0)
+                if ((r = manager_add_job(u->meta.manager, JOB_START, other, u->meta.on_failure_isolate ? JOB_ISOLATE : JOB_REPLACE, true, NULL, NULL)) < 0)
                         log_error("Failed to enqueue OnFailure= job: %s", strerror(-r));
         }
 }
@@ -1181,54 +1158,54 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
          * behaviour here. For example: if a mount point is remounted
          * this function will be called too! */
 
-        if (u->manager->n_reloading <= 0) {
+        if (u->meta.manager->n_reloading <= 0) {
                 dual_timestamp ts;
 
                 dual_timestamp_get(&ts);
 
                 if (UNIT_IS_INACTIVE_OR_FAILED(os) && !UNIT_IS_INACTIVE_OR_FAILED(ns))
-                        u->inactive_exit_timestamp = ts;
+                        u->meta.inactive_exit_timestamp = ts;
                 else if (!UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_INACTIVE_OR_FAILED(ns))
-                        u->inactive_enter_timestamp = ts;
+                        u->meta.inactive_enter_timestamp = ts;
 
                 if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns))
-                        u->active_enter_timestamp = ts;
+                        u->meta.active_enter_timestamp = ts;
                 else if (UNIT_IS_ACTIVE_OR_RELOADING(os) && !UNIT_IS_ACTIVE_OR_RELOADING(ns))
-                        u->active_exit_timestamp = ts;
+                        u->meta.active_exit_timestamp = ts;
 
                 timer_unit_notify(u, ns);
                 path_unit_notify(u, ns);
         }
 
         if (UNIT_IS_INACTIVE_OR_FAILED(ns))
-                cgroup_bonding_trim_list(u->cgroup_bondings, true);
+                cgroup_bonding_trim_list(u->meta.cgroup_bondings, true);
 
-        if (u->job) {
+        if (u->meta.job) {
                 unexpected = false;
 
-                if (u->job->state == JOB_WAITING)
+                if (u->meta.job->state == JOB_WAITING)
 
                         /* So we reached a different state for this
                          * job. Let's see if we can run it now if it
                          * failed previously due to EAGAIN. */
-                        job_add_to_run_queue(u->job);
+                        job_add_to_run_queue(u->meta.job);
 
                 /* Let's check whether this state change constitutes a
                  * finished job, or maybe contradicts a running job and
                  * hence needs to invalidate jobs. */
 
-                switch (u->job->type) {
+                switch (u->meta.job->type) {
 
                 case JOB_START:
                 case JOB_VERIFY_ACTIVE:
 
                         if (UNIT_IS_ACTIVE_OR_RELOADING(ns))
-                                job_finish_and_invalidate(u->job, JOB_DONE);
-                        else if (u->job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) {
+                                job_finish_and_invalidate(u->meta.job, JOB_DONE);
+                        else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) {
                                 unexpected = true;
 
                                 if (UNIT_IS_INACTIVE_OR_FAILED(ns))
-                                        job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
+                                        job_finish_and_invalidate(u->meta.job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
                         }
 
                         break;
@@ -1236,14 +1213,14 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
                 case JOB_RELOAD:
                 case JOB_RELOAD_OR_START:
 
-                        if (u->job->state == JOB_RUNNING) {
+                        if (u->meta.job->state == JOB_RUNNING) {
                                 if (ns == UNIT_ACTIVE)
-                                        job_finish_and_invalidate(u->job, reload_success ? JOB_DONE : JOB_FAILED);
+                                        job_finish_and_invalidate(u->meta.job, reload_success ? JOB_DONE : JOB_FAILED);
                                 else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
                                         unexpected = true;
 
                                         if (UNIT_IS_INACTIVE_OR_FAILED(ns))
-                                                job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
+                                                job_finish_and_invalidate(u->meta.job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE);
                                 }
                         }
 
@@ -1254,10 +1231,10 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
                 case JOB_TRY_RESTART:
 
                         if (UNIT_IS_INACTIVE_OR_FAILED(ns))
-                                job_finish_and_invalidate(u->job, JOB_DONE);
-                        else if (u->job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
+                                job_finish_and_invalidate(u->meta.job, JOB_DONE);
+                        else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
                                 unexpected = true;
-                                job_finish_and_invalidate(u->job, JOB_FAILED);
+                                job_finish_and_invalidate(u->meta.job, JOB_FAILED);
                         }
 
                         break;
@@ -1269,7 +1246,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
         } else
                 unexpected = true;
 
-        if (u->manager->n_reloading <= 0) {
+        if (u->meta.manager->n_reloading <= 0) {
 
                 /* If this state change happened without being
                  * requested by a job, then let's retroactively start
@@ -1285,12 +1262,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
                                 retroactively_stop_dependencies(u);
                 }
 
-                /* stop unneeded units regardless if going down was expected or not */
-                if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
-                        check_unneeded_dependencies(u);
-
                 if (ns != os && ns == UNIT_FAILED) {
-                        log_notice("Unit %s entered failed state.", u->id);
+                        log_notice("Unit %s entered failed state.", u->meta.id);
                         unit_trigger_on_failure(u);
                 }
         }
@@ -1302,46 +1275,46 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
                         /* The bus just might have become available,
                          * hence try to connect to it, if we aren't
                          * yet connected. */
-                        bus_init(u->manager, true);
+                        bus_init(u->meta.manager, true);
 
-                if (u->type == UNIT_SERVICE &&
+                if (u->meta.type == UNIT_SERVICE &&
                     !UNIT_IS_ACTIVE_OR_RELOADING(os) &&
-                    u->manager->n_reloading <= 0) {
+                    u->meta.manager->n_reloading <= 0) {
                         /* Write audit record if we have just finished starting up */
-                        manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_START, true);
-                        u->in_audit = true;
+                        manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, true);
+                        u->meta.in_audit = true;
                 }
 
                 if (!UNIT_IS_ACTIVE_OR_RELOADING(os))
-                        manager_send_unit_plymouth(u->manager, u);
+                        manager_send_unit_plymouth(u->meta.manager, u);
 
         } else {
 
                 /* We don't care about D-Bus here, since we'll get an
                  * asynchronous notification for it anyway. */
 
-                if (u->type == UNIT_SERVICE &&
+                if (u->meta.type == UNIT_SERVICE &&
                     UNIT_IS_INACTIVE_OR_FAILED(ns) &&
                     !UNIT_IS_INACTIVE_OR_FAILED(os) &&
-                    u->manager->n_reloading <= 0) {
+                    u->meta.manager->n_reloading <= 0) {
 
                         /* Hmm, if there was no start record written
                          * write it now, so that we always have a nice
                          * pair */
-                        if (!u->in_audit) {
-                                manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE);
+                        if (!u->meta.in_audit) {
+                                manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE);
 
                                 if (ns == UNIT_INACTIVE)
-                                        manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_STOP, true);
+                                        manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, true);
                         } else
                                 /* Write audit record if we have just finished shutting down */
-                                manager_send_unit_audit(u->manager, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
+                                manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
 
-                        u->in_audit = false;
+                        u->meta.in_audit = false;
                 }
         }
 
-        manager_recheck_journal(u->manager);
+        manager_recheck_syslog(u->meta.manager);
 
         /* Maybe we finished startup and are now ready for being
          * stopped because unneeded? */
@@ -1363,7 +1336,7 @@ int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) {
         ev.data.ptr = w;
         ev.events = events;
 
-        if (epoll_ctl(u->manager->epoll_fd,
+        if (epoll_ctl(u->meta.manager->epoll_fd,
                       w->type == WATCH_INVALID ? EPOLL_CTL_ADD : EPOLL_CTL_MOD,
                       fd,
                       &ev) < 0)
@@ -1385,7 +1358,7 @@ void unit_unwatch_fd(Unit *u, Watch *w) {
 
         assert(w->type == WATCH_FD);
         assert(w->data.unit == u);
-        assert_se(epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
+        assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
 
         w->fd = -1;
         w->type = WATCH_INVALID;
@@ -1399,14 +1372,14 @@ int unit_watch_pid(Unit *u, pid_t pid) {
         /* Watch a specific PID. We only support one unit watching
          * each PID for now. */
 
-        return hashmap_put(u->manager->watch_pids, LONG_TO_PTR(pid), u);
+        return hashmap_put(u->meta.manager->watch_pids, LONG_TO_PTR(pid), u);
 }
 
 void unit_unwatch_pid(Unit *u, pid_t pid) {
         assert(u);
         assert(pid >= 1);
 
-        hashmap_remove_value(u->manager->watch_pids, LONG_TO_PTR(pid), u);
+        hashmap_remove_value(u->meta.manager->watch_pids, LONG_TO_PTR(pid), u);
 }
 
 int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
@@ -1459,7 +1432,7 @@ int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
                 ev.data.ptr = w;
                 ev.events = EPOLLIN;
 
-                if (epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0)
+                if (epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0)
                         goto fail;
         }
 
@@ -1487,7 +1460,7 @@ void unit_unwatch_timer(Unit *u, Watch *w) {
         assert(w->data.unit == u);
         assert(w->fd >= 0);
 
-        assert_se(epoll_ctl(u->manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
+        assert_se(epoll_ctl(u->meta.manager->epoll_fd, EPOLL_CTL_DEL, w->fd, NULL) >= 0);
         close_nointr_nofail(w->fd);
 
         w->fd = -1;
@@ -1540,11 +1513,7 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
                 [UNIT_AFTER] = UNIT_BEFORE,
                 [UNIT_ON_FAILURE] = _UNIT_DEPENDENCY_INVALID,
                 [UNIT_REFERENCES] = UNIT_REFERENCED_BY,
-                [UNIT_REFERENCED_BY] = UNIT_REFERENCES,
-                [UNIT_TRIGGERS] = UNIT_TRIGGERED_BY,
-                [UNIT_TRIGGERED_BY] = UNIT_TRIGGERS,
-                [UNIT_PROPAGATE_RELOAD_TO] = UNIT_PROPAGATE_RELOAD_FROM,
-                [UNIT_PROPAGATE_RELOAD_FROM] = UNIT_PROPAGATE_RELOAD_TO
+                [UNIT_REFERENCED_BY] = UNIT_REFERENCES
         };
         int r, q = 0, v = 0, w = 0;
 
@@ -1560,34 +1529,34 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
         if (u == other)
                 return 0;
 
-        if ((r = set_ensure_allocated(&u->dependencies[d], trivial_hash_func, trivial_compare_func)) < 0)
+        if ((r = set_ensure_allocated(&u->meta.dependencies[d], trivial_hash_func, trivial_compare_func)) < 0)
                 return r;
 
         if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID)
-                if ((r = set_ensure_allocated(&other->dependencies[inverse_table[d]], trivial_hash_func, trivial_compare_func)) < 0)
+                if ((r = set_ensure_allocated(&other->meta.dependencies[inverse_table[d]], trivial_hash_func, trivial_compare_func)) < 0)
                         return r;
 
         if (add_reference)
-                if ((r = set_ensure_allocated(&u->dependencies[UNIT_REFERENCES], trivial_hash_func, trivial_compare_func)) < 0 ||
-                    (r = set_ensure_allocated(&other->dependencies[UNIT_REFERENCED_BY], trivial_hash_func, trivial_compare_func)) < 0)
+                if ((r = set_ensure_allocated(&u->meta.dependencies[UNIT_REFERENCES], trivial_hash_func, trivial_compare_func)) < 0 ||
+                    (r = set_ensure_allocated(&other->meta.dependencies[UNIT_REFERENCED_BY], trivial_hash_func, trivial_compare_func)) < 0)
                         return r;
 
-        if ((q = set_put(u->dependencies[d], other)) < 0)
+        if ((q = set_put(u->meta.dependencies[d], other)) < 0)
                 return q;
 
         if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID)
-                if ((v = set_put(other->dependencies[inverse_table[d]], u)) < 0) {
+                if ((v = set_put(other->meta.dependencies[inverse_table[d]], u)) < 0) {
                         r = v;
                         goto fail;
                 }
 
         if (add_reference) {
-                if ((w = set_put(u->dependencies[UNIT_REFERENCES], other)) < 0) {
+                if ((w = set_put(u->meta.dependencies[UNIT_REFERENCES], other)) < 0) {
                         r = w;
                         goto fail;
                 }
 
-                if ((r = set_put(other->dependencies[UNIT_REFERENCED_BY], u)) < 0)
+                if ((r = set_put(other->meta.dependencies[UNIT_REFERENCED_BY], u)) < 0)
                         goto fail;
         }
 
@@ -1596,13 +1565,13 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
 
 fail:
         if (q > 0)
-                set_remove(u->dependencies[d], other);
+                set_remove(u->meta.dependencies[d], other);
 
         if (v > 0)
-                set_remove(other->dependencies[inverse_table[d]], u);
+                set_remove(other->meta.dependencies[inverse_table[d]], u);
 
         if (w > 0)
-                set_remove(u->dependencies[UNIT_REFERENCES], other);
+                set_remove(u->meta.dependencies[UNIT_REFERENCES], other);
 
         return r;
 }
@@ -1635,12 +1604,12 @@ static const char *resolve_template(Unit *u, const char *name, const char*path,
                 return name;
         }
 
-        if (u->instance)
-                s = unit_name_replace_instance(name, u->instance);
+        if (u->meta.instance)
+                s = unit_name_replace_instance(name, u->meta.instance);
         else {
                 char *i;
 
-                if (!(i = unit_name_to_prefix(u->id)))
+                if (!(i = unit_name_to_prefix(u->meta.id)))
                         return NULL;
 
                 s = unit_name_replace_instance(name, i);
@@ -1665,7 +1634,7 @@ int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, con
         if (!(name = resolve_template(u, name, path, &s)))
                 return -ENOMEM;
 
-        if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
+        if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
                 goto finish;
 
         r = unit_add_dependency(u, d, other, add_reference);
@@ -1686,7 +1655,7 @@ int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency
         if (!(name = resolve_template(u, name, path, &s)))
                 return -ENOMEM;
 
-        if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
+        if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
                 goto finish;
 
         r = unit_add_two_dependencies(u, d, e, other, add_reference);
@@ -1707,7 +1676,7 @@ int unit_add_dependency_by_name_inverse(Unit *u, UnitDependency d, const char *n
         if (!(name = resolve_template(u, name, path, &s)))
                 return -ENOMEM;
 
-        if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
+        if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
                 goto finish;
 
         r = unit_add_dependency(other, d, u, add_reference);
@@ -1728,7 +1697,7 @@ int unit_add_two_dependencies_by_name_inverse(Unit *u, UnitDependency d, UnitDep
         if (!(name = resolve_template(u, name, path, &s)))
                 return -ENOMEM;
 
-        if ((r = manager_load_unit(u->manager, name, path, NULL, &other)) < 0)
+        if ((r = manager_load_unit(u->meta.manager, name, path, NULL, &other)) < 0)
                 goto finish;
 
         if ((r = unit_add_two_dependencies(other, d, e, u, add_reference)) < 0)
@@ -1773,10 +1742,10 @@ char *unit_dbus_path(Unit *u) {
 
         assert(u);
 
-        if (!u->id)
+        if (!u->meta.id)
                 return NULL;
 
-        if (!(e = bus_path_escape(u->id)))
+        if (!(e = bus_path_escape(u->meta.id)))
                 return NULL;
 
         p = strappend("/org/freedesktop/systemd1/unit/", e);
@@ -1806,16 +1775,16 @@ int unit_add_cgroup(Unit *u, CGroupBonding *b) {
         if (streq(b->controller, SYSTEMD_CGROUP_CONTROLLER)) {
                 CGroupBonding *l;
 
-                l = hashmap_get(u->manager->cgroup_bondings, b->path);
+                l = hashmap_get(u->meta.manager->cgroup_bondings, b->path);
                 LIST_PREPEND(CGroupBonding, by_path, l, b);
 
-                if ((r = hashmap_replace(u->manager->cgroup_bondings, b->path, l)) < 0) {
+                if ((r = hashmap_replace(u->meta.manager->cgroup_bondings, b->path, l)) < 0) {
                         LIST_REMOVE(CGroupBonding, by_path, l, b);
                         return r;
                 }
         }
 
-        LIST_PREPEND(CGroupBonding, by_unit, u->cgroup_bondings, b);
+        LIST_PREPEND(CGroupBonding, by_unit, u->meta.cgroup_bondings, b);
         b->unit = u;
 
         return 0;
@@ -1826,17 +1795,17 @@ static char *default_cgroup_path(Unit *u) {
 
         assert(u);
 
-        if (u->instance) {
+        if (u->meta.instance) {
                 char *t;
 
-                t = unit_name_template(u->id);
+                t = unit_name_template(u->meta.id);
                 if (!t)
                         return NULL;
 
-                p = join(u->manager->cgroup_hierarchy, "/", t, "/", u->instance, NULL);
+                p = join(u->meta.manager->cgroup_hierarchy, "/", t, "/", u->meta.instance, NULL);
                 free(t);
         } else
-                p = join(u->manager->cgroup_hierarchy, "/", u->id, NULL);
+                p = join(u->meta.manager->cgroup_hierarchy, "/", u->meta.id, NULL);
 
         return p;
 }
@@ -1870,7 +1839,7 @@ int unit_add_cgroup_from_text(Unit *u, const char *name) {
                 return -ENOMEM;
         }
 
-        if (cgroup_bonding_find_list(u->cgroup_bondings, controller)) {
+        if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) {
                 r = -EEXIST;
                 goto fail;
         }
@@ -1907,7 +1876,7 @@ static int unit_add_one_default_cgroup(Unit *u, const char *controller) {
         if (!controller)
                 controller = SYSTEMD_CGROUP_CONTROLLER;
 
-        if (cgroup_bonding_find_list(u->cgroup_bondings, controller))
+        if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller))
                 return 0;
 
         if (!(b = new0(CGroupBonding, 1)))
@@ -1945,16 +1914,16 @@ int unit_add_default_cgroups(Unit *u) {
         /* Adds in the default cgroups, if they weren't specified
          * otherwise. */
 
-        if (!u->manager->cgroup_hierarchy)
+        if (!u->meta.manager->cgroup_hierarchy)
                 return 0;
 
         if ((r = unit_add_one_default_cgroup(u, NULL)) < 0)
                 return r;
 
-        STRV_FOREACH(c, u->manager->default_controllers)
+        STRV_FOREACH(c, u->meta.manager->default_controllers)
                 unit_add_one_default_cgroup(u, *c);
 
-        LIST_FOREACH(by_unit, a, u->cgroup_attributes)
+        LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes)
                 unit_add_one_default_cgroup(u, a->controller);
 
         return 0;
@@ -1963,7 +1932,7 @@ int unit_add_default_cgroups(Unit *u) {
 CGroupBonding* unit_get_default_cgroup(Unit *u) {
         assert(u);
 
-        return cgroup_bonding_find_list(u->cgroup_bondings, SYSTEMD_CGROUP_CONTROLLER);
+        return cgroup_bonding_find_list(u->meta.cgroup_bondings, SYSTEMD_CGROUP_CONTROLLER);
 }
 
 int unit_add_cgroup_attribute(Unit *u, const char *controller, const char *name, const char *value, CGroupAttributeMapCallback map_callback) {
@@ -2020,7 +1989,7 @@ int unit_add_cgroup_attribute(Unit *u, const char *controller, const char *name,
 
         a->map_callback = map_callback;
 
-        LIST_PREPEND(CGroupAttribute, by_unit, u->cgroup_attributes, a);
+        LIST_PREPEND(CGroupAttribute, by_unit, u->meta.cgroup_attributes, a);
 
         r = 0;
 
@@ -2037,12 +2006,12 @@ int unit_load_related_unit(Unit *u, const char *type, Unit **_found) {
         assert(type);
         assert(_found);
 
-        if (!(t = unit_name_change_suffix(u->id, type)))
+        if (!(t = unit_name_change_suffix(u->meta.id, type)))
                 return -ENOMEM;
 
         assert(!unit_has_name(u, t));
 
-        r = manager_load_unit(u->manager, t, NULL, NULL, _found);
+        r = manager_load_unit(u->meta.manager, t, NULL, NULL, _found);
         free(t);
 
         assert(r < 0 || *_found != u);
@@ -2058,12 +2027,12 @@ int unit_get_related_unit(Unit *u, const char *type, Unit **_found) {
         assert(type);
         assert(_found);
 
-        if (!(t = unit_name_change_suffix(u->id, type)))
+        if (!(t = unit_name_change_suffix(u->meta.id, type)))
                 return -ENOMEM;
 
         assert(!unit_has_name(u, t));
 
-        found = manager_get_unit(u->manager, t);
+        found = manager_get_unit(u->meta.manager, t);
         free(t);
 
         if (!found)
@@ -2077,14 +2046,14 @@ static char *specifier_prefix_and_instance(char specifier, void *data, void *use
         Unit *u = userdata;
         assert(u);
 
-        return unit_name_to_prefix_and_instance(u->id);
+        return unit_name_to_prefix_and_instance(u->meta.id);
 }
 
 static char *specifier_prefix(char specifier, void *data, void *userdata) {
         Unit *u = userdata;
         assert(u);
 
-        return unit_name_to_prefix(u->id);
+        return unit_name_to_prefix(u->meta.id);
 }
 
 static char *specifier_prefix_unescaped(char specifier, void *data, void *userdata) {
@@ -2093,7 +2062,7 @@ static char *specifier_prefix_unescaped(char specifier, void *data, void *userda
 
         assert(u);
 
-        if (!(p = unit_name_to_prefix(u->id)))
+        if (!(p = unit_name_to_prefix(u->meta.id)))
                 return NULL;
 
         r = unit_name_unescape(p);
@@ -2106,8 +2075,8 @@ static char *specifier_instance_unescaped(char specifier, void *data, void *user
         Unit *u = userdata;
         assert(u);
 
-        if (u->instance)
-                return unit_name_unescape(u->instance);
+        if (u->meta.instance)
+                return unit_name_unescape(u->meta.instance);
 
         return strdup("");
 }
@@ -2116,10 +2085,10 @@ static char *specifier_filename(char specifier, void *data, void *userdata) {
         Unit *u = userdata;
         assert(u);
 
-        if (u->instance)
-                return unit_name_path_unescape(u->instance);
+        if (u->meta.instance)
+                return unit_name_path_unescape(u->meta.instance);
 
-        return unit_name_to_path(u->instance);
+        return unit_name_to_path(u->meta.instance);
 }
 
 static char *specifier_cgroup(char specifier, void *data, void *userdata) {
@@ -2135,9 +2104,9 @@ static char *specifier_cgroup_root(char specifier, void *data, void *userdata) {
         assert(u);
 
         if (specifier == 'r')
-                return strdup(u->manager->cgroup_hierarchy);
+                return strdup(u->meta.manager->cgroup_hierarchy);
 
-        if (parent_of_path(u->manager->cgroup_hierarchy, &p) < 0)
+        if (parent_of_path(u->meta.manager->cgroup_hierarchy, &p) < 0)
                 return strdup("");
 
         if (streq(p, "/")) {
@@ -2152,7 +2121,7 @@ static char *specifier_runtime(char specifier, void *data, void *userdata) {
         Unit *u = userdata;
         assert(u);
 
-        if (u->manager->running_as == MANAGER_USER) {
+        if (u->meta.manager->running_as == MANAGER_USER) {
                 const char *e;
 
                 e = getenv("XDG_RUNTIME_DIR");
@@ -2176,10 +2145,10 @@ char *unit_name_printf(Unit *u, const char* format) {
          */
 
         const Specifier table[] = {
-                { 'n', specifier_string,              u->id },
+                { 'n', specifier_string,              u->meta.id },
                 { 'N', specifier_prefix_and_instance, NULL },
                 { 'p', specifier_prefix,              NULL },
-                { 'i', specifier_string,              u->instance },
+                { 'i', specifier_string,              u->meta.instance },
                 { 0, NULL, NULL }
         };
 
@@ -2201,11 +2170,11 @@ char *unit_full_printf(Unit *u, const char *format) {
          */
 
         const Specifier table[] = {
-                { 'n', specifier_string,              u->id },
+                { 'n', specifier_string,              u->meta.id },
                 { 'N', specifier_prefix_and_instance, NULL },
                 { 'p', specifier_prefix,              NULL },
                 { 'P', specifier_prefix_unescaped,    NULL },
-                { 'i', specifier_string,              u->instance },
+                { 'i', specifier_string,              u->meta.instance },
                 { 'I', specifier_instance_unescaped,  NULL },
                 { 'f', specifier_filename,            NULL },
                 { 'c', specifier_cgroup,              NULL },
@@ -2256,14 +2225,14 @@ int unit_watch_bus_name(Unit *u, const char *name) {
         /* Watch a specific name on the bus. We only support one unit
          * watching each name for now. */
 
-        return hashmap_put(u->manager->watch_bus, name, u);
+        return hashmap_put(u->meta.manager->watch_bus, name, u);
 }
 
 void unit_unwatch_bus_name(Unit *u, const char *name) {
         assert(u);
         assert(name);
 
-        hashmap_remove_value(u->manager->watch_bus, name, u);
+        hashmap_remove_value(u->meta.manager->watch_bus, name, u);
 }
 
 bool unit_can_serialize(Unit *u) {
@@ -2285,17 +2254,17 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds) {
         if ((r = UNIT_VTABLE(u)->serialize(u, f, fds)) < 0)
                 return r;
 
-        if (u->job)
-                unit_serialize_item(u, f, "job", job_type_to_string(u->job->type));
+        if (u->meta.job)
+                unit_serialize_item(u, f, "job", job_type_to_string(u->meta.job->type));
 
-        dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp);
-        dual_timestamp_serialize(f, "active-enter-timestamp", &u->active_enter_timestamp);
-        dual_timestamp_serialize(f, "active-exit-timestamp", &u->active_exit_timestamp);
-        dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->inactive_enter_timestamp);
-        dual_timestamp_serialize(f, "condition-timestamp", &u->condition_timestamp);
+        dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->meta.inactive_exit_timestamp);
+        dual_timestamp_serialize(f, "active-enter-timestamp", &u->meta.active_enter_timestamp);
+        dual_timestamp_serialize(f, "active-exit-timestamp", &u->meta.active_exit_timestamp);
+        dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->meta.inactive_enter_timestamp);
+        dual_timestamp_serialize(f, "condition-timestamp", &u->meta.condition_timestamp);
 
-        if (dual_timestamp_is_set(&u->condition_timestamp))
-                unit_serialize_item(u, f, "condition-result", yes_no(u->condition_result));
+        if (dual_timestamp_is_set(&u->meta.condition_timestamp))
+                unit_serialize_item(u, f, "condition-result", yes_no(u->meta.condition_result));
 
         /* End marker */
         fputc('\n', f);
@@ -2370,23 +2339,23 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
                         if ((type = job_type_from_string(v)) < 0)
                                 log_debug("Failed to parse job type value %s", v);
                         else
-                                u->deserialized_job = type;
+                                u->meta.deserialized_job = type;
 
                         continue;
                 } else if (streq(l, "inactive-exit-timestamp")) {
-                        dual_timestamp_deserialize(v, &u->inactive_exit_timestamp);
+                        dual_timestamp_deserialize(v, &u->meta.inactive_exit_timestamp);
                         continue;
                 } else if (streq(l, "active-enter-timestamp")) {
-                        dual_timestamp_deserialize(v, &u->active_enter_timestamp);
+                        dual_timestamp_deserialize(v, &u->meta.active_enter_timestamp);
                         continue;
                 } else if (streq(l, "active-exit-timestamp")) {
-                        dual_timestamp_deserialize(v, &u->active_exit_timestamp);
+                        dual_timestamp_deserialize(v, &u->meta.active_exit_timestamp);
                         continue;
                 } else if (streq(l, "inactive-enter-timestamp")) {
-                        dual_timestamp_deserialize(v, &u->inactive_enter_timestamp);
+                        dual_timestamp_deserialize(v, &u->meta.inactive_enter_timestamp);
                         continue;
                 } else if (streq(l, "condition-timestamp")) {
-                        dual_timestamp_deserialize(v, &u->condition_timestamp);
+                        dual_timestamp_deserialize(v, &u->meta.condition_timestamp);
                         continue;
                 } else if (streq(l, "condition-result")) {
                         int b;
@@ -2394,7 +2363,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
                         if ((b = parse_boolean(v)) < 0)
                                 log_debug("Failed to parse condition result value %s", v);
                         else
-                                u->condition_result = b;
+                                u->meta.condition_result = b;
 
                         continue;
                 }
@@ -2422,7 +2391,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {
         if (!(e = unit_name_build_escape(what+1, NULL, ".device")))
                 return -ENOMEM;
 
-        r = manager_load_unit(u->manager, e, NULL, NULL, &device);
+        r = manager_load_unit(u->meta.manager, e, NULL, NULL, &device);
         free(e);
 
         if (r < 0)
@@ -2447,17 +2416,17 @@ int unit_coldplug(Unit *u) {
                 if ((r = UNIT_VTABLE(u)->coldplug(u)) < 0)
                         return r;
 
-        if (u->deserialized_job >= 0) {
-                if ((r = manager_add_job(u->manager, u->deserialized_job, u, JOB_IGNORE_REQUIREMENTS, false, NULL, NULL)) < 0)
+        if (u->meta.deserialized_job >= 0) {
+                if ((r = manager_add_job(u->meta.manager, u->meta.deserialized_job, u, JOB_IGNORE_REQUIREMENTS, false, NULL, NULL)) < 0)
                         return r;
 
-                u->deserialized_job = _JOB_TYPE_INVALID;
+                u->meta.deserialized_job = _JOB_TYPE_INVALID;
         }
 
         return 0;
 }
 
-void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
+void unit_status_printf(Unit *u, const char *format, ...) {
         va_list ap;
 
         assert(u);
@@ -2466,30 +2435,30 @@ void unit_status_printf(Unit *u, const char *status, const char *format, ...) {
         if (!UNIT_VTABLE(u)->show_status)
                 return;
 
-        if (!manager_get_show_status(u->manager))
+        if (!manager_get_show_status(u->meta.manager))
                 return;
 
-        if (!manager_is_booting_or_shutting_down(u->manager))
+        if (!manager_is_booting_or_shutting_down(u->meta.manager))
                 return;
 
         va_start(ap, format);
-        status_vprintf(status, true, format, ap);
+        status_vprintf(format, ap);
         va_end(ap);
 }
 
 bool unit_need_daemon_reload(Unit *u) {
         assert(u);
 
-        if (u->fragment_path) {
+        if (u->meta.fragment_path) {
                 struct stat st;
 
                 zero(st);
-                if (stat(u->fragment_path, &st) < 0)
+                if (stat(u->meta.fragment_path, &st) < 0)
                         /* What, cannot access this anymore? */
                         return true;
 
-                if (u->fragment_mtime > 0 &&
-                    timespec_load(&st.st_mtim) != u->fragment_mtime)
+                if (u->meta.fragment_mtime > 0 &&
+                    timespec_load(&st.st_mtim) != u->meta.fragment_mtime)
                         return true;
         }
 
@@ -2523,7 +2492,7 @@ bool unit_pending_inactive(Unit *u) {
         if (UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)))
                 return true;
 
-        if (u->job && u->job->type == JOB_STOP)
+        if (u->meta.job && u->meta.job->type == JOB_STOP)
                 return true;
 
         return false;
@@ -2532,15 +2501,15 @@ bool unit_pending_inactive(Unit *u) {
 bool unit_pending_active(Unit *u) {
         assert(u);
 
-        /* Returns true if the unit is active or going up */
+        /* Returns true if the unit is inactive or going down */
 
         if (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
                 return true;
 
-        if (u->job &&
-            (u->job->type == JOB_START ||
-             u->job->type == JOB_RELOAD_OR_START ||
-             u->job->type == JOB_RESTART))
+        if (u->meta.job &&
+            (u->meta.job->type == JOB_START ||
+             u->meta.job->type == JOB_RELOAD_OR_START ||
+             u->meta.job->type == JOB_RESTART))
                 return true;
 
         return false;
@@ -2598,34 +2567,12 @@ int unit_following_set(Unit *u, Set **s) {
 UnitFileState unit_get_unit_file_state(Unit *u) {
         assert(u);
 
-        if (u->unit_file_state < 0 && u->fragment_path)
-                u->unit_file_state = unit_file_get_state(
-                                u->manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER,
-                                NULL, file_name_from_path(u->fragment_path));
-
-        return u->unit_file_state;
-}
-
-Unit* unit_ref_set(UnitRef *ref, Unit *u) {
-        assert(ref);
-        assert(u);
-
-        if (ref->unit)
-                unit_ref_unset(ref);
-
-        ref->unit = u;
-        LIST_PREPEND(UnitRef, refs, u->refs, ref);
-        return u;
-}
-
-void unit_ref_unset(UnitRef *ref) {
-        assert(ref);
-
-        if (!ref->unit)
-                return;
+        if (u->meta.unit_file_state < 0 && u->meta.fragment_path)
+                u->meta.unit_file_state = unit_file_get_state(
+                                u->meta.manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER,
+                                NULL, file_name_from_path(u->meta.fragment_path));
 
-        LIST_REMOVE(UnitRef, refs, ref->unit->refs, ref);
-        ref->unit = NULL;
+        return u->meta.unit_file_state;
 }
 
 static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
@@ -2666,11 +2613,7 @@ static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = {
         [UNIT_AFTER] = "After",
         [UNIT_REFERENCES] = "References",
         [UNIT_REFERENCED_BY] = "ReferencedBy",
-        [UNIT_ON_FAILURE] = "OnFailure",
-        [UNIT_TRIGGERS] = "Triggers",
-        [UNIT_TRIGGERED_BY] = "TriggeredBy",
-        [UNIT_PROPAGATE_RELOAD_TO] = "PropagateReloadTo",
-        [UNIT_PROPAGATE_RELOAD_FROM] = "PropagateReloadFrom"
+        [UNIT_ON_FAILURE] = "OnFailure"
 };
 
 DEFINE_STRING_TABLE_LOOKUP(unit_dependency, UnitDependency);
index 756f465..7da5723 100644 (file)
 #include <stdbool.h>
 #include <stdlib.h>
 
-typedef struct Unit Unit;
+typedef union Unit Unit;
+typedef struct Meta Meta;
 typedef struct UnitVTable UnitVTable;
 typedef enum UnitType UnitType;
 typedef enum UnitLoadState UnitLoadState;
 typedef enum UnitActiveState UnitActiveState;
 typedef enum UnitDependency UnitDependency;
-typedef struct UnitRef UnitRef;
 
 #include "set.h"
 #include "util.h"
@@ -119,14 +119,6 @@ enum UnitDependency {
         /* On Failure */
         UNIT_ON_FAILURE,
 
-        /* Triggers (i.e. a socket triggers a service) */
-        UNIT_TRIGGERS,
-        UNIT_TRIGGERED_BY,
-
-        /* Propagate reloads */
-        UNIT_PROPAGATE_RELOAD_TO,
-        UNIT_PROPAGATE_RELOAD_FROM,
-
         /* Reference information for GC logic */
         UNIT_REFERENCES,              /* Inverse of 'references' is 'referenced_by' */
         UNIT_REFERENCED_BY,
@@ -140,7 +132,7 @@ enum UnitDependency {
 #include "cgroup.h"
 #include "cgroup-attr.h"
 
-struct Unit {
+struct Meta {
         Manager *manager;
 
         UnitType type;
@@ -164,9 +156,6 @@ struct Unit {
 
         usec_t job_timeout;
 
-        /* References to this */
-        LIST_HEAD(UnitRef, refs);
-
         /* Conditions to check */
         LIST_HEAD(Condition, conditions);
 
@@ -182,19 +171,19 @@ struct Unit {
         CGroupAttribute *cgroup_attributes;
 
         /* Per type list */
-        LIST_FIELDS(Unit, units_by_type);
+        LIST_FIELDS(Meta, units_by_type);
 
         /* Load queue */
-        LIST_FIELDS(Unit, load_queue);
+        LIST_FIELDS(Meta, load_queue);
 
         /* D-Bus queue */
-        LIST_FIELDS(Unit, dbus_queue);
+        LIST_FIELDS(Meta, dbus_queue);
 
         /* Cleanup queue */
-        LIST_FIELDS(Unit, cleanup_queue);
+        LIST_FIELDS(Meta, cleanup_queue);
 
         /* GC queue */
-        LIST_FIELDS(Unit, gc_queue);
+        LIST_FIELDS(Meta, gc_queue);
 
         /* Used during GC sweeps */
         unsigned gc_marker;
@@ -248,15 +237,6 @@ struct Unit {
         bool in_audit:1;
 };
 
-struct UnitRef {
-        /* Keeps tracks of references to a unit. This is useful so
-         * that we can merge two units if necessary and correct all
-         * references to them */
-
-        Unit* unit;
-        LIST_FIELDS(UnitRef, refs);
-};
-
 #include "service.h"
 #include "timer.h"
 #include "socket.h"
@@ -268,12 +248,23 @@ struct UnitRef {
 #include "swap.h"
 #include "path.h"
 
+union Unit {
+        Meta meta;
+        Service service;
+        Timer timer;
+        Socket socket;
+        Target target;
+        Device device;
+        Mount mount;
+        Automount automount;
+        Snapshot snapshot;
+        Swap swap;
+        Path path;
+};
+
 struct UnitVTable {
         const char *suffix;
 
-        /* How much memory does an object of this unit type need */
-        size_t object_size;
-
         /* Config file sections this unit type understands, separated
          * by NUL chars */
         const char *sections;
@@ -398,19 +389,19 @@ struct UnitVTable {
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
 
-#define UNIT_VTABLE(u) unit_vtable[(u)->type]
+#define UNIT_VTABLE(u) unit_vtable[(u)->meta.type]
 
 /* For casting a unit into the various unit types */
 #define DEFINE_CAST(UPPERCASE, MixedCase)                               \
         static inline MixedCase* UPPERCASE(Unit *u) {                   \
-                if (_unlikely_(!u || u->type != UNIT_##UPPERCASE))      \
+                if (_unlikely_(!u || u->meta.type != UNIT_##UPPERCASE)) \
                         return NULL;                                    \
                                                                         \
                 return (MixedCase*) u;                                  \
         }
 
 /* For casting the various unit types into a unit */
-#define UNIT(u) (&(u)->meta)
+#define UNIT(u) ((Unit*) (&(u)->meta))
 
 DEFINE_CAST(SOCKET, Socket);
 DEFINE_CAST(TIMER, Timer);
@@ -423,7 +414,7 @@ DEFINE_CAST(SNAPSHOT, Snapshot);
 DEFINE_CAST(SWAP, Swap);
 DEFINE_CAST(PATH, Path);
 
-Unit *unit_new(Manager *m, size_t size);
+Unit *unit_new(Manager *m);
 void unit_free(Unit *u);
 
 int unit_add_name(Unit *u, const char *name);
@@ -521,7 +512,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants);
 
 int unit_coldplug(Unit *u);
 
-void unit_status_printf(Unit *u, const char *status, const char *format, ...);
+void unit_status_printf(Unit *u, const char *format, ...);
 
 bool unit_need_daemon_reload(Unit *u);
 
@@ -545,11 +536,6 @@ bool unit_condition_test(Unit *u);
 
 UnitFileState unit_get_unit_file_state(Unit *u);
 
-Unit* unit_ref_set(UnitRef *ref, Unit *u);
-void unit_ref_unset(UnitRef *ref);
-
-#define UNIT_DEREF(ref) ((ref).unit)
-
 const char *unit_load_state_to_string(UnitLoadState i);
 UnitLoadState unit_load_state_from_string(const char *s);
 
index 0d177d6..f81e7f4 100644 (file)
@@ -284,7 +284,7 @@ static int on_shutdown(Context *c) {
                 }
 #endif
 
-        if ((q = utmp_put_shutdown()) < 0) {
+        if ((q = utmp_put_shutdown(0)) < 0) {
                 log_error("Failed to write utmp record: %s", strerror(-q));
                 r = q;
         }
@@ -339,7 +339,7 @@ static int on_runlevel(Context *c) {
         }
 #endif
 
-        if ((q = utmp_put_runlevel(runlevel, previous)) < 0) {
+        if ((q = utmp_put_runlevel(0, runlevel, previous)) < 0) {
                 log_error("Failed to write utmp record: %s", strerror(-q));
                 r = q;
         }
@@ -369,17 +369,14 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
         umask(0022);
 
 #ifdef HAVE_AUDIT
-        if ((c.audit_fd = audit_open()) < 0 &&
-            /* If the kernel lacks netlink or audit support,
-             * don't worry about it. */
-            errno != EAFNOSUPPORT && errno != EPROTONOSUPPORT)
+        if ((c.audit_fd = audit_open()) < 0)
                 log_error("Failed to connect to audit log: %m");
 #endif
 
similarity index 98%
rename from src/login/user-sessions.c
rename to src/user-sessions.c
index 64aa3bb..df46b76 100644 (file)
@@ -35,7 +35,7 @@ int main(int argc, char*argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
+        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
         log_parse_environment();
         log_open();
 
index e9869ea..6ad2430 100644 (file)
@@ -55,7 +55,6 @@
 #include <linux/rtc.h>
 #include <glob.h>
 #include <grp.h>
-#include <sys/mman.h>
 
 #include "macro.h"
 #include "util.h"
@@ -74,7 +73,7 @@ size_t page_size(void) {
         static __thread size_t pgsz = 0;
         long r;
 
-        if (_likely_(pgsz > 0))
+        if (_likely_(pgsz))
                 return pgsz;
 
         assert_se((r = sysconf(_SC_PAGESIZE)) > 0);
@@ -517,7 +516,7 @@ int get_parent_of_pid(pid_t pid, pid_t *_ppid) {
                 return -errno;
 
         if (!(fgets(line, sizeof(line), f))) {
-                r = feof(f) ? -EIO : -errno;
+                r = -errno;
                 fclose(f);
                 return r;
         }
@@ -562,7 +561,7 @@ int get_starttime_of_pid(pid_t pid, unsigned long long *st) {
                 return -errno;
 
         if (!(fgets(line, sizeof(line), f))) {
-                r = feof(f) ? -EIO : -errno;
+                r = -errno;
                 fclose(f);
                 return r;
         }
@@ -705,22 +704,15 @@ int read_one_line_file(const char *fn, char **line) {
         assert(fn);
         assert(line);
 
-        f = fopen(fn, "re");
-        if (!f)
+        if (!(f = fopen(fn, "re")))
                 return -errno;
 
-        if (!fgets(t, sizeof(t), f)) {
-
-                if (ferror(f)) {
-                        r = -errno;
-                        goto finish;
-                }
-
-                t[0] = 0;
+        if (!(fgets(t, sizeof(t), f))) {
+                r = -errno;
+                goto finish;
         }
 
-        c = strdup(t);
-        if (!c) {
+        if (!(c = strdup(t))) {
                 r = -ENOMEM;
                 goto finish;
         }
@@ -1001,51 +993,46 @@ char *truncate_nl(char *s) {
         return s;
 }
 
-int get_process_comm(pid_t pid, char **name) {
+int get_process_name(pid_t pid, char **name) {
+        char *p;
         int r;
 
+        assert(pid >= 1);
         assert(name);
 
-        if (pid == 0)
-                r = read_one_line_file("/proc/self/comm", name);
-        else {
-                char *p;
-                if (asprintf(&p, "/proc/%lu/comm", (unsigned long) pid) < 0)
-                        return -ENOMEM;
+        if (asprintf(&p, "/proc/%lu/comm", (unsigned long) pid) < 0)
+                return -ENOMEM;
 
-                r = read_one_line_file(p, name);
-                free(p);
-        }
+        r = read_one_line_file(p, name);
+        free(p);
 
-        return r;
+        if (r < 0)
+                return r;
+
+        return 0;
 }
 
-int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line) {
-        char *r, *k;
+int get_process_cmdline(pid_t pid, size_t max_length, char **line) {
+        char *p, *r, *k;
         int c;
         bool space = false;
         size_t left;
         FILE *f;
 
+        assert(pid >= 1);
         assert(max_length > 0);
         assert(line);
 
-        if (pid == 0)
-                f = fopen("/proc/self/cmdline", "re");
-        else {
-                char *p;
-                if (asprintf(&p, "/proc/%lu/cmdline", (unsigned long) pid) < 0)
-                        return -ENOMEM;
+        if (asprintf(&p, "/proc/%lu/cmdline", (unsigned long) pid) < 0)
+                return -ENOMEM;
 
-                f = fopen(p, "re");
-                free(p);
-        }
+        f = fopen(p, "re");
+        free(p);
 
         if (!f)
                 return -errno;
 
-        r = new(char, max_length);
-        if (!r) {
+        if (!(r = new(char, max_length))) {
                 fclose(f);
                 return -ENOMEM;
         }
@@ -1089,17 +1076,13 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
 
                 free(r);
 
-                if (!comm_fallback)
-                        return -ENOENT;
-
-                h = get_process_comm(pid, &t);
-                if (h < 0)
+                if ((h = get_process_name(pid, &t)) < 0)
                         return h;
 
-                r = join("[", t, "]", NULL);
+                h = asprintf(&r, "[%s]", t);
                 free(t);
 
-                if (!r)
+                if (h < 0)
                         return -ENOMEM;
         }
 
@@ -1107,107 +1090,6 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char *
         return 0;
 }
 
-int is_kernel_thread(pid_t pid) {
-        char *p;
-        size_t count;
-        char c;
-        bool eof;
-        FILE *f;
-
-        if (pid == 0)
-                return 0;
-
-        if (asprintf(&p, "/proc/%lu/cmdline", (unsigned long) pid) < 0)
-                return -ENOMEM;
-
-        f = fopen(p, "re");
-        free(p);
-
-        if (!f)
-                return -errno;
-
-        count = fread(&c, 1, 1, f);
-        eof = feof(f);
-        fclose(f);
-
-        /* Kernel threads have an empty cmdline */
-
-        if (count <= 0)
-                return eof ? 1 : -errno;
-
-        return 0;
-}
-
-int get_process_exe(pid_t pid, char **name) {
-        int r;
-
-        assert(name);
-
-        if (pid == 0)
-                r = readlink_malloc("/proc/self/exe", name);
-        else {
-                char *p;
-                if (asprintf(&p, "/proc/%lu/exe", (unsigned long) pid) < 0)
-                        return -ENOMEM;
-
-                r = readlink_malloc(p, name);
-                free(p);
-        }
-
-        return r;
-}
-
-int get_process_uid(pid_t pid, uid_t *uid) {
-        char *p;
-        FILE *f;
-        int r;
-
-        assert(uid);
-
-        if (pid == 0)
-                return getuid();
-
-        if (asprintf(&p, "/proc/%lu/status", (unsigned long) pid) < 0)
-                return -ENOMEM;
-
-        f = fopen(p, "re");
-        free(p);
-
-        if (!f)
-                return -errno;
-
-        while (!feof(f)) {
-                char line[LINE_MAX], *l;
-
-                if (!fgets(line, sizeof(line), f)) {
-                        if (feof(f))
-                                break;
-
-                        r = -errno;
-                        goto finish;
-                }
-
-                l = strstrip(line);
-
-                if (startswith(l, "Uid:")) {
-                        l += 4;
-                        l += strspn(l, WHITESPACE);
-
-                        l[strcspn(l, WHITESPACE)] = 0;
-
-                        r = parse_uid(l, uid);
-                        goto finish;
-                }
-        }
-
-        r = -EIO;
-
-finish:
-        fclose(f);
-
-        return r;
-}
-
 char *strnappend(const char *s, const char *suffix, size_t b) {
         size_t a;
         char *r;
@@ -2441,7 +2323,7 @@ fail:
         return r;
 }
 
-int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
+int read_one_char(FILE *f, char *ret, bool *need_nl) {
         struct termios old_termios, new_termios;
         char c;
         char line[LINE_MAX];
@@ -2459,13 +2341,6 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
                 if (tcsetattr(fileno(f), TCSADRAIN, &new_termios) >= 0) {
                         size_t k;
 
-                        if (t != (usec_t) -1) {
-                                if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0) {
-                                        tcsetattr(fileno(f), TCSADRAIN, &old_termios);
-                                        return -ETIMEDOUT;
-                                }
-                        }
-
                         k = fread(&c, 1, 1, f);
 
                         tcsetattr(fileno(f), TCSADRAIN, &old_termios);
@@ -2481,11 +2356,7 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
                 }
         }
 
-        if (t != (usec_t) -1)
-                if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0)
-                        return -ETIMEDOUT;
-
-        if (!fgets(line, sizeof(line), f))
+        if (!(fgets(line, sizeof(line), f)))
                 return -EIO;
 
         truncate_nl(line);
@@ -2516,19 +2387,18 @@ int ask(char *ret, const char *replies, const char *text, ...) {
                 bool need_nl = true;
 
                 if (on_tty)
-                        fputs(ANSI_HIGHLIGHT_ON, stdout);
+                        fputs("\x1B[1m", stdout);
 
                 va_start(ap, text);
                 vprintf(text, ap);
                 va_end(ap);
 
                 if (on_tty)
-                        fputs(ANSI_HIGHLIGHT_OFF, stdout);
+                        fputs("\x1B[0m", stdout);
 
                 fflush(stdout);
 
-                r = read_one_char(stdin, &c, (usec_t) -1, &need_nl);
-                if (r < 0) {
+                if ((r = read_one_char(stdin, &c, &need_nl)) < 0) {
 
                         if (r == -EBADMSG) {
                                 puts("Bad input, please try again.");
@@ -2551,9 +2421,10 @@ int ask(char *ret, const char *replies, const char *text, ...) {
         }
 }
 
-int reset_terminal_fd(int fd, bool switch_to_text) {
+int reset_terminal_fd(int fd) {
         struct termios termios;
         int r = 0;
+        long arg;
 
         /* Set terminal to some sane defaults */
 
@@ -2566,12 +2437,9 @@ int reset_terminal_fd(int fd, bool switch_to_text) {
         /* Disable exclusive mode, just in case */
         ioctl(fd, TIOCNXCL);
 
-        /* Switch to text mode */
-        if (switch_to_text)
-                ioctl(fd, KDSETMODE, KD_TEXT);
-
         /* Enable console unicode mode */
-        ioctl(fd, KDSKBMODE, K_UNICODE);
+        arg = K_UNICODE;
+        ioctl(fd, KDSKBMODE, &arg);
 
         if (tcgetattr(fd, &termios) < 0) {
                 r = -errno;
@@ -2622,7 +2490,7 @@ int reset_terminal(const char *name) {
         if (fd < 0)
                 return fd;
 
-        r = reset_terminal_fd(fd, true);
+        r = reset_terminal_fd(fd);
         close_nointr_nofail(fd);
 
         return r;
@@ -2777,7 +2645,7 @@ int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocst
                         ssize_t l;
                         struct inotify_event *e;
 
-                        if ((l = read(notify, inotify_buffer, sizeof(inotify_buffer))) < 0) {
+                        if ((l = read(notify, &inotify_buffer, sizeof(inotify_buffer))) < 0) {
 
                                 if (errno == EINTR)
                                         continue;
@@ -2816,8 +2684,7 @@ int acquire_terminal(const char *name, bool fail, bool force, bool ignore_tiocst
         if (notify >= 0)
                 close_nointr_nofail(notify);
 
-        r = reset_terminal_fd(fd, true);
-        if (r < 0)
+        if ((r = reset_terminal_fd(fd)) < 0)
                 log_warning("Failed to reset terminal: %s", strerror(-r));
 
         return fd;
@@ -2989,8 +2856,7 @@ ssize_t loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
         while (nbytes > 0) {
                 ssize_t k;
 
-                k = write(fd, p, nbytes);
-                if (k <= 0) {
+                if ((k = write(fd, p, nbytes)) <= 0) {
 
                         if (k < 0 && errno == EINTR)
                                 continue;
@@ -3129,8 +2995,6 @@ int parse_bytes(const char *t, off_t *bytes) {
                 { "M", 1024ULL*1024ULL },
                 { "G", 1024ULL*1024ULL*1024ULL },
                 { "T", 1024ULL*1024ULL*1024ULL*1024ULL },
-                { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
-                { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
                 { "", 1 },
         };
 
@@ -3270,16 +3134,12 @@ fallback:
 void rename_process(const char name[8]) {
         assert(name);
 
-        /* This is a like a poor man's setproctitle(). It changes the
-         * comm field, argv[0], and also the glibc's internally used
-         * name of the process. For the first one a limit of 16 chars
-         * applies, to the second one usually one of 10 (i.e. length
-         * of "/sbin/init"), to the third one one of 7 (i.e. length of
-         * "systemd"). If you pass a longer string it will be
-         * truncated */
-
         prctl(PR_SET_NAME, name);
 
+        /* This is a like a poor man's setproctitle(). The string
+         * passed should fit in 7 chars (i.e. the length of
+         * "systemd") */
+
         if (program_invocation_name)
                 strncpy(program_invocation_name, name, strlen(program_invocation_name));
 
@@ -3406,7 +3266,7 @@ int get_ctty_devnr(pid_t pid, dev_t *d) {
                 return -errno;
 
         if (!fgets(line, sizeof(line), f)) {
-                k = feof(f) ? -EIO : -errno;
+                k = -errno;
                 fclose(f);
                 return k;
         }
@@ -3539,9 +3399,7 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
                         }
 
                         if (honour_sticky)
-                                keep_around =
-                                        (st.st_uid == 0 || st.st_uid == getuid()) &&
-                                        (st.st_mode & S_ISVTX);
+                                keep_around = st.st_uid == 0 && (st.st_mode & S_ISVTX);
 
                         is_dir = S_ISDIR(st.st_mode);
 
@@ -3555,9 +3413,7 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) {
                                         continue;
                                 }
 
-                                keep_around =
-                                        (st.st_uid == 0 || st.st_uid == getuid()) &&
-                                        (st.st_mode & S_ISVTX);
+                                keep_around = st.st_uid == 0 && (st.st_mode & S_ISVTX);
                         }
 
                         is_dir = de->d_type == DT_DIR;
@@ -3619,7 +3475,7 @@ int rm_rf(const char *path, bool only_dirs, bool delete_root, bool honour_sticky
 
         if (delete_root) {
 
-                if (honour_sticky && file_is_priv_sticky(path) > 0)
+                if (honour_sticky && file_is_sticky(path) > 0)
                         return r;
 
                 if (rmdir(path) < 0 && errno != ENOENT) {
@@ -3638,28 +3494,10 @@ int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
          * first change the access mode and only then hand out
          * ownership to avoid a window where access is too open. */
 
-        if (mode != (mode_t) -1)
-                if (chmod(path, mode) < 0)
-                        return -errno;
-
-        if (uid != (uid_t) -1 || gid != (gid_t) -1)
-                if (chown(path, uid, gid) < 0)
-                        return -errno;
-
-        return 0;
-}
-
-int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid) {
-        assert(fd >= 0);
-
-        /* Under the assumption that we are running privileged we
-         * first change the access mode and only then hand out
-         * ownership to avoid a window where access is too open. */
-
-        if (fchmod(fd, mode) < 0)
+        if (chmod(path, mode) < 0)
                 return -errno;
 
-        if (fchown(fd, uid, gid) < 0)
+        if (chown(path, uid, gid) < 0)
                 return -errno;
 
         return 0;
@@ -3693,12 +3531,9 @@ cpu_set_t* cpu_set_malloc(unsigned *ncpus) {
         }
 }
 
-void status_vprintf(const char *status, bool ellipse, const char *format, va_list ap) {
-        char *s = NULL, *spaces = NULL, *e;
-        int fd = -1, c;
-        size_t emax, sl, left;
-        struct iovec iovec[5];
-        int n = 0;
+void status_vprintf(const char *format, va_list ap) {
+        char *s = NULL;
+        int fd = -1;
 
         assert(format);
 
@@ -3708,69 +3543,25 @@ void status_vprintf(const char *status, bool ellipse, const char *format, va_lis
         if (vasprintf(&s, format, ap) < 0)
                 goto finish;
 
-        fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC);
-        if (fd < 0)
+        if ((fd = open_terminal("/dev/console", O_WRONLY|O_NOCTTY|O_CLOEXEC)) < 0)
                 goto finish;
 
-        if (ellipse) {
-                c = fd_columns(fd);
-                if (c <= 0)
-                        c = 80;
-
-                if (status) {
-                        sl = 2 + 6 + 1; /* " [" status "]" */
-                        emax = (size_t) c > sl ? c - sl - 1 : 0;
-                } else
-                        emax = c - 1;
-
-                e = ellipsize(s, emax, 75);
-                if (e) {
-                        free(s);
-                        s = e;
-                }
-        }
-
-        zero(iovec);
-        IOVEC_SET_STRING(iovec[n++], s);
-
-        if (ellipse) {
-                sl = strlen(s);
-                left = emax > sl ? emax - sl : 0;
-                if (left > 0) {
-                        spaces = malloc(left);
-                        if (spaces) {
-                                memset(spaces, ' ', left);
-                                iovec[n].iov_base = spaces;
-                                iovec[n].iov_len = left;
-                                n++;
-                        }
-                }
-        }
-
-        if (status) {
-                IOVEC_SET_STRING(iovec[n++], " [");
-                IOVEC_SET_STRING(iovec[n++], status);
-                IOVEC_SET_STRING(iovec[n++], "]\n");
-        } else
-                IOVEC_SET_STRING(iovec[n++], "\n");
-
-        writev(fd, iovec, n);
+        write(fd, s, strlen(s));
 
 finish:
         free(s);
-        free(spaces);
 
         if (fd >= 0)
                 close_nointr_nofail(fd);
 }
 
-void status_printf(const char *status, bool ellipse, const char *format, ...) {
+void status_printf(const char *format, ...) {
         va_list ap;
 
         assert(format);
 
         va_start(ap, format);
-        status_vprintf(status, ellipse, format, ap);
+        status_vprintf(format, ap);
         va_end(ap);
 }
 
@@ -3788,15 +3579,154 @@ void status_welcome(void) {
                         log_warning("Failed to read /etc/os-release: %s", strerror(-r));
         }
 
+#if defined(TARGET_FEDORA)
+        if (!pretty_name) {
+                if ((r = read_one_line_file("/etc/system-release", &pretty_name)) < 0) {
+
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/system-release: %s", strerror(-r));
+                }
+        }
+
+        if (!ansi_color && pretty_name) {
+
+                /* This tries to mimic the color magic the old Red Hat sysinit
+                 * script did. */
+
+                if (startswith(pretty_name, "Red Hat"))
+                        const_color = "0;31"; /* Red for RHEL */
+                else if (startswith(pretty_name, "Fedora"))
+                        const_color = "0;34"; /* Blue for Fedora */
+        }
+
+#elif defined(TARGET_SUSE)
+
+        if (!pretty_name) {
+                if ((r = read_one_line_file("/etc/SuSE-release", &pretty_name)) < 0) {
+
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/SuSE-release: %s", strerror(-r));
+                }
+        }
+
+        if (!ansi_color)
+                const_color = "0;32"; /* Green for openSUSE */
+
+#elif defined(TARGET_GENTOO)
+
+        if (!pretty_name) {
+                if ((r = read_one_line_file("/etc/gentoo-release", &pretty_name)) < 0) {
+
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/gentoo-release: %s", strerror(-r));
+                }
+        }
+
+        if (!ansi_color)
+                const_color = "1;34"; /* Light Blue for Gentoo */
+
+#elif defined(TARGET_ALTLINUX)
+
+        if (!pretty_name) {
+                if ((r = read_one_line_file("/etc/altlinux-release", &pretty_name)) < 0) {
+
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/altlinux-release: %s", strerror(-r));
+                }
+        }
+
+        if (!ansi_color)
+                const_color = "0;36"; /* Cyan for ALTLinux */
+
+
+#elif defined(TARGET_DEBIAN)
+
+        if (!pretty_name) {
+                char *version;
+
+                if ((r = read_one_line_file("/etc/debian_version", &version)) < 0) {
+
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/debian_version: %s", strerror(-r));
+                } else {
+                        pretty_name = strappend("Debian ", version);
+                        free(version);
+
+                        if (!pretty_name)
+                                log_warning("Failed to allocate Debian version string.");
+                }
+        }
+
+        if (!ansi_color)
+                const_color = "1;31"; /* Light Red for Debian */
+
+#elif defined(TARGET_UBUNTU)
+
+        if ((r = parse_env_file("/etc/lsb-release", NEWLINE,
+                                "DISTRIB_DESCRIPTION", &pretty_name,
+                                NULL)) < 0) {
+
+                if (r != -ENOENT)
+                        log_warning("Failed to read /etc/lsb-release: %s", strerror(-r));
+        }
+
+        if (!ansi_color)
+                const_color = "0;33"; /* Orange/Brown for Ubuntu */
+
+#elif defined(TARGET_SLP)
+
+        if (!const_pretty)
+                const_pretty = "Samsung Linux Platform (SLP)";
+
+        if (!ansi_color)
+                const_color = "1;31"; /* Light Red */
+
+#elif defined(TARGET_MANDRIVA)
+
+        if (!pretty_name) {
+                char *s, *p;
+
+                if ((r = read_one_line_file("/etc/mandriva-release", &s) < 0)) {
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/mandriva-release: %s", strerror(-r));
+                } else {
+                        p = strstr(s, " release ");
+                        if (p) {
+                                *p = '\0';
+                                p += 9;
+                                p[strcspn(p, " ")] = '\0';
+
+                                /* This corresponds to standard rc.sysinit */
+                                if (asprintf(&pretty_name, "%s\x1B[0;39m %s", s, p) > 0)
+                                        const_color = "1;36";
+                                else
+                                        log_warning("Failed to allocate Mandriva version string.");
+                        } else
+                                log_warning("Failed to parse /etc/mandriva-release");
+                        free(s);
+                }
+        }
+#elif defined(TARGET_MEEGO)
+
+        if (!pretty_name) {
+                if ((r = read_one_line_file("/etc/meego-release", &pretty_name)) < 0) {
+
+                        if (r != -ENOENT)
+                                log_warning("Failed to read /etc/meego-release: %s", strerror(-r));
+                }
+        }
+
+       if (!ansi_color)
+               const_color = "1;35"; /* Bright Magenta for MeeGo */
+#endif
+
         if (!pretty_name && !const_pretty)
                 const_pretty = "Linux";
 
         if (!ansi_color && !const_color)
                 const_color = "1";
 
-        status_printf(NULL,
-                      false,
-                      "\nWelcome to \x1B[%sm%s\x1B[0m!\n",
+        status_printf("\nWelcome to \x1B[%sm%s\x1B[0m!\n\n",
                       const_color ? const_color : ansi_color,
                       const_pretty ? const_pretty : pretty_name);
 
@@ -3938,32 +3868,23 @@ char **replace_env_argv(char **argv, char **env) {
         return r;
 }
 
-int fd_columns(int fd) {
-        struct winsize ws;
-        zero(ws);
-
-        if (ioctl(fd, TIOCGWINSZ, &ws) < 0)
-                return -errno;
-
-        if (ws.ws_col <= 0)
-                return -EIO;
-
-        return ws.ws_col;
-}
-
-unsigned columns(void) {
+int columns(void) {
         static __thread int parsed_columns = 0;
         const char *e;
 
         if (_likely_(parsed_columns > 0))
                 return parsed_columns;
 
-        e = getenv("COLUMNS");
-        if (e)
+        if ((e = getenv("COLUMNS")))
                 parsed_columns = atoi(e);
 
-        if (parsed_columns <= 0)
-                parsed_columns = fd_columns(STDOUT_FILENO);
+        if (parsed_columns <= 0) {
+                struct winsize ws;
+                zero(ws);
+
+                if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) >= 0)
+                        parsed_columns = ws.ws_col;
+        }
 
         if (parsed_columns <= 0)
                 parsed_columns = 80;
@@ -3971,39 +3892,6 @@ unsigned columns(void) {
         return parsed_columns;
 }
 
-int fd_lines(int fd) {
-        struct winsize ws;
-        zero(ws);
-
-        if (ioctl(fd, TIOCGWINSZ, &ws) < 0)
-                return -errno;
-
-        if (ws.ws_row <= 0)
-                return -EIO;
-
-        return ws.ws_row;
-}
-
-unsigned lines(void) {
-        static __thread int parsed_lines = 0;
-        const char *e;
-
-        if (_likely_(parsed_lines > 0))
-                return parsed_lines;
-
-        e = getenv("LINES");
-        if (e)
-                parsed_lines = atoi(e);
-
-        if (parsed_lines <= 0)
-                parsed_lines = fd_lines(STDOUT_FILENO);
-
-        if (parsed_lines <= 0)
-                parsed_lines = 25;
-
-        return parsed_lines;
-}
-
 int running_in_chroot(void) {
         struct stat a, b;
 
@@ -4023,41 +3911,38 @@ int running_in_chroot(void) {
                 a.st_ino != b.st_ino;
 }
 
-char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent) {
-        size_t x;
+char *ellipsize(const char *s, unsigned length, unsigned percent) {
+        size_t l, x;
         char *r;
 
         assert(s);
         assert(percent <= 100);
-        assert(new_length >= 3);
+        assert(length >= 3);
 
-        if (old_length <= 3 || old_length <= new_length)
-                return strndup(s, old_length);
+        l = strlen(s);
 
-        r = new0(char, new_length+1);
-        if (!r)
+        if (l <= 3 || l <= length)
+                return strdup(s);
+
+        if (!(r = new0(char, length+1)))
                 return r;
 
-        x = (new_length * percent) / 100;
+        x = (length * percent) / 100;
 
-        if (x > new_length - 3)
-                x = new_length - 3;
+        if (x > length - 3)
+                x = length - 3;
 
         memcpy(r, s, x);
         r[x] = '.';
         r[x+1] = '.';
         r[x+2] = '.';
         memcpy(r + x + 3,
-               s + old_length - (new_length - x - 3),
-               new_length - x - 3);
+               s + l - (length - x - 3),
+               length - x - 3);
 
         return r;
 }
 
-char *ellipsize(const char *s, size_t length, unsigned percent) {
-        return ellipsize_mem(s, strlen(s), length, percent);
-}
-
 int touch(const char *path) {
         int fd;
 
@@ -4074,8 +3959,7 @@ char *unquote(const char *s, const char* quotes) {
         size_t l;
         assert(s);
 
-        l = strlen(s);
-        if (l < 2)
+        if ((l = strlen(s)) < 2)
                 return strdup(s);
 
         if (strchr(quotes, s[0]) && s[l-1] == s[0])
@@ -4367,40 +4251,34 @@ int vtnr_from_tty(const char *tty) {
         return i;
 }
 
-bool tty_is_vc_resolve(const char *tty) {
+const char *default_term_for_tty(const char *tty) {
         char *active = NULL;
-        bool b;
+        const char *term;
 
         assert(tty);
 
         if (startswith(tty, "/dev/"))
                 tty += 5;
 
-        /* Resolve where /dev/console is pointing to */
+        /* Resolve where /dev/console is pointing when determining
+         * TERM */
         if (streq(tty, "console"))
                 if (read_one_line_file("/sys/class/tty/console/active", &active) >= 0) {
                         /* If multiple log outputs are configured the
                          * last one is what /dev/console points to */
-                        tty = strrchr(active, ' ');
-                        if (tty)
+                        if ((tty = strrchr(active, ' ')))
                                 tty++;
                         else
                                 tty = active;
                 }
 
-        b = tty_is_vc(tty);
+        term = tty_is_vc(tty) ? "TERM=linux" : "TERM=vt100";
         free(active);
 
-        return b;
-}
-
-const char *default_term_for_tty(const char *tty) {
-        assert(tty);
-
-        return tty_is_vc_resolve(tty) ? "TERM=linux" : "TERM=vt100";
+        return term;
 }
 
-bool dirent_is_file(const struct dirent *de) {
+bool dirent_is_file(struct dirent *de) {
         assert(de);
 
         if (ignore_file(de->d_name))
@@ -4414,15 +4292,6 @@ bool dirent_is_file(const struct dirent *de) {
         return true;
 }
 
-bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
-        assert(de);
-
-        if (!dirent_is_file(de))
-                return false;
-
-        return endswith(de->d_name, suffix);
-}
-
 void execute_directory(const char *directory, DIR *d, char *argv[]) {
         DIR *_d = NULL;
         struct dirent *de;
@@ -4497,12 +4366,11 @@ void execute_directory(const char *directory, DIR *d, char *argv[]) {
         }
 
         while (!hashmap_isempty(pids)) {
-                pid_t pid = PTR_TO_UINT(hashmap_first_key(pids));
                 siginfo_t si;
                 char *path;
 
                 zero(si);
-                if (waitid(P_PID, pid, &si, WEXITED) < 0) {
+                if (waitid(P_ALL, 0, &si, WEXITED) < 0) {
 
                         if (errno == EINTR)
                                 continue;
@@ -4596,98 +4464,6 @@ void parse_syslog_priority(char **p, int *priority) {
         *p += k;
 }
 
-void skip_syslog_pid(char **buf) {
-        char *p;
-
-        assert(buf);
-        assert(*buf);
-
-        p = *buf;
-
-        if (*p != '[')
-                return;
-
-        p++;
-        p += strspn(p, "0123456789");
-
-        if (*p != ']')
-                return;
-
-        p++;
-
-        *buf = p;
-}
-
-void skip_syslog_date(char **buf) {
-        enum {
-                LETTER,
-                SPACE,
-                NUMBER,
-                SPACE_OR_NUMBER,
-                COLON
-        } sequence[] = {
-                LETTER, LETTER, LETTER,
-                SPACE,
-                SPACE_OR_NUMBER, NUMBER,
-                SPACE,
-                SPACE_OR_NUMBER, NUMBER,
-                COLON,
-                SPACE_OR_NUMBER, NUMBER,
-                COLON,
-                SPACE_OR_NUMBER, NUMBER,
-                SPACE
-        };
-
-        char *p;
-        unsigned i;
-
-        assert(buf);
-        assert(*buf);
-
-        p = *buf;
-
-        for (i = 0; i < ELEMENTSOF(sequence); i++, p++) {
-
-                if (!*p)
-                        return;
-
-                switch (sequence[i]) {
-
-                case SPACE:
-                        if (*p != ' ')
-                                return;
-                        break;
-
-                case SPACE_OR_NUMBER:
-                        if (*p == ' ')
-                                break;
-
-                        /* fall through */
-
-                case NUMBER:
-                        if (*p < '0' || *p > '9')
-                                return;
-
-                        break;
-
-                case LETTER:
-                        if (!(*p >= 'A' && *p <= 'Z') &&
-                            !(*p >= 'a' && *p <= 'z'))
-                                return;
-
-                        break;
-
-                case COLON:
-                        if (*p != ':')
-                                return;
-                        break;
-
-                }
-        }
-
-        *buf = p;
-}
-
 int have_effective_cap(int value) {
         cap_t cap;
         cap_flag_value_t fv;
@@ -4776,24 +4552,6 @@ int pipe_eof(int fd) {
         return pollfd.revents & POLLHUP;
 }
 
-int fd_wait_for_event(int fd, int event, usec_t t) {
-        struct pollfd pollfd;
-        int r;
-
-        zero(pollfd);
-        pollfd.fd = fd;
-        pollfd.events = event;
-
-        r = poll(&pollfd, 1, t == (usec_t) -1 ? -1 : (int) (t / USEC_PER_MSEC));
-        if (r < 0)
-                return -errno;
-
-        if (r == 0)
-                return 0;
-
-        return pollfd.revents;
-}
-
 int fopen_temporary(const char *path, FILE **_f, char **_temp_path) {
         FILE *f;
         char *t;
@@ -4925,6 +4683,21 @@ int vt_disallocate(const char *name) {
         return 0;
 }
 
+
+static int file_is_conf(const struct dirent *d, const char *suffix) {
+        assert(d);
+
+        if (ignore_file(d->d_name))
+                return 0;
+
+        if (d->d_type != DT_REG &&
+            d->d_type != DT_LNK &&
+            d->d_type != DT_UNKNOWN)
+                return 0;
+
+        return endswith(d->d_name, suffix);
+}
+
 static int files_add(Hashmap *h, const char *path, const char *suffix) {
         DIR *dir;
         struct dirent buffer, *de;
@@ -4950,7 +4723,7 @@ static int files_add(Hashmap *h, const char *path, const char *suffix) {
                 if (!de)
                         break;
 
-                if (!dirent_is_file_with_suffix(de, suffix))
+                if (!file_is_conf(de, suffix))
                         continue;
 
                 if (asprintf(&p, "%s/%s", path, de->d_name) < 0) {
@@ -5112,84 +4885,13 @@ int hwclock_reset_localtime_delta(void) {
         return 0;
 }
 
-int rtc_open(int flags) {
-        int fd;
-        DIR *d;
-
-        /* First, we try to make use of the /dev/rtc symlink. If that
-         * doesn't exist, we open the first RTC which has hctosys=1
-         * set. If we don't find any we just take the first RTC that
-         * exists at all. */
-
-        fd = open("/dev/rtc", flags);
-        if (fd >= 0)
-                return fd;
-
-        d = opendir("/sys/class/rtc");
-        if (!d)
-                goto fallback;
-
-        for (;;) {
-                char *p, *v;
-                struct dirent buf, *de;
-                int r;
-
-                r = readdir_r(d, &buf, &de);
-                if (r != 0)
-                        goto fallback;
-
-                if (!de)
-                        goto fallback;
-
-                if (ignore_file(de->d_name))
-                        continue;
-
-                p = join("/sys/class/rtc/", de->d_name, "/hctosys", NULL);
-                if (!p) {
-                        closedir(d);
-                        return -ENOMEM;
-                }
-
-                r = read_one_line_file(p, &v);
-                free(p);
-
-                if (r < 0)
-                        continue;
-
-                r = parse_boolean(v);
-                free(v);
-
-                if (r <= 0)
-                        continue;
-
-                p = strappend("/dev/", de->d_name);
-                fd = open(p, flags);
-                free(p);
-
-                if (fd >= 0) {
-                        closedir(d);
-                        return fd;
-                }
-        }
-
-fallback:
-        if (d)
-                closedir(d);
-
-        fd = open("/dev/rtc0", flags);
-        if (fd < 0)
-                return -errno;
-
-        return fd;
-}
-
 int hwclock_get_time(struct tm *tm) {
         int fd;
         int err = 0;
 
         assert(tm);
 
-        fd = rtc_open(O_RDONLY|O_CLOEXEC);
+        fd = open("/dev/rtc0", O_RDONLY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;
 
@@ -5213,7 +4915,7 @@ int hwclock_set_time(const struct tm *tm) {
 
         assert(tm);
 
-        fd = rtc_open(O_RDONLY|O_CLOEXEC);
+        fd = open("/dev/rtc0", O_RDONLY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;
 
@@ -5372,27 +5074,21 @@ int symlink_or_copy_atomic(const char *from, const char *to) {
 }
 
 int audit_session_from_pid(pid_t pid, uint32_t *id) {
-        char *s;
+        char *p, *s;
         uint32_t u;
         int r;
 
+        assert(pid >= 1);
         assert(id);
 
         if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
                 return -ENOENT;
 
-        if (pid == 0)
-                r = read_one_line_file("/proc/self/sessionid", &s);
-        else {
-                char *p;
-
-                if (asprintf(&p, "/proc/%lu/sessionid", (unsigned long) pid) < 0)
-                        return -ENOMEM;
-
-                r = read_one_line_file(p, &s);
-                free(p);
-        }
+        if (asprintf(&p, "/proc/%lu/sessionid", (unsigned long) pid) < 0)
+                return -ENOMEM;
 
+        r = read_one_line_file(p, &s);
+        free(p);
         if (r < 0)
                 return r;
 
@@ -5409,51 +5105,6 @@ int audit_session_from_pid(pid_t pid, uint32_t *id) {
         return 0;
 }
 
-int audit_loginuid_from_pid(pid_t pid, uid_t *uid) {
-        char *s;
-        uid_t u;
-        int r;
-
-        assert(uid);
-
-        /* Only use audit login uid if we are executed with sufficient
-         * capabilities so that pam_loginuid could do its job. If we
-         * are lacking the CAP_AUDIT_CONTROL capabality we most likely
-         * are being run in a container and /proc/self/loginuid is
-         * useless since it probably contains a uid of the host
-         * system. */
-
-        if (have_effective_cap(CAP_AUDIT_CONTROL) <= 0)
-                return -ENOENT;
-
-        if (pid == 0)
-                r = read_one_line_file("/proc/self/loginuid", &s);
-        else {
-                char *p;
-
-                if (asprintf(&p, "/proc/%lu/loginuid", (unsigned long) pid) < 0)
-                        return -ENOMEM;
-
-                r = read_one_line_file(p, &s);
-                free(p);
-        }
-
-        if (r < 0)
-                return r;
-
-        r = parse_uid(s, &u);
-        free(s);
-
-        if (r < 0)
-                return r;
-
-        if (u == (uid_t) -1)
-                return -ENOENT;
-
-        *uid = (uid_t) u;
-        return 0;
-}
-
 bool display_is_local(const char *display) {
         assert(display);
 
@@ -5845,7 +5496,7 @@ int block_get_whole_disk(dev_t d, dev_t *ret) {
         return -ENOENT;
 }
 
-int file_is_priv_sticky(const char *p) {
+int file_is_sticky(const char *p) {
         struct stat st;
 
         assert(p);
@@ -5854,7 +5505,7 @@ int file_is_priv_sticky(const char *p) {
                 return -errno;
 
         return
-                (st.st_uid == 0 || st.st_uid == getuid()) &&
+                st.st_uid == 0 &&
                 (st.st_mode & S_ISVTX);
 }
 
@@ -6060,139 +5711,3 @@ int strdup_or_null(const char *a, char **b) {
         *b = c;
         return 0;
 }
-
-int prot_from_flags(int flags) {
-
-        switch (flags & O_ACCMODE) {
-
-        case O_RDONLY:
-                return PROT_READ;
-
-        case O_WRONLY:
-                return PROT_WRITE;
-
-        case O_RDWR:
-                return PROT_READ|PROT_WRITE;
-
-        default:
-                return -EINVAL;
-        }
-}
-
-unsigned long cap_last_cap(void) {
-        static __thread unsigned long saved;
-        static __thread bool valid = false;
-        unsigned long p;
-
-        if (valid)
-                return saved;
-
-        p = (unsigned long) CAP_LAST_CAP;
-
-        if (prctl(PR_CAPBSET_READ, p) < 0) {
-
-                /* Hmm, look downwards, until we find one that
-                 * works */
-                for (p--; p > 0; p --)
-                        if (prctl(PR_CAPBSET_READ, p) >= 0)
-                                break;
-
-        } else {
-
-                /* Hmm, look upwards, until we find one that doesn't
-                 * work */
-                for (;; p++)
-                        if (prctl(PR_CAPBSET_READ, p+1) < 0)
-                                break;
-        }
-
-        saved = p;
-        valid = true;
-
-        return p;
-}
-
-char *format_bytes(char *buf, size_t l, off_t t) {
-        unsigned i;
-
-        static const struct {
-                const char *suffix;
-                off_t factor;
-        } table[] = {
-                { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
-                { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL },
-                { "T", 1024ULL*1024ULL*1024ULL*1024ULL },
-                { "G", 1024ULL*1024ULL*1024ULL },
-                { "M", 1024ULL*1024ULL },
-                { "K", 1024ULL },
-        };
-
-        for (i = 0; i < ELEMENTSOF(table); i++) {
-
-                if (t >= table[i].factor) {
-                        snprintf(buf, l,
-                                 "%llu.%llu%s",
-                                 (unsigned long long) (t / table[i].factor),
-                                 (unsigned long long) (((t*10ULL) / table[i].factor) % 10ULL),
-                                 table[i].suffix);
-
-                        goto finish;
-                }
-        }
-
-        snprintf(buf, l, "%lluB", (unsigned long long) t);
-
-finish:
-        buf[l-1] = 0;
-        return buf;
-
-}
-
-void* memdup(const void *p, size_t l) {
-        void *r;
-
-        assert(p);
-
-        r = malloc(l);
-        if (!r)
-                return NULL;
-
-        memcpy(r, p, l);
-        return r;
-}
-
-int fd_inc_sndbuf(int fd, size_t n) {
-        int r, value;
-        socklen_t l = sizeof(value);
-
-        r = getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, &l);
-        if (r >= 0 &&
-            l == sizeof(value) &&
-            (size_t) value >= n*2)
-                return 0;
-
-        value = (int) n;
-        r = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value));
-        if (r < 0)
-                return -errno;
-
-        return 1;
-}
-
-int fd_inc_rcvbuf(int fd, size_t n) {
-        int r, value;
-        socklen_t l = sizeof(value);
-
-        r = getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, &l);
-        if (r >= 0 &&
-            l == sizeof(value) &&
-            (size_t) value >= n*2)
-                return 0;
-
-        value = (int) n;
-        r = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value));
-        if (r < 0)
-                return -errno;
-
-        return 1;
-}
index 890a3b5..ccbe8a3 100644 (file)
@@ -67,10 +67,8 @@ typedef struct dual_timestamp {
 #define FORMAT_TIMESTAMP_MAX 64
 #define FORMAT_TIMESTAMP_PRETTY_MAX 256
 #define FORMAT_TIMESPAN_MAX 64
-#define FORMAT_BYTES_MAX 8
 
-#define ANSI_HIGHLIGHT_ON "\x1B[1;39m"
-#define ANSI_HIGHLIGHT_RED_ON "\x1B[1;31m"
+#define ANSI_HIGHLIGHT_ON "\x1B[1;31m"
 #define ANSI_HIGHLIGHT_GREEN_ON "\x1B[1;32m"
 #define ANSI_HIGHLIGHT_OFF "\x1B[0m"
 
@@ -250,10 +248,8 @@ int parent_of_path(const char *path, char **parent);
 
 int rmdir_parents(const char *path, const char *stop);
 
-int get_process_comm(pid_t pid, char **name);
-int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char **line);
-int get_process_exe(pid_t pid, char **name);
-int get_process_uid(pid_t pid, uid_t *uid);
+int get_process_name(pid_t pid, char **name);
+int get_process_cmdline(pid_t pid, size_t max_length, char **line);
 
 char hexchar(int x);
 int unhexchar(char c);
@@ -278,9 +274,7 @@ bool path_equal(const char *a, const char *b);
 
 char *ascii_strlower(char *path);
 
-bool dirent_is_file(const struct dirent *de);
-bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix);
-
+bool dirent_is_file(struct dirent *de);
 bool ignore_file(const char *filename);
 
 bool chars_intersect(const char *a, const char *b);
@@ -327,10 +321,10 @@ bool fstype_is_network(const char *fstype);
 
 int chvt(int vt);
 
-int read_one_char(FILE *f, char *ret, usec_t timeout, bool *need_nl);
+int read_one_char(FILE *f, char *ret, bool *need_nl);
 int ask(char *ret, const char *replies, const char *text, ...);
 
-int reset_terminal_fd(int fd, bool switch_to_text);
+int reset_terminal_fd(int fd);
 int reset_terminal(const char *name);
 
 int open_terminal(const char *name, int mode);
@@ -369,7 +363,6 @@ int get_ctty_devnr(pid_t pid, dev_t *d);
 int get_ctty(pid_t, dev_t *_devnr, char **r);
 
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);
-int fchmod_and_fchown(int fd, mode_t mode, uid_t uid, gid_t gid);
 
 int rm_rf(const char *path, bool only_dirs, bool delete_root, bool honour_sticky);
 
@@ -377,20 +370,15 @@ int pipe_eof(int fd);
 
 cpu_set_t* cpu_set_malloc(unsigned *ncpus);
 
-void status_vprintf(const char *status, bool ellipse, const char *format, va_list ap);
-void status_printf(const char *status, bool ellipse, const char *format, ...);
+void status_vprintf(const char *format, va_list ap);
+void status_printf(const char *format, ...);
 void status_welcome(void);
 
-int fd_columns(int fd);
-unsigned columns(void);
-
-int fd_lines(int fd);
-unsigned lines(void);
+int columns(void);
 
 int running_in_chroot(void);
 
-char *ellipsize(const char *s, size_t length, unsigned percent);
-char *ellipsize_mem(const char *s, size_t old_length, size_t new_length, unsigned percent);
+char *ellipsize(const char *s, unsigned length, unsigned percent);
 
 int touch(const char *path);
 
@@ -415,7 +403,6 @@ char *fstab_node_to_udev_node(const char *p);
 void filter_environ(const char *prefix);
 
 bool tty_is_vc(const char *tty);
-bool tty_is_vc_resolve(const char *tty);
 int vtnr_from_tty(const char *tty);
 const char *default_term_for_tty(const char *tty);
 
@@ -428,8 +415,6 @@ bool nulstr_contains(const char*nulstr, const char *needle);
 bool plymouth_running(void);
 
 void parse_syslog_priority(char **p, int *priority);
-void skip_syslog_pid(char **buf);
-void skip_syslog_date(char **buf);
 
 int have_effective_cap(int value);
 
@@ -458,7 +443,6 @@ int hwclock_get_time(struct tm *tm);
 int hwclock_set_time(const struct tm *tm);
 
 int audit_session_from_pid(pid_t pid, uint32_t *id);
-int audit_loginuid_from_pid(pid_t pid, uid_t *uid);
 
 bool display_is_local(const char *display);
 int socket_from_display(const char *display, char **path);
@@ -481,7 +465,7 @@ bool in_charset(const char *s, const char* charset);
 
 int block_get_whole_disk(dev_t d, dev_t *ret);
 
-int file_is_priv_sticky(const char *p);
+int file_is_sticky(const char *p);
 
 int strdup_or_null(const char *a, char **b);
 
@@ -522,21 +506,4 @@ extern char **saved_argv;
 
 bool kexec_loaded(void);
 
-int prot_from_flags(int flags);
-
-unsigned long cap_last_cap(void);
-
-char *format_bytes(char *buf, size_t l, off_t t);
-
-int fd_wait_for_event(int fd, int event, usec_t timeout);
-
-void* memdup(const void *p, size_t l);
-
-int rtc_open(int flags);
-
-int is_kernel_thread(pid_t pid);
-
-int fd_inc_sndbuf(int fd, size_t n);
-int fd_inc_rcvbuf(int fd, size_t n);
-
 #endif
index 217ae1e..b03a3e7 100644 (file)
@@ -155,11 +155,11 @@ static int write_entry_wtmp(const struct utmpx *store) {
         return -errno;
 }
 
-static int write_utmp_wtmp(const struct utmpx *store_utmp, const struct utmpx *store_wtmp) {
+static int write_entry_both(const struct utmpx *store) {
         int r, s;
 
-        r = write_entry_utmp(store_utmp);
-        s = write_entry_wtmp(store_wtmp);
+        r = write_entry_utmp(store);
+        s = write_entry_wtmp(store);
 
         if (r >= 0)
                 r = s;
@@ -172,14 +172,10 @@ static int write_utmp_wtmp(const struct utmpx *store_utmp, const struct utmpx *s
         return r;
 }
 
-static int write_entry_both(const struct utmpx *store) {
-        return write_utmp_wtmp(store, store);
-}
-
-int utmp_put_shutdown(void) {
+int utmp_put_shutdown(usec_t t) {
         struct utmpx store;
 
-        init_entry(&store, 0);
+        init_entry(&store, t);
 
         store.ut_type = RUN_LVL;
         strncpy(store.ut_user, "shutdown", sizeof(store.ut_user));
@@ -210,12 +206,12 @@ static const char *sanitize_id(const char *id) {
         return id + l - sizeof(((struct utmpx*) NULL)->ut_id);
 }
 
-int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line) {
+int utmp_put_init_process(usec_t t, const char *id, pid_t pid, pid_t sid, const char *line) {
         struct utmpx store;
 
         assert(id);
 
-        init_timestamp(&store, 0);
+        init_timestamp(&store, t);
 
         store.ut_type = INIT_PROCESS;
         store.ut_pid = pid;
@@ -230,7 +226,7 @@ int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line
 }
 
 int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
-        struct utmpx lookup, store, store_wtmp, *found;
+        struct utmpx lookup, store, *found;
 
         assert(id);
 
@@ -246,7 +242,9 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
         if (found->ut_pid != pid)
                 return 0;
 
-        memcpy(&store, found, sizeof(store));
+        zero(store);
+
+        memcpy(&store, &lookup, sizeof(store));
         store.ut_type = DEAD_PROCESS;
         store.ut_exit.e_termination = code;
         store.ut_exit.e_exit = status;
@@ -255,15 +253,11 @@ int utmp_put_dead_process(const char *id, pid_t pid, int code, int status) {
         zero(store.ut_host);
         zero(store.ut_tv);
 
-        memcpy(&store_wtmp, &store, sizeof(store_wtmp));
-        /* wtmp wants the current time */
-        init_timestamp(&store_wtmp, 0);
-
-        return write_utmp_wtmp(&store, &store_wtmp);
+        return write_entry_both(&store);
 }
 
 
-int utmp_put_runlevel(int runlevel, int previous) {
+int utmp_put_runlevel(usec_t t, int runlevel, int previous) {
         struct utmpx store;
         int r;
 
@@ -283,7 +277,7 @@ int utmp_put_runlevel(int runlevel, int previous) {
         if (previous == runlevel)
                 return 0;
 
-        init_entry(&store, 0);
+        init_entry(&store, t);
 
         store.ut_type = RUN_LVL;
         store.ut_pid = (runlevel & 0xFF) | ((previous & 0xFF) << 8);
index a5998eb..4054aff 100644 (file)
 
 int utmp_get_runlevel(int *runlevel, int *previous);
 
-int utmp_put_shutdown(void);
+int utmp_put_shutdown(usec_t timestamp);
 int utmp_put_reboot(usec_t timestamp);
-int utmp_put_runlevel(int runlevel, int previous);
+int utmp_put_runlevel(usec_t timestamp, int runlevel, int previous);
 
 int utmp_put_dead_process(const char *id, pid_t pid, int code, int status);
-int utmp_put_init_process(const char *id, pid_t pid, pid_t sid, const char *line);
+int utmp_put_init_process(usec_t timestamp, const char *id, pid_t pid, pid_t sid, const char *line);
 
 int utmp_wall(const char *message, bool (*match_tty)(const char *tty));
 
similarity index 99%
rename from src/vconsole/vconsole-setup.c
rename to src/vconsole-setup.c
index 9196789..c5f3628 100644 (file)
@@ -160,7 +160,7 @@ int main(int argc, char **argv) {
 #ifdef TARGET_GENTOO
         char *vc_unicode = NULL;
 #endif
-#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#ifdef TARGET_MANDRIVA
         char *vc_keytable = NULL;
 #endif
         int fd = -1;
@@ -371,7 +371,7 @@ int main(int argc, char **argv) {
                                 log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r));
                 }
 
-#elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA)
+#elif defined(TARGET_MANDRIVA)
 
                 if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
                                         "SYSFONT", &vc_font,
index 3f0912a..380fabd 100644 (file)
@@ -209,13 +209,6 @@ int detect_container(const char **id) {
                                         *id = "lxc";
                                 return 1;
 
-                        } else if (streq(line, "container=lxc-libvirt")) {
-                                fclose(f);
-
-                                if (id)
-                                        *id = "lxc-libvirt";
-                                return 1;
-
                         } else if (streq(line, "container=systemd-nspawn")) {
                                 fclose(f);
 
diff --git a/src/wraplabel.c b/src/wraplabel.c
deleted file mode 100644 (file)
index 6af8be4..0000000
+++ /dev/null
@@ -1,335 +0,0 @@
-/* wraplabel.c generated by valac 0.15.1, the Vala compiler
- * generated from wraplabel.vala, do not modify */
-
-/* Copyright (c) 2005 VMware, Inc.*/
-/* This is a translation of http://git.gnome.org/browse/meld/tree/meld/ui/wraplabel.py,*/
-/* which in turn is a translation of WrapLabel from libview.*/
-/* Permission is hereby granted, free of charge, to any person obtaining a copy*/
-/* of this software and associated documentation files (the "Software"), to deal*/
-/* in the Software without restriction, including without limitation the rights*/
-/* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell*/
-/* copies of the Software, and to permit persons to whom the Software is*/
-/* furnished to do so, subject to the following conditions:*/
-/**/
-/* The above copyright notice and this permission notice shall be included in*/
-/* all copies or substantial portions of the Software.*/
-/**/
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*/
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,*/
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE*/
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*/
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,*/
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE*/
-/* SOFTWARE.*/
-/* Python translation from wrapLabel.{cc|h} by Gian Mario Tagliaretti*/
-/* Vala translation from wraplabel.py by Zbigniew JÄ™drzejewski-Szmek*/
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pango/pango.h>
-#include <float.h>
-#include <math.h>
-#include <gdk/gdk.h>
-
-
-#define TYPE_WRAP_LABEL (wrap_label_get_type ())
-#define WRAP_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_WRAP_LABEL, WrapLabel))
-#define WRAP_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_WRAP_LABEL, WrapLabelClass))
-#define IS_WRAP_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_WRAP_LABEL))
-#define IS_WRAP_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_WRAP_LABEL))
-#define WRAP_LABEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_WRAP_LABEL, WrapLabelClass))
-
-typedef struct _WrapLabel WrapLabel;
-typedef struct _WrapLabelClass WrapLabelClass;
-typedef struct _WrapLabelPrivate WrapLabelPrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-
-struct _WrapLabel {
-       GtkLabel parent_instance;
-       WrapLabelPrivate * priv;
-};
-
-struct _WrapLabelClass {
-       GtkLabelClass parent_class;
-};
-
-struct _WrapLabelPrivate {
-       gint _wrap_width;
-};
-
-
-static gpointer wrap_label_parent_class = NULL;
-
-GType wrap_label_get_type (void) G_GNUC_CONST;
-#define WRAP_LABEL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_WRAP_LABEL, WrapLabelPrivate))
-enum  {
-       WRAP_LABEL_DUMMY_PROPERTY
-};
-WrapLabel* wrap_label_new (const gchar* text);
-WrapLabel* wrap_label_construct (GType object_type, const gchar* text);
-void wrap_label_set_text (WrapLabel* self, const gchar* str);
-static void wrap_label_real_size_request (GtkWidget* base, GtkRequisition* requisition);
-static void wrap_label_real_size_allocate (GtkWidget* base, GdkRectangle* allocation);
-static void _wrap_label_set_wrap_width (WrapLabel* self, gint width);
-void wrap_label_set_markup (WrapLabel* self, const gchar* str);
-static void wrap_label_finalize (GObject* obj);
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 32 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       return self ? g_object_ref (self) : NULL;
-#line 85 "wraplabel.c"
-}
-
-
-WrapLabel* wrap_label_construct (GType object_type, const gchar* text) {
-       WrapLabel * self = NULL;
-       PangoLayout* _tmp0_ = NULL;
-       PangoLayout* _tmp1_;
-       PangoLayout* layout;
-       PangoLayout* _tmp2_;
-       const gchar* _tmp3_;
-#line 30 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       self = (WrapLabel*) g_object_new (object_type, NULL);
-#line 31 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       self->priv->_wrap_width = 0;
-#line 32 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp0_ = gtk_label_get_layout ((GtkLabel*) self);
-#line 32 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp1_ = _g_object_ref0 (_tmp0_);
-#line 32 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       layout = _tmp1_;
-#line 33 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp2_ = layout;
-#line 33 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       pango_layout_set_wrap (_tmp2_, PANGO_WRAP_WORD_CHAR);
-#line 34 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp3_ = text;
-#line 34 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       if (_tmp3_ != NULL) {
-#line 114 "wraplabel.c"
-               const gchar* _tmp4_;
-#line 35 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               _tmp4_ = text;
-#line 35 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               wrap_label_set_text (self, _tmp4_);
-#line 120 "wraplabel.c"
-       }
-#line 36 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       gtk_misc_set_alignment ((GtkMisc*) self, (gfloat) 0, (gfloat) 0);
-#line 30 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _g_object_unref0 (layout);
-#line 30 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       return self;
-#line 128 "wraplabel.c"
-}
-
-
-WrapLabel* wrap_label_new (const gchar* text) {
-#line 30 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       return wrap_label_construct (TYPE_WRAP_LABEL, text);
-#line 135 "wraplabel.c"
-}
-
-
-static void wrap_label_real_size_request (GtkWidget* base, GtkRequisition* requisition) {
-       WrapLabel * self;
-       GtkRequisition _vala_requisition = {0};
-       gint width = 0;
-       gint height = 0;
-       PangoLayout* _tmp0_ = NULL;
-       PangoLayout* _tmp1_;
-       PangoLayout* layout;
-       gint _tmp2_ = 0;
-       gint _tmp3_ = 0;
-#line 39 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       self = (WrapLabel*) base;
-#line 41 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp0_ = gtk_label_get_layout ((GtkLabel*) self);
-#line 41 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp1_ = _g_object_ref0 (_tmp0_);
-#line 41 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       layout = _tmp1_;
-#line 42 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       pango_layout_get_pixel_size (layout, &_tmp2_, &_tmp3_);
-#line 42 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       width = _tmp2_;
-#line 42 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       height = _tmp3_;
-#line 43 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _vala_requisition.width = 0;
-#line 44 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _vala_requisition.height = height;
-#line 39 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _g_object_unref0 (layout);
-#line 39 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       if (requisition) {
-#line 39 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               *requisition = _vala_requisition;
-#line 173 "wraplabel.c"
-       }
-}
-
-
-static void wrap_label_real_size_allocate (GtkWidget* base, GdkRectangle* allocation) {
-       WrapLabel * self;
-       GdkRectangle _tmp0_;
-       GdkRectangle _tmp1_;
-       gint _tmp2_;
-#line 47 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       self = (WrapLabel*) base;
-#line 47 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_return_if_fail (allocation != NULL);
-#line 48 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp0_ = *allocation;
-#line 48 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       GTK_WIDGET_CLASS (wrap_label_parent_class)->size_allocate ((GtkWidget*) GTK_LABEL (self), &_tmp0_);
-#line 49 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp1_ = *allocation;
-#line 49 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp2_ = _tmp1_.width;
-#line 49 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _wrap_label_set_wrap_width (self, _tmp2_);
-#line 197 "wraplabel.c"
-}
-
-
-void wrap_label_set_text (WrapLabel* self, const gchar* str) {
-       const gchar* _tmp0_;
-       gint _tmp1_;
-#line 52 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_return_if_fail (self != NULL);
-#line 52 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_return_if_fail (str != NULL);
-#line 53 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp0_ = str;
-#line 53 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       gtk_label_set_text (GTK_LABEL (self), _tmp0_);
-#line 54 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp1_ = self->priv->_wrap_width;
-#line 54 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _wrap_label_set_wrap_width (self, _tmp1_);
-#line 216 "wraplabel.c"
-}
-
-
-void wrap_label_set_markup (WrapLabel* self, const gchar* str) {
-       const gchar* _tmp0_;
-       gint _tmp1_;
-#line 57 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_return_if_fail (self != NULL);
-#line 57 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_return_if_fail (str != NULL);
-#line 58 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp0_ = str;
-#line 58 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       gtk_label_set_markup (GTK_LABEL (self), _tmp0_);
-#line 59 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp1_ = self->priv->_wrap_width;
-#line 59 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _wrap_label_set_wrap_width (self, _tmp1_);
-#line 235 "wraplabel.c"
-}
-
-
-static void _wrap_label_set_wrap_width (WrapLabel* self, gint width) {
-       gint _tmp0_;
-       PangoLayout* _tmp1_ = NULL;
-       PangoLayout* _tmp2_;
-       PangoLayout* layout;
-       PangoLayout* _tmp3_;
-       gint _tmp4_;
-       gint _tmp5_;
-       gint _tmp6_;
-#line 62 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_return_if_fail (self != NULL);
-#line 63 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp0_ = width;
-#line 63 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       if (_tmp0_ == 0) {
-#line 64 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               return;
-#line 256 "wraplabel.c"
-       }
-#line 66 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp1_ = gtk_label_get_layout ((GtkLabel*) self);
-#line 66 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp2_ = _g_object_ref0 (_tmp1_);
-#line 66 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       layout = _tmp2_;
-#line 67 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp3_ = layout;
-#line 67 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp4_ = width;
-#line 67 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       pango_layout_set_width (_tmp3_, _tmp4_ * PANGO_SCALE);
-#line 68 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp5_ = self->priv->_wrap_width;
-#line 68 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _tmp6_ = width;
-#line 68 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       if (_tmp5_ != _tmp6_) {
-#line 276 "wraplabel.c"
-               gint _tmp7_;
-#line 69 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               _tmp7_ = width;
-#line 69 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               self->priv->_wrap_width = _tmp7_;
-#line 70 "/home/lennart/projects/systemd/src/wraplabel.vala"
-               gtk_widget_queue_resize ((GtkWidget*) self);
-#line 284 "wraplabel.c"
-       }
-#line 62 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       _g_object_unref0 (layout);
-#line 288 "wraplabel.c"
-}
-
-
-static void wrap_label_class_init (WrapLabelClass * klass) {
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       wrap_label_parent_class = g_type_class_peek_parent (klass);
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       g_type_class_add_private (klass, sizeof (WrapLabelPrivate));
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       GTK_WIDGET_CLASS (klass)->size_request = wrap_label_real_size_request;
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       GTK_WIDGET_CLASS (klass)->size_allocate = wrap_label_real_size_allocate;
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       G_OBJECT_CLASS (klass)->finalize = wrap_label_finalize;
-#line 303 "wraplabel.c"
-}
-
-
-static void wrap_label_instance_init (WrapLabel * self) {
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       self->priv = WRAP_LABEL_GET_PRIVATE (self);
-#line 310 "wraplabel.c"
-}
-
-
-static void wrap_label_finalize (GObject* obj) {
-       WrapLabel * self;
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       self = WRAP_LABEL (obj);
-#line 27 "/home/lennart/projects/systemd/src/wraplabel.vala"
-       G_OBJECT_CLASS (wrap_label_parent_class)->finalize (obj);
-#line 320 "wraplabel.c"
-}
-
-
-GType wrap_label_get_type (void) {
-       static volatile gsize wrap_label_type_id__volatile = 0;
-       if (g_once_init_enter (&wrap_label_type_id__volatile)) {
-               static const GTypeInfo g_define_type_info = { sizeof (WrapLabelClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) wrap_label_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (WrapLabel), 0, (GInstanceInitFunc) wrap_label_instance_init, NULL };
-               GType wrap_label_type_id;
-               wrap_label_type_id = g_type_register_static (GTK_TYPE_LABEL, "WrapLabel", &g_define_type_info, 0);
-               g_once_init_leave (&wrap_label_type_id__volatile, wrap_label_type_id);
-       }
-       return wrap_label_type_id__volatile;
-}
-
-
-
diff --git a/src/wraplabel.vala b/src/wraplabel.vala
deleted file mode 100644 (file)
index 49858c3..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) 2005 VMware, Inc.
-
-// This is a translation of http://git.gnome.org/browse/meld/tree/meld/ui/wraplabel.py,
-// which in turn is a translation of WrapLabel from libview.
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-// Python translation from wrapLabel.{cc|h} by Gian Mario Tagliaretti
-// Vala translation from wraplabel.py by Zbigniew JÄ™drzejewski-Szmek
-
-public class WrapLabel : Gtk.Label {
-        private int _wrap_width;
-
-        public WrapLabel(string? text = null) {
-                this._wrap_width = 0;
-                var layout = get_layout();
-                layout.set_wrap(Pango.WrapMode.WORD_CHAR);
-                if (text != null)
-                        this.set_text(text);
-                this.set_alignment(0, 0);
-        }
-
-        public override void size_request(out Gtk.Requisition requisition) {
-                int width, height;
-                var layout = get_layout();
-                layout.get_pixel_size(out width, out height);
-                requisition.width = 0;
-                requisition.height = height;
-        }
-
-        public override void size_allocate(Gdk.Rectangle allocation) {
-                base.size_allocate (allocation);
-                this._set_wrap_width(allocation.width);
-        }
-
-        public new void set_text(string str) {
-                base.set_text(str);
-                this._set_wrap_width(this._wrap_width);
-        }
-
-        public new void set_markup(string str) {
-                base.set_markup(str);
-                this._set_wrap_width(this._wrap_width);
-        }
-
-        private void _set_wrap_width(int width) {
-                if (width == 0)
-                        return;
-
-                var layout = get_layout();
-                layout.set_width(width * Pango.SCALE);
-                if (_wrap_width != width) {
-                        this._wrap_width = width;
-                        this.queue_resize();
-                }
-        }
-}
diff --git a/systemadm_vala.stamp b/systemadm_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemctl_vala.stamp b/systemctl_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
similarity index 96%
rename from src/systemd.pc.in
rename to systemd.pc.in
index 4f2abb0..29376e5 100644 (file)
@@ -7,7 +7,6 @@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-systemdutildir=@rootlibexecdir@
 systemdsystemunitdir=@systemunitdir@
 systemduserunitdir=@userunitdir@
 systemdsystemconfdir=@pkgsysconfdir@/system
diff --git a/systemd_ac_power_vala.stamp b/systemd_ac_power_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_ask_password_vala.stamp b/systemd_ask_password_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_binfmt_vala.stamp b/systemd_binfmt_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_cat_vala.stamp b/systemd_cat_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_cgls_vala.stamp b/systemd_cgls_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_cgroups_agent_vala.stamp b/systemd_cgroups_agent_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_cgtop_vala.stamp b/systemd_cgtop_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_coredump_vala.stamp b/systemd_coredump_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_cryptsetup_generator_vala.stamp b/systemd_cryptsetup_generator_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_cryptsetup_vala.stamp b/systemd_cryptsetup_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_detect_virt_vala.stamp b/systemd_detect_virt_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_fsck_vala.stamp b/systemd_fsck_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_getty_generator_vala.stamp b/systemd_getty_generator_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_gnome_ask_password_agent_vala.stamp b/systemd_gnome_ask_password_agent_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_hostnamed_vala.stamp b/systemd_hostnamed_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_initctl_vala.stamp b/systemd_initctl_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_journalctl_vala.stamp b/systemd_journalctl_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_journald_vala.stamp b/systemd_journald_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_localed_vala.stamp b/systemd_localed_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_loginctl_vala.stamp b/systemd_loginctl_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_logind_vala.stamp b/systemd_logind_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_machine_id_setup_vala.stamp b/systemd_machine_id_setup_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_modules_load_vala.stamp b/systemd_modules_load_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_multi_seat_x_vala.stamp b/systemd_multi_seat_x_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_notify_vala.stamp b/systemd_notify_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_nspawn_vala.stamp b/systemd_nspawn_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_quotacheck_vala.stamp b/systemd_quotacheck_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_random_seed_vala.stamp b/systemd_random_seed_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_rc_local_generator_vala.stamp b/systemd_rc_local_generator_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_readahead_collect_vala.stamp b/systemd_readahead_collect_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_readahead_replay_vala.stamp b/systemd_readahead_replay_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_remount_api_vfs_vala.stamp b/systemd_remount_api_vfs_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_reply_password_vala.stamp b/systemd_reply_password_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_shutdown_vala.stamp b/systemd_shutdown_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_shutdownd_vala.stamp b/systemd_shutdownd_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_stdio_bridge_vala.stamp b/systemd_stdio_bridge_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_sysctl_vala.stamp b/systemd_sysctl_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_timedated_vala.stamp b/systemd_timedated_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_timestamp_vala.stamp b/systemd_timestamp_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_tmpfiles_vala.stamp b/systemd_tmpfiles_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_tty_ask_password_agent_vala.stamp b/systemd_tty_ask_password_agent_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_uaccess_vala.stamp b/systemd_uaccess_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_update_utmp_vala.stamp b/systemd_update_utmp_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_user_sessions_vala.stamp b/systemd_user_sessions_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/systemd_vala.stamp b/systemd_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/systemd_vconsole_setup_vala.stamp b/systemd_vconsole_setup_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test1/default.target b/test1/default.target
new file mode 120000 (symlink)
index 0000000..264d980
--- /dev/null
@@ -0,0 +1 @@
+multiuser.target
\ No newline at end of file
diff --git a/test1/exec-demo.service b/test1/exec-demo.service
new file mode 100644 (file)
index 0000000..5802e37
--- /dev/null
@@ -0,0 +1,9 @@
+[Meta]
+Description=Simple Execution Demo
+
+[Service]
+ExecStartPre=/bin/ps -eo pid,uid,args,cgroup
+ExecStartPre=/bin/cat /etc/hosts
+ExecStart=/bin/bash -c '/bin/sleep 5 &'
+Type=forking
+Output=syslog
diff --git a/test1/fifo-demo.service b/test1/fifo-demo.service
new file mode 100644 (file)
index 0000000..51b1996
--- /dev/null
@@ -0,0 +1,8 @@
+[Meta]
+Description=FIFO Activation Demo Service
+
+[Service]
+ExecStartPre=/bin/echo "Wow, es geht los!"
+#ExecStart=/bin/bash -c 'read a <&3 ; echo "GOT: $a"'
+ExecStart=/bin/bash -c 'cat <&3'
+Type=simple
diff --git a/test1/fifo-demo.socket b/test1/fifo-demo.socket
new file mode 100644 (file)
index 0000000..75ce7a6
--- /dev/null
@@ -0,0 +1,6 @@
+[Meta]
+Description=FIFO Activation Demo Socket
+
+[Socket]
+ListenFIFO=/tmp/systemd-fifo-demo
+ExecStartPost=/bin/echo "OK, we're ready, now write something to /tmp/systemd-fifo-demo"
diff --git a/test1/mail-transfer-agent.service b/test1/mail-transfer-agent.service
new file mode 120000 (symlink)
index 0000000..bca89da
--- /dev/null
@@ -0,0 +1 @@
+postfix.service
\ No newline at end of file
diff --git a/test1/mail-transfer-agent.socket b/test1/mail-transfer-agent.socket
new file mode 120000 (symlink)
index 0000000..daf3277
--- /dev/null
@@ -0,0 +1 @@
+postfix.socket
\ No newline at end of file
diff --git a/test1/multiuser.target b/test1/multiuser.target
new file mode 100644 (file)
index 0000000..f105e3c
--- /dev/null
@@ -0,0 +1,2 @@
+[Meta]
+Description=Multi-User Target
diff --git a/test1/multiuser.target.wants/exec-demo.service b/test1/multiuser.target.wants/exec-demo.service
new file mode 120000 (symlink)
index 0000000..0ec1e35
--- /dev/null
@@ -0,0 +1 @@
+../exec-demo.service
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/fifo-demo.socket b/test1/multiuser.target.wants/fifo-demo.socket
new file mode 120000 (symlink)
index 0000000..4c3d621
--- /dev/null
@@ -0,0 +1 @@
+../fifo-demo.socket
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/mail-transfer-agent.socket b/test1/multiuser.target.wants/mail-transfer-agent.socket
new file mode 120000 (symlink)
index 0000000..3c3a2db
--- /dev/null
@@ -0,0 +1 @@
+../mail-transfer-agent.socket
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/permissions.service b/test1/multiuser.target.wants/permissions.service
new file mode 120000 (symlink)
index 0000000..98f3d5f
--- /dev/null
@@ -0,0 +1 @@
+../permissions.service
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/systemd-logger.socket b/test1/multiuser.target.wants/systemd-logger.socket
new file mode 120000 (symlink)
index 0000000..4ce0a61
--- /dev/null
@@ -0,0 +1 @@
+../systemd-logger.socket
\ No newline at end of file
diff --git a/test1/permissions.service b/test1/permissions.service
new file mode 100644 (file)
index 0000000..cb0664f
--- /dev/null
@@ -0,0 +1,11 @@
+[Meta]
+Description=Permission Enforcement checker
+
+[Service]
+ExecStart=/usr/bin/id
+ExecStartPost=/usr/bin/env
+ExecStartPost=/bin/sleep 5
+Type=oneshot
+Capabilities=all= cap_dac_override=eip
+User=nobody
+Group=nobody
diff --git a/test1/postfix.service b/test1/postfix.service
new file mode 100644 (file)
index 0000000..fbf39ec
--- /dev/null
@@ -0,0 +1,7 @@
+[Meta]
+Names=mail-transfer-agent.service
+Description=Postfix Mail Server
+Requires=syslog.socket
+
+[Service]
+ExecStart=/usr/bin/postfix
diff --git a/test1/postfix.socket b/test1/postfix.socket
new file mode 100644 (file)
index 0000000..9d650a1
--- /dev/null
@@ -0,0 +1,13 @@
+[Meta]
+Description=Postfix SMTP Socket
+
+[Socket]
+ListenStream=53333
+ListenFIFO=/tmp/systemd-postfix-fifo
+ExecStartPre=/bin/echo "About to create sockets..."
+ExecStartPre=/bin/echo "About to create sockets... 2"
+ExecStartPost=/bin/echo "Created sockets..."
+ExecStopPre=/bin/echo "About to delete sockets..."
+ExecStopPost=/bin/echo "Deleted sockets..."
+ExecStopPost=/bin/echo "Deleted sockets... 2"
+#BindToDevice=eth0
diff --git a/test1/syslog.service b/test1/syslog.service
new file mode 100644 (file)
index 0000000..8fe47ae
--- /dev/null
@@ -0,0 +1,5 @@
+[Meta]
+Description=System Logging Daemon
+
+[Service]
+ExecStart=/usr/bin/rsyslogd --foobar 'waldo'
diff --git a/test1/syslog.socket b/test1/syslog.socket
new file mode 100644 (file)
index 0000000..f2d3297
--- /dev/null
@@ -0,0 +1,8 @@
+[Meta]
+Description=Syslog Socket
+
+[Socket]
+ListenDatagram=/tmp/foobar/waldo/systemd-syslog-socket
+ListenStream=eth0:3456
+DirectoryMode=0700
+SocketMode=0600
diff --git a/test1/systemd-logger.service b/test1/systemd-logger.service
new file mode 100644 (file)
index 0000000..c406d26
--- /dev/null
@@ -0,0 +1,13 @@
+[Meta]
+Description=systemd Logging Daemon
+
+[Service]
+ExecStart=/home/lennart/projects/systemd/systemd-logger
+Type=simple
+TimerSlackNS=1000000
+OOMScoreAdjust=40
+LimitCORE=0
+LimitFSIZE=0
+LimitLOCKS=0
+LimitMEMLOCK=0
+LimitNOFILE=512
diff --git a/test1/systemd-logger.socket b/test1/systemd-logger.socket
new file mode 100644 (file)
index 0000000..eb012c8
--- /dev/null
@@ -0,0 +1,5 @@
+[Meta]
+Description=systemd Logging Socket
+
+[Socket]
+ListenStream=@/org/freedesktop/systemd1/logger
diff --git a/test2/Makefile b/test2/Makefile
new file mode 100644 (file)
index 0000000..9aa46b4
--- /dev/null
@@ -0,0 +1,7 @@
+# Just a little hook script to easy building when in this directory
+
+all:
+       $(MAKE) -C ..
+
+clean:
+       $(MAKE) -C .. clean
diff --git a/test2/a.service b/test2/a.service
new file mode 100644 (file)
index 0000000..4168d2d
--- /dev/null
@@ -0,0 +1,7 @@
+[Unit]
+Description=A
+Requires=b.service
+Before=b.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/b.service b/test2/b.service
new file mode 100644 (file)
index 0000000..e03bae3
--- /dev/null
@@ -0,0 +1,6 @@
+[Unit]
+Description=B
+Wants=f.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/c.service b/test2/c.service
new file mode 100644 (file)
index 0000000..e2f60a8
--- /dev/null
@@ -0,0 +1,6 @@
+[Unit]
+Description=C
+Requires=a.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/d.service b/test2/d.service
new file mode 100644 (file)
index 0000000..921fd2e
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=D:Cyclic
+After=b.service
+Before=a.service
+Requires=a.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/e.service b/test2/e.service
new file mode 100644 (file)
index 0000000..5ba98c7
--- /dev/null
@@ -0,0 +1,8 @@
+[Unit]
+Description=E:Cyclic
+After=b.service
+Before=a.service
+Wants=a.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/f.service b/test2/f.service
new file mode 100644 (file)
index 0000000..7dde681
--- /dev/null
@@ -0,0 +1,5 @@
+[Unit]
+Description=F
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/g.service b/test2/g.service
new file mode 100644 (file)
index 0000000..cbfa82a
--- /dev/null
@@ -0,0 +1,6 @@
+[Unit]
+Description=G
+Conflicts=e.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test2/h.service b/test2/h.service
new file mode 100644 (file)
index 0000000..74a7751
--- /dev/null
@@ -0,0 +1,6 @@
+[Unit]
+Description=H
+Wants=g.service
+
+[Service]
+ExecStart=/bin/true
diff --git a/test_cgroup_vala.stamp b/test_cgroup_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_daemon_vala.stamp b/test_daemon_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_engine_vala.stamp b/test_engine_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_env_replace_vala.stamp b/test_env_replace_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_hostname_vala.stamp b/test_hostname_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_id128_vala.stamp b/test_id128_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_install_vala.stamp b/test_install_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/test_job_type_vala.stamp b/test_job_type_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_journal_vala.stamp b/test_journal_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_login_vala.stamp b/test_login_vala.stamp
deleted file mode 100644 (file)
index 859afb1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-stamp
diff --git a/test_loopback_vala.stamp b/test_loopback_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_ns_vala.stamp b/test_ns_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/test_strv_vala.stamp b/test_strv_vala.stamp
deleted file mode 100644 (file)
index e69de29..0000000
index 9198e89..c357b18 100644 (file)
@@ -17,6 +17,6 @@
 # On modern systems a BSD file lock is a better choice if
 # serialization is needed on those devices.
 
-d /run/lock 0755 root root -
+d /run/lock 1777 root root -
 d /run/lock/subsys 0755 root root -
-d /run/lock/lockdev 0775 root lock -
+d /run/lock/lockdev 0775 root root -
diff --git a/units/.gitignore b/units/.gitignore
new file mode 100644 (file)
index 0000000..cc92c73
--- /dev/null
@@ -0,0 +1,41 @@
+user@.service
+systemd-logind.service
+systemd-localed.service
+systemd-timedated.service
+systemd-hostnamed.service
+console-shell.service
+systemd-sysctl.service
+systemd-ask-password-console.service
+rescue.service
+systemd-ask-password-plymouth.service
+systemd-ask-password-wall.service
+quotacheck.service
+fsck@.service
+fsck-root.service
+systemd-tmpfiles-clean.service
+systemd-tmpfiles-setup.service
+halt.service
+poweroff.service
+reboot.service
+kexec.service
+systemd-user-sessions.service
+systemd-readahead-done.service
+systemd-tmpfiles.service
+systemd-readahead-collect.service
+systemd-readahead-replay.service
+serial-getty@.service
+systemd-kmsg-syslogd.service
+systemd-modules-load.service
+systemd-remount-api-vfs.service
+systemd-vconsole-setup.service
+systemd-auto-serial-getty.service
+systemd-shutdownd.service
+systemd-random-seed-load.service
+systemd-random-seed-save.service
+systemd-initctl.service
+systemd-stdout-syslog-bridge.service
+getty@.service
+systemd-update-utmp-runlevel.service
+systemd-update-utmp-shutdown.service
+test-env-replace
+systemd-binfmt.service
diff --git a/units/Makefile b/units/Makefile
new file mode 120000 (symlink)
index 0000000..bd10475
--- /dev/null
@@ -0,0 +1 @@
+../src/Makefile
\ No newline at end of file
index fef9e1b..a4a9108 100644 (file)
@@ -23,9 +23,6 @@ After=rc-local.service
 m4_ifdef(`TARGET_MANDRIVA',
 After=rc-local.service
 )m4_dnl
-m4_ifdef(`TARGET_MAGEIA',
-After=rc-local.service
-)m4_dnl
 Before=getty.target
 
 [Service]
@@ -37,7 +34,6 @@ StandardInput=tty-force
 StandardOutput=inherit
 StandardError=inherit
 KillMode=process
-IgnoreSIGPIPE=no
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.
index 234bafc..4847f4f 100644 (file)
@@ -24,7 +24,6 @@ StandardInput=tty-force
 StandardOutput=inherit
 StandardError=inherit
 KillMode=process
-IgnoreSIGPIPE=no
 
 # Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
 # terminates cleanly.
diff --git a/units/fedora/Makefile b/units/fedora/Makefile
new file mode 120000 (symlink)
index 0000000..50be211
--- /dev/null
@@ -0,0 +1 @@
+../../src/Makefile
\ No newline at end of file
index 77a0e9a..17ed4cd 100644 (file)
@@ -18,4 +18,3 @@ After=getty@tty1.service plymouth-quit.service
 ExecStart=/etc/X11/prefdm -nodaemon
 Restart=always
 RestartSec=0
-IgnoreSIGPIPE=no
index 0bef5c7..f5f940f 100644 (file)
@@ -5,15 +5,14 @@
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
 
-# This unit gets pulled automatically into multi-user.target by
-# systemd-rc-local-generator if /etc/rc.d/rc.local is executable.
 [Unit]
-Description=/etc/rc.d/rc.local Compatibility
-After=network.target
+Description=/etc/rc.local Compatibility
+ConditionFileIsExecutable=/etc/rc.d/rc.local
 
 [Service]
 Type=forking
 ExecStart=/etc/rc.d/rc.local start
 TimeoutSec=0
+StandardOutput=tty
 RemainAfterExit=yes
 SysVStartPriority=99
index 4086149..7b3529d 100644 (file)
@@ -18,6 +18,6 @@ ConditionPathExists=!/run/initramfs/root-fsck
 Type=oneshot
 RemainAfterExit=no
 ExecStart=@rootlibexecdir@/systemd-fsck
-StandardOutput=journal+console
+StandardOutput=syslog+console
 FsckPassNo=1
 TimeoutSec=0
index c06684b..e1f7736 100644 (file)
@@ -16,5 +16,5 @@ Before=shutdown.target
 Type=oneshot
 RemainAfterExit=no
 ExecStart=@rootlibexecdir@/systemd-fsck %f
-StandardOutput=journal+console
+StandardOutput=syslog+console
 TimeoutSec=0
index a02838d..88c14bc 100644 (file)
@@ -8,7 +8,7 @@
 [Unit]
 Description=Getty on %I
 BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service openvpn.service apache2.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl
@@ -24,9 +24,6 @@ After=rc-local.service
 m4_ifdef(`TARGET_MANDRIVA',
 After=rc-local.service
 )m4_dnl
-m4_ifdef(`TARGET_MAGEIA',
-After=rc-local.service
-)m4_dnl
 
 # If additional gettys are spawned during boot then we should make
 # sure that this is synchronized before getty.target, even though
@@ -44,7 +41,6 @@ TTYReset=yes
 TTYVHangup=yes
 TTYVTDisallocate=yes
 KillMode=process
-IgnoreSIGPIPE=no
 
 # Unset locale for the console getty since the console has problems
 # displaying some internationalized messages.
@@ -55,4 +51,6 @@ Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETA
 KillSignal=SIGHUP
 
 [Install]
+m4_ifdef(`TARGET_SLP', `',
 Alias=getty.target.wants/getty@tty1.service
+)m4_dnl
diff --git a/units/mageia/prefdm.service b/units/mageia/prefdm.service
deleted file mode 100644 (file)
index 4a896bf..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Display Manager
-After=livesys-late.service rc-local.service systemd-user-sessions.service
-After=network.target acpid.service fs.service haldaemon.service
-
-# Do not stop plymouth, it is done in prefdm if required
-Conflicts=plymouth-quit.service
-After=plymouth-quit.service
-
-[Service]
-ExecStart=/etc/X11/prefdm
-Type=forking
-Restart=always
-RestartSec=0
index c97b7a4..27dcb1e 100644 (file)
@@ -16,4 +16,5 @@ ConditionPathExists=/sbin/quotacheck
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-quotacheck
+StandardOutput=syslog
 TimeoutSec=0
index ef2fc8c..2c7b36b 100644 (file)
@@ -16,3 +16,4 @@ ConditionPathExists=/sbin/quotaon
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/sbin/quotaon -aug
+StandardOutput=syslog
index 8aceb08..5406aa2 100644 (file)
@@ -10,3 +10,6 @@
 [Unit]
 Description=Remote File Systems (Pre)
 After=network.target
+
+[Install]
+WantedBy=multi-user.target
index 7b63752..ba34b75 100644 (file)
@@ -10,10 +10,11 @@ Description=Remount Root FS
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service
-Before=local-fs-pre.target local-fs.target shutdown.target
+Before=local-fs-pre.target local-fs.target shutdown.target mountoverflowtmp.service
 Wants=local-fs-pre.target
 
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/bin/mount / -o remount
+ExecStart=/bin/mount / -o remount -w
+StandardOutput=syslog
index 7dd8a22..19b30d8 100644 (file)
@@ -25,13 +25,10 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 m4_ifdef(`TARGET_MANDRIVA',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-m4_ifdef(`TARGET_MAGEIA',
-`EnvironmentFile=/etc/sysconfig/init
-ExecStart=-/bin/bash -c "exec ${SINGLE}"',
 m4_ifdef(`TARGET_MEEGO',
 `EnvironmentFile=/etc/sysconfig/init
 ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin'))))
+`ExecStart=-/sbin/sulogin')))
 ExecStopPost=-/bin/systemctl --fail --no-block default
 StandardInput=tty-force
 StandardOutput=inherit
index fc8b57b..01553ed 100644 (file)
@@ -24,9 +24,6 @@ After=rc-local.service
 m4_ifdef(`TARGET_MANDRIVA',
 After=rc-local.service
 )m4_dnl
-m4_ifdef(`TARGET_MAGEIA',
-After=rc-local.service
-)m4_dnl
 
 # If additional gettys are spawned during boot then we should make
 # sure that this is synchronized before getty.target, even though
@@ -35,7 +32,7 @@ Before=getty.target
 
 [Service]
 Environment=TERM=vt100
-ExecStart=-/sbin/agetty -s %I 115200,38400,9600
+m4_ifdef(`TARGET_SLP', `ExecStart=-/sbin/getty -L 115200 /dev/%I vt100', `ExecStart=-/sbin/agetty -s %I 115200,38400,9600')
 Restart=always
 RestartSec=0
 UtmpIdentifier=%I
@@ -43,8 +40,12 @@ TTYPath=/dev/%I
 TTYReset=yes
 TTYVHangup=yes
 KillMode=process
-IgnoreSIGPIPE=no
 
 # Some login implementations ignore SIGTERM, so we send SIGHUP
 # instead, to ensure that login terminates cleanly.
 KillSignal=SIGHUP
+
+m4_ifdef(`TARGET_SLP',
+[Install]
+Alias=getty.target.wants/serial-getty@s3c2410_serial2.service
+)m4_dnl
diff --git a/units/slp/var-cache.automount b/units/slp/var-cache.automount
new file mode 100644 (file)
index 0000000..e52860b
--- /dev/null
@@ -0,0 +1,5 @@
+[Unit]
+Description=/var/cache Automount Point
+
+[Automount]
+Where=/var/cache
diff --git a/units/slp/var-cache.mount b/units/slp/var-cache.mount
new file mode 100644 (file)
index 0000000..05a7854
--- /dev/null
@@ -0,0 +1,9 @@
+[Unit]
+Description=/var/cache Mount Point
+Before=local-fs.target
+
+[Mount]
+What=/opt/var/cache
+Where=/var/cache
+Type=bind
+Options=bind
diff --git a/units/slp/var-lib.automount b/units/slp/var-lib.automount
new file mode 100644 (file)
index 0000000..c8aa7b2
--- /dev/null
@@ -0,0 +1,5 @@
+[Unit]
+Description=/var/lib Automount Point
+
+[Automount]
+Where=/var/lib
diff --git a/units/slp/var-lib.mount b/units/slp/var-lib.mount
new file mode 100644 (file)
index 0000000..8c202b8
--- /dev/null
@@ -0,0 +1,9 @@
+[Unit]
+Description=/var/lib Mount Point
+Before=local-fs.target
+
+[Mount]
+What=/opt/var/lib
+Where=/var/lib
+Type=bind
+Options=bind
diff --git a/units/slp/var-lock.mount b/units/slp/var-lock.mount
new file mode 100644 (file)
index 0000000..5d58bd4
--- /dev/null
@@ -0,0 +1,9 @@
+[Unit]
+Description=/var/lock Mount Point
+Before=local-fs.target
+
+[Mount]
+What=/run/lock
+Where=/var/lock
+Type=bind
+Options=bind
diff --git a/units/slp/var-log.automount b/units/slp/var-log.automount
new file mode 100644 (file)
index 0000000..c3da0a9
--- /dev/null
@@ -0,0 +1,5 @@
+[Unit]
+Description=/var/log Automount Point
+
+[Automount]
+Where=/var/log
diff --git a/units/slp/var-log.mount b/units/slp/var-log.mount
new file mode 100644 (file)
index 0000000..da1c9ab
--- /dev/null
@@ -0,0 +1,9 @@
+[Unit]
+Description=/var/log Mount Point
+Before=local-fs.target
+
+[Mount]
+What=/opt/var/log
+Where=/var/log
+Type=bind
+Options=bind
index 2384a18..fe4c007 100644 (file)
@@ -5,15 +5,14 @@
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
 
-# This unit gets pulled automatically into multi-user.target by
-# systemd-rc-local-generator if /etc/init.d/boot.local is executable.
 [Unit]
 Description=/etc/init.d/boot.local Compatibility
-After=network.target
+ConditionFileIsExecutable=/etc/init.d/boot.local
 
 [Service]
 Type=oneshot
 ExecStart=/etc/init.d/boot.local
 TimeoutSec=0
+StandardOutput=tty
 RemainAfterExit=yes
 SysVStartPriority=99
index 1c54857..500bb7c 100644 (file)
 Description=Syslog Socket
 DefaultDependencies=no
 Before=sockets.target syslog.target
-Conflicts=shutdown.target
-Before=shutdown.target
 
 # Pull in syslog.target to tell people that /dev/log is now accessible
 Wants=syslog.target
 
 [Socket]
-ListenDatagram=/run/systemd/journal/syslog
+ListenDatagram=/dev/log
 SocketMode=0666
-PassCredentials=yes
-ReceiveBuffer=8M
 
-# The default syslog implementation should make syslog.service a
-# symlink to itself, so that this socket activates the right actual
-# syslog service.
-#
-# Examples:
-#
-# /etc/systemd/system/syslog.service -> /lib/systemd/system/rsyslog.service
-# /etc/systemd/system/syslog.service -> /lib/systemd/system/syslog-ng.service
-#
-# Best way to achieve that is by adding this to your unit file
-# (i.e. to rsyslog.service or syslog-ng.service):
-#
-# [Install]
-# Alias=syslog.service
+# The service we activate on incoming traffic is
+# systemd-kmsg-syslogd.service. That doesn't mean however, that this
+# is the main syslog daemon in the system. Another syslog
+# implementation (which might be started via on-boot or another
+# non-socket activation) can take over possession of the socket and
+# terminate systemd-kmsg-syslogd. It could also simply replace the
+# socket in the file system, and leave systemd-kmsg-syslogd untouched.
+
+Service=systemd-kmsg-syslogd.service
similarity index 51%
rename from src/libsystemd-id128.pc.in
rename to units/systemd-kmsg-syslogd.service.in
index 4d984fd..b20889e 100644 (file)
@@ -5,14 +5,15 @@
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+# See systemd.special(7) for details
 
-Name: systemd
-Description: systemd 128 Bit ID Utility Library
-URL: @PACKAGE_URL@
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lsystemd-id128
-Cflags: -I${includedir}
+[Unit]
+Description=Syslog Kernel Log Buffer Bridge
+DefaultDependencies=no
+
+[Service]
+ExecStart=@rootlibexecdir@/systemd-kmsg-syslogd
+NotifyAccess=all
+StandardOutput=null
+Sockets=syslog.socket
+CapabilityBoundingSet=CAP_DAC_OVERRIDE
index 531b8f7..4241b8b 100644 (file)
@@ -14,7 +14,8 @@ Description=Login Service
 ExecStart=@rootlibexecdir@/systemd-logind
 Type=dbus
 BusName=org.freedesktop.login1
-CapabilityBoundingSet=CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=CAP_AUDIT_CONTROL CAP_CHOWN CAP_KILL CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_FOWNER
+StandardOutput=syslog
 
 # Increase the default a bit in order to allow many simultaneous
 # logins since we keep one fd open per session.
index f4df0ca..6339ee6 100644 (file)
@@ -17,3 +17,4 @@ Wants=local-fs-pre.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-remount-api-vfs
+StandardOutput=syslog
index 532a6f0..bc0358a 100644 (file)
@@ -15,4 +15,3 @@ Before=sockets.target
 [Socket]
 ListenDatagram=/run/systemd/shutdownd
 SocketMode=0600
-PassCredentials=yes
similarity index 65%
rename from units/systemd-journald.service.in
rename to units/systemd-stdout-syslog-bridge.service.in
index 92606b0..4626145 100644 (file)
@@ -8,17 +8,16 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=Journal Service
+Description=STDOUT Syslog Bridge
 DefaultDependencies=no
-Requires=systemd-journald.socket
-After=systemd-journald.socket
+Requires=syslog.socket
 After=syslog.socket
 
 [Service]
-ExecStart=@rootlibexecdir@/systemd-journald
+ExecStart=@rootlibexecdir@/systemd-stdout-syslog-bridge
 NotifyAccess=all
 StandardOutput=null
-CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG CAP_AUDIT_CONTROL CAP_CHOWN CAP_DAC_READ_SEARCH CAP_FOWNER CAP_SETUID CAP_SETGID
+CapabilityBoundingSet=CAP_SYS_ADMIN CAP_SETUID CAP_SETGID
 
 # Increase the default a bit in order to allow many simultaneous
 # services being run since we keep one fd open per service.
similarity index 71%
rename from units/systemd-journald.socket
rename to units/systemd-stdout-syslog-bridge.socket
index c752505..0706efd 100644 (file)
@@ -8,9 +8,9 @@
 # See systemd.special(7) for details
 
 [Unit]
-Description=Journal Socket
+Description=Stdio Syslog Bridge Socket
 DefaultDependencies=no
-Before=sockets.target syslog.target
+Before=sockets.target
 
 # Mount and swap units need this. If this socket unit is removed by an
 # isolate request the mount and and swap units would be removed too,
@@ -18,9 +18,4 @@ Before=sockets.target syslog.target
 IgnoreOnIsolate=yes
 
 [Socket]
-ListenStream=/run/systemd/journal/stdout
-ListenDatagram=/run/systemd/journal/socket
-ListenDatagram=/dev/log
-SocketMode=0666
-PassCredentials=yes
-ReceiveBuffer=8M
+ListenStream=/run/systemd/stdout-syslog-bridge
index 673fb6c..91d95d6 100644 (file)
@@ -16,3 +16,4 @@ Before=sysinit.target shutdown.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-vconsole-setup
+StandardOutput=syslog
diff --git a/units/user/.gitignore b/units/user/.gitignore
new file mode 100644 (file)
index 0000000..eeb62b3
--- /dev/null
@@ -0,0 +1 @@
+exit.service
diff --git a/units/user/Makefile b/units/user/Makefile
new file mode 120000 (symlink)
index 0000000..50be211
--- /dev/null
@@ -0,0 +1 @@
+../../src/Makefile
\ No newline at end of file
index 91e3b25..59fe524 100644 (file)
@@ -15,5 +15,5 @@ PAMName=systemd-shared
 ControlGroup=%R/user/%I/shared cpu:/
 ControlGroupModify=yes
 Type=notify
-ExecStart=-@rootlibexecdir@/systemd --user
+ExecStart=-@rootbindir@/systemd --user
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
index 07277ad..615febf 100644 (file)
@@ -8,9 +8,6 @@
 [Unit]
 Description=Lock Directory
 Before=local-fs.target
-# skip mounting if the directory does not exist or is a symlink
-ConditionPathIsDirectory=/var/lock
-ConditionPathIsSymbolicLink=!/var/lock
 
 [Mount]
 What=/run/lock
index ab4da42..2a5f7f6 100644 (file)
@@ -8,9 +8,6 @@
 [Unit]
 Description=Runtime Directory
 Before=local-fs.target
-# skip mounting if the directory does not exist or is a symlink
-ConditionPathIsDirectory=/var/run
-ConditionPathIsSymbolicLink=!/var/run
 
 [Mount]
 What=/run