diff options
author | Evgeny Vereshchagin <evvers@ya.ru> | 2015-12-09 02:32:22 +0100 |
---|---|---|
committer | Evgeny Vereshchagin <evvers@ya.ru> | 2015-12-09 04:48:56 +0100 |
commit | e400d4b3f57e4303e5ff46f18d94b7c0f7ed589e (patch) | |
tree | 5c569fc47a5e60fe4362ff2bf44d204752a2870d /sysusers.d | |
parent | Merge pull request #2115 from dvdhrm/rbtree (diff) | |
download | systemd-e400d4b3f57e4303e5ff46f18d94b7c0f7ed589e.tar.xz systemd-e400d4b3f57e4303e5ff46f18d94b7c0f7ed589e.zip |
build: fix systemd-journal-upload installation
Fixes:
$ ./configure ... --disable-microhttpd --enable-libcurl
--enable-sysusers
$ make && make install DESTDIR=$(pwd)/INST
$ ls INST/usr/lib/sysusers.d/
basic.conf systemd.conf
There is no a file with `systemd-journald-upload`
Diffstat (limited to 'sysusers.d')
-rw-r--r-- | sysusers.d/.gitignore | 1 | ||||
-rw-r--r-- | sysusers.d/systemd-remote.conf.m4 (renamed from sysusers.d/systemd-remote.conf) | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sysusers.d/.gitignore b/sysusers.d/.gitignore index bb3aaaf821..c065034d29 100644 --- a/sysusers.d/.gitignore +++ b/sysusers.d/.gitignore @@ -1,2 +1,3 @@ /basic.conf /systemd.conf +/systemd-remote.conf diff --git a/sysusers.d/systemd-remote.conf b/sysusers.d/systemd-remote.conf.m4 index 15969e9a97..0e9d71cdd0 100644 --- a/sysusers.d/systemd-remote.conf +++ b/sysusers.d/systemd-remote.conf.m4 @@ -5,6 +5,10 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. +m4_ifdef(`HAVE_MICROHTTPD', u systemd-journal-gateway - "systemd Journal Gateway" u systemd-journal-remote - "systemd Journal Remote" +)m4_dnl +m4_ifdef(`HAVE_LIBCURL', u systemd-journal-upload - "systemd Journal Upload" +)m4_dnl |