5605 Disable IPP printing like SMB printing can be disabled

Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Alexander Pyhalov <apyhalov@gmail.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Approved by: Hans Rosenfeld <hans.rosenfeld@nexenta.com>

4 files changed, 37 insertions, 11 deletions

diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 59f342b69d..d77f0d951c 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -96,6 +96,13 @@ __SUNC=			$(POUND_SIGN)
 $(__SUNC)__GNUC=	$(POUND_SIGN)
 __GNUC64=		$(__GNUC)
 
+# Allow build-time "configuration" to enable or disable some things.
+# The default is POUND_SIGN, meaning "not enabled". If the environment
+# passes in an override like ENABLE_SMB_PRINTING= (empty) that will
+# uncomment things in the lower Makefiles to enable the feature.
+ENABLE_IPP_PRINTING=	$(POUND_SIGN)
+ENABLE_SMB_PRINTING=	$(POUND_SIGN)
+
 # CLOSED is the root of the tree that contains source which isn't released
 # as open source
 CLOSED=		$(SRC)/../closed
diff --git a/usr/src/lib/print/Makefile b/usr/src/lib/print/Makefile
index fd931373e8..8850d88dab 100644
--- a/usr/src/lib/print/Makefile
+++ b/usr/src/lib/print/Makefile
@@ -22,8 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
+
+include $(SRC)/Makefile.master
 
 SUBDIRS = \
 	libprint \
@@ -33,8 +33,9 @@ SUBDIRS = \
 	libipp-core \
 	libhttp-core \
 	libpapi-ipp \
-	libipp-listener \
-	mod_ipp
+	libipp-listener
+
+$(ENABLE_IPP_PRINTING) SUBDIRS += mod_ipp
 
 all :=                  TARGET = all
 clean :=                TARGET = clean
@@ -43,8 +44,6 @@ install :=              TARGET = install
 install_h :=              TARGET = install_h
 lint :=                 TARGET = lint
 
-include $(SRC)/Makefile.master
-
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 POFILE= print-lib.po
 
@@ -91,4 +90,3 @@ libipp-core:		libpapi-common
 libpapi-ipp:		libpapi-common libipp-core libhttp-core
 libipp-listener:	libpapi-dynamic libipp-core
 mod_ipp:		libipp-listener
-
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 0e6dd06ffe..4a62f7f231 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -216,9 +216,25 @@ CLOBBERFILES= $(PDIR) proto_list_$(PKGMACH) install-$(PKGMACH).out \
 # By default, PKGS will list all manifests.  To build and/or publish a
 # subset of packages, override this on the command line or in the
 # build environment and then reference (implicitly or explicitly) the all
-# or install targets.
+# or install targets.  Using ls -1 (that's a one) or print or echo to
+# get the list of manifests is a little hackish, but avoids having a
+# 900+ line file to explicitly list them all.
 #
-MANIFESTS :sh= (cd manifests; print *.mf)
+# We want some manifests to optionally built based on environment
+# options, so those are excluded and optionally added back in.
+# We also want a relatively easy way to add files to the list of
+# manifests given special treatment.  Add any other special ones
+# to the SPECIAL_MANIFESTS vaiable.  It can contain wildcards in
+# regexp form, i.e. SUNW.* as one useful example.
+#
+SPECIAL_MANIFESTS = print-lp-ipp-ipp-listener.mf
+LIST_MANIFESTS_CMD = (cd manifests ; /usr/bin/ls -1 *.mf |\
+	$(SED) $(SPECIAL_MANIFESTS:%=-e '/^%$$/d') )
+MANIFESTS = $(LIST_MANIFESTS_CMD:sh)
+
+# Conditionally add back lp-ipp
+$(ENABLE_IPP_PRINTING) MANIFESTS += print-lp-ipp-ipp-listener.mf
+
 PKGS= $(MANIFESTS:%.mf=%)
 DEP_PKGS= $(PKGS:%=$(PDIR)/%.dep)
 PROC_PKGS= $(PKGS:%=$(PDIR)/%.mog)
diff --git a/usr/src/tools/env/illumos.sh b/usr/src/tools/env/illumos.sh
index 81dcb607b4..5751ee0a08 100644
--- a/usr/src/tools/env/illumos.sh
+++ b/usr/src/tools/env/illumos.sh
@@ -228,8 +228,13 @@ export SPRO_VROOT="$SPRO_ROOT"
 # nightly(1) for interactions between environment variables and this command.
 #POST_NIGHTLY=
 
-# Uncomment this to disable support for SMB printing.
-# export ENABLE_SMB_PRINTING='#'
+# Comment this out to disable support for IPP printing, i.e. if you
+# don't want to bother providing the Apache headers this needs.
+export ENABLE_IPP_PRINTING=
+
+# Comment this out to disable support for SMB printing, i.e. if you
+# don't want to bother providing the CUPS headers this needs.
+export ENABLE_SMB_PRINTING=
 
 # If your distro uses certain versions of Perl, make sure either Makefile.master
 # contains your new defaults OR your .env file sets them.