picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal-upload: remove microhttpd dependency

Browse source 
journal-upload doesn't really need microhttpd to run.
Without the dependency, we can cross compile systemd
without microhttpd and get the uploader part of the
remote logging.

Change-Id: I28dfa5ad2aae94e50de1d32713e1827623c3fd1d
This commit is contained in:
Umut Tezduyar Lindskog 2016-03-18 11:34:51 +01:00
parent 6a692550f2
commit 2adeb166da
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Makefile.am
View file

@ -3945,6 +3945,34 @@ systemd_cat_SOURCES = \
systemd_cat_LDADD = \
libjournal-core.la
if HAVE_LIBCURL
rootlibexec_PROGRAMS += \
systemd-journal-upload
systemd_journal_upload_SOURCES = \
src/journal-remote/journal-upload.h \
src/journal-remote/journal-upload.c \
src/journal-remote/journal-upload-journal.c
systemd_journal_upload_CFLAGS = \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS)
systemd_journal_upload_LDADD = \
libshared.la \
$(LIBCURL_LIBS)
nodist_systemunit_DATA += \
units/systemd-journal-upload.service
nodist_pkgsysconf_DATA += \
src/journal-remote/journal-upload.conf
endif
EXTRA_DIST += \
units/systemd-journal-upload.service.in \
src/journal-remote/journal-upload.conf.in
if HAVE_MICROHTTPD
rootlibexec_PROGRAMS += \
systemd-journal-remote
@ -4004,34 +4032,6 @@ EXTRA_DIST += \
src/journal-remote/log-generator.py
endif
if HAVE_LIBCURL
rootlibexec_PROGRAMS += \
systemd-journal-upload
systemd_journal_upload_SOURCES = \
src/journal-remote/journal-upload.h \
src/journal-remote/journal-upload.c \
src/journal-remote/journal-upload-journal.c
systemd_journal_upload_CFLAGS = \
$(AM_CFLAGS) \
$(LIBCURL_CFLAGS)
systemd_journal_upload_LDADD = \
libshared.la \
$(LIBCURL_LIBS)
nodist_systemunit_DATA += \
units/systemd-journal-upload.service
nodist_pkgsysconf_DATA += \
src/journal-remote/journal-upload.conf
endif
EXTRA_DIST += \
units/systemd-journal-upload.service.in \
src/journal-remote/journal-upload.conf.in
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
journalctl_CFLAGS = \
$(AM_CFLAGS)