From: David Herrmann <dh.herrmann@gmail.com>
Date: Fri, 18 Jul 2014 15:26:23 +0000 (+0200)
Subject: terminal: only build if --enable-terminal was specified
X-Git-Tag: v216~501
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=545149a2fc3523bbcbf3703fae3ae1ca5312f8c8

terminal: only build if --enable-terminal was specified

Whoopsy, I totally forgot adding the "if ENABLE_TERMINAL" markers. Do that
now that we know it builds fine everywhere.
---

diff --git a/Makefile.am b/Makefile.am
index 0615f663c..012e2e990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2831,9 +2831,18 @@ tests += \
 	test-dhcp6-client
 
 # ------------------------------------------------------------------------------
+if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
 	libsystemd-terminal.la
 
+noinst_PROGRAMS += \
+	systemd-subterm
+
+tests += \
+	test-term-page \
+	test-term-parser
+endif
+
 libsystemd_terminal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
@@ -2849,9 +2858,6 @@ libsystemd_terminal_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-noinst_PROGRAMS += \
-	systemd-subterm
-
 systemd_subterm_SOURCES = \
 	src/libsystemd-terminal/subterm.c
 
@@ -2876,10 +2882,6 @@ test_term_parser_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-tests += \
-	test-term-page \
-	test-term-parser
-
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
 SUBDIRS += \