viewer: don't build viewer by default

The viewer is useful for seeing boot messages after boot up.
It does this by showing a notification icon in the event there
is a problem during boot.

Notification icons aren't as en vogue as they once were, however.

Ideally, we would have a more structured and semantically aware
way to deal with specific boot problems.

This commit turns the icon off by default.  It can still be built
with a --with-log-viewer

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30724
Reported By: William Jon McCann <william.jon.mccann@gmail.com>

diff --git a/configure.ac b/configure.ac
index b5eddf5d6a6487f2eb81a441030721e8956c4b90..535b6ee7186870fc70436cd4da7cc6c6c55235c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -141,8 +141,13 @@ AC_SUBST(plymouthdaemondir)
 AC_ARG_WITH(rhgb-compat-link, AS_HELP_STRING([--with-rhgb-compat-link],[Install /usr/bin/rhgb-client compatability symlink]),with_rhgb_compat_link=${withval},with_rhgb_compat_link=yes)
 AM_CONDITIONAL(WITH_RHGB_COMPAT_LINK,  [test "$with_rhgb_compat_link" = yes])
 
-AC_ARG_WITH(gdm-autostart-file, AS_HELP_STRING([--with-gdm-autostart-file],[start log viewer from gdm on boot errors]),with_gdm_autostart_file=$withval,with_gdm_autostart_file=yes)
+AC_ARG_WITH(log-viewer, AS_HELP_STRING([--with-log-viewer],[Install plymouth log viewer]),with_log_viewer=${withval},with_log_viewer=no)
+AM_CONDITIONAL(WITH_LOG_VIEWER,  [test "$with_log_viewer" = yes])
 
+with_gdm_autostart_file=no
+if test x$with_log_viewer = xyes; then
+  AC_ARG_WITH(gdm-autostart-file, AS_HELP_STRING([--with-gdm-autostart-file],[start log viewer from gdm on boot errors]),with_gdm_autostart_file=$withval,with_gdm_autostart_file=yes)
+fi
 AM_CONDITIONAL(START_FROM_GDM,  [test "$with_gdm_autostart_file" = yes])
 
 AC_ARG_WITH(logo, AS_HELP_STRING([--with-logo],[logo used by boot splash plugins]),logofile=${withval},logofile=$datadir/plymouth/bizcom.png)

diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
index 1e6529800737abc80d0cf4bfdb6928e8e6444dda..6fe36fd959f8204cbde5e6033f7e5ea4892c14a8 100644 (file)
--- a/src/viewer/Makefile.am
+++ b/src/viewer/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST=
 
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
+if WITH_LOG_VIEWER
 plymouth_log_viewerdir = $(bindir)
 plymouth_log_viewer_PROGRAMS = plymouth-log-viewer
 
@@ -15,5 +16,6 @@ gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow
 gdmautostart_DATA = plymouth-log-viewer.desktop
 EXTRA_DIST += plymouth-log-viewer.desktop
 endif
+endif
 
 MAINTAINERCLEANFILES = Makefile.in