diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-26 01:06:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-26 01:06:02 -0400 |
| commit | 88d0127d07f0de5b0aa536deaf2b84877a402a6b (patch) | |
| tree | 066de356346419669f017bf8350691af3d0422e0 /src/journal-remote | |
| parent | 9155dec335ce55c5443088595717f282aa27f055 (diff) | |
| parent | eeea4ae0f9e1652e553015c7db7d640ec172a7b5 (diff) | |
Merge branch 'lukeshu-postmove' into lukeshu
# Conflicts:
# src/libshared/Makefile
Diffstat (limited to 'src/journal-remote')
| -rw-r--r-- | src/journal-remote/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile index 188ad7a67c..df233886df 100644 --- a/src/journal-remote/Makefile +++ b/src/journal-remote/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -if HAVE_MICROHTTPD +ifneq ($(HAVE_MICROHTTPD),) rootlibexec_PROGRAMS += \ systemd-journal-remote @@ -46,12 +46,12 @@ systemd_journal_remote_CFLAGS = \ systemd_journal_remote_LDADD += \ $(MICROHTTPD_LIBS) -if ENABLE_TMPFILES +ifneq ($(ENABLE_TMPFILES),) dist_tmpfiles_DATA += \ tmpfiles.d/systemd-remote.conf endif -if HAVE_GNUTLS +ifneq ($(HAVE_GNUTLS),) systemd_journal_remote_LDADD += \ $(GNUTLS_LIBS) endif @@ -79,7 +79,7 @@ EXTRA_DIST += \ src/journal-remote/log-generator.py endif -if HAVE_LIBCURL +ifneq ($(HAVE_LIBCURL),) rootlibexec_PROGRAMS += \ systemd-journal-upload |