From 82a200bfa2b31a3b5a99bed59fb583df479c79f4 Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Thu, 18 Nov 2010 20:50:22 -0500
Subject: [PATCH] Windows: Installers are optional

---
 packages/windows/installer/NTMakefile |  4 ++++
 windows/NTMakefile.config             |  5 +++++
 windows/NTMakefile.w32                | 16 +++++++++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index d95b1e2d3..ac1be409a 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -33,6 +33,8 @@ RELDIR=packages\windows\installer
 
 !include ../../../windows/NTMakefile.w32
 
+!ifdef BUILD_INSTALLERS
+
 VERSIOND=$(VER_PRODUCT_MAJOR)-$(VER_PRODUCT_MINOR)-$(VER_PRODUCT_AUX)-$(VER_PRODUCT_PATCH)
 VERSION=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
 POLPREFIX=policy.$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR)
@@ -143,3 +145,5 @@ all:: $(INSTALLER)
 
 clean::
 	-$(RM) $(INSTALLER)
+
+!endif				# BUILD_INSTALLERS
diff --git a/windows/NTMakefile.config b/windows/NTMakefile.config
index 2f2bfa106..f2334ca59 100644
--- a/windows/NTMakefile.config
+++ b/windows/NTMakefile.config
@@ -99,3 +99,8 @@ DIR_hdbdir=%{COMMON_APPDATA}/heimdal/hdb
 
 # Enable weak crypto
 WEAK_CRYPTO=1
+
+# Disable build of installers
+!ifndef NO_INSTALLERS
+BUILD_INSTALLERS=1
+!endif
diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index 7367c09db..c5dc2c14e 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -239,8 +239,18 @@ RC2RES = $(RC2RES_C) -fo $@ $**
 
 !ifndef RECURSE
 
+REQUIRED_TOOLS= \
+	"$(AWK_CMD)" "$(YACC_CMD)" "$(LEX_CMD)" "$(PYTHON)" "$(PERL)" \
+	"$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(MAKEINFO)" "$(HHC)"
+
+!ifdef BUILD_INSTALLERS
+REQUIRED_TOOLS=$(REQUIRED_TOOLS) "$(CANDLE_CMD)" "$(LIGHT_CMD)"
+!endif
+
+OPTIONAL_TOOLS="$(SH)" 
+
 check-utils:
-	@for %%g in ( "$(AWK_CMD)" "$(YACC_CMD)" "$(LEX_CMD)" "$(PYTHON)" "$(PERL)" "$(CMP)" "$(SED)" "$(SIGNTOOL)" "$(MAKECAT)" "$(CANDLE_CMD)" "$(LIGHT_CMD)" "$(MAKEINFO)" "$(HHC)") do @( \
+	@for %%g in ( $(REQUIRED_TOOLS) ) do @( \
 	for /f %%f in ( "%%g" ) do @( \
 		if exist %%f @( \
 			echo Found %%f \
@@ -252,13 +262,13 @@ check-utils:
 		) \
 	) \
 	)
-	@for %%g in ( "$(SH)" ) do @( \
+	@for %%g in ( $(OPTIONAL_TOOLS) ) do @( \
 	for /f %%f in ( "%%g" ) do @( \
 		if exist %%f @( \
 			echo Found %%f \
 		) else if "%%~$$PATH:f"=="" @( \
 			echo Could not find %%f in PATH && \
-			echo Test targets may fail. \
+			echo Optional targets may fail. \
 		) else @( \
 			echo Found %%~$$PATH:f \
 		) \