[PATCH:xdm] Only install xdmshell if --enable-xdmshell is passed to configure

[Alan Coopersmith]

As the xdmshell man page explains, it's used in uncommon configurations
and is likely to need site-specific review/customization.

Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
---
 Makefile.am  |   17 ++++++++++++++---
 configure.ac |    6 ++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b0ff1a2..6ebf2b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,19 @@
 
 SUBDIRS = config greeter
 
-bin_PROGRAMS = xdm xdmshell
+bin_PROGRAMS = xdm
+noinst_PROGRAMS =
+
+appman_PRE = xdm.man.cpp
+noinst_man_PRE =
+
+if INSTALL_XDMSHELL
+bin_PROGRAMS += xdmshell
+appman_PRE += xdmshell.man.cpp
+else
+noinst_PROGRAMS += xdmshell
+noinst_man_PRE += xdmshell.man.cpp
+endif
 
 xdmlibdir = $(XDMLIBDIR)
 xdmlib_PROGRAMS = chooser
@@ -101,9 +113,8 @@ endif
 #
 
 appmandir = $(APP_MAN_DIR)
-
-appman_PRE = xdm.man.cpp xdmshell.man.cpp
 appman_DATA = $(appman_PRE:man.cpp=@APP_MAN_SUFFIX@)
+noinst_DATA = $(noinst_man_PRE:man.cpp=@APP_MAN_SUFFIX@)
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 CLEANFILES = $(appman_DATA)
diff --git a/configure.ac b/configure.ac
index 5d0f243..a4a797a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -463,6 +463,12 @@ AC_SUBST(XDM_LDFLAGS)
 # xdmshell
 #
 
+AC_ARG_ENABLE(xdmshell,
+	AC_HELP_STRING([--enable-xdmshell],
+         [Install xdmshell (default: disabled)]),
+	[INSTALL_XDMSHELL="$enableval"], [INSTALL_XDMSHELL="no"])
+AM_CONDITIONAL(INSTALL_XDMSHELL, test x$INSTALL_XDMSHELL = xyes)
+
 PKG_CHECK_MODULES(XT, xt)
 XDMSHELL_CFLAGS="$XDM_CFLAGS $XDM_PRINT_CFLAGS $AUTH_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $XT_CFLAGS"
 XDMSHELL_LIBS="$XDM_LIBS $XDM_PRINT_LIBS $DMCP_LIBS"
-- 
1.5.6.5