Detect if the Vista version of ntsecapi.h is present

TargetVersion: 1.7
Component: krb5-libs
Ticket: 19569
tAGS:  PULLUP
Subj: Tweaks for 1.7 build on Windows. 

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20277 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 15 insertions, 2 deletions

diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 3ba9da6e4c..f1a46c0df2 100644
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -4,7 +4,7 @@ NO_OUTPRE=1
 #
 # Makefile that recurses into cns subdirectory.
 #
-all-windows::
+all-windows:: ntsecapitest
 	@echo Making in windows\lib
 	cd lib
 	$(MAKE) -$(MFLAGS)
@@ -16,6 +16,7 @@ all-windows::
 	$(MAKE) -$(MFLAGS)
        @echo Making in windows\gss
 	cd ..\gss
+	cd
 	$(MAKE) -$(MFLAGS)
 	@echo Making in windows\gina
 	cd ..\gina
@@ -33,7 +34,7 @@ all-windows::
 !endif 
 	cd ..
 
-clean-windows::
+clean-windows:: clean-ntsecapitest
 	@echo Making clean in windows\lib
 	cd lib
 	$(MAKE) -$(MFLAGS) clean
@@ -61,3 +62,15 @@ clean-windows::
         $(MAKE) -$(MFLAGS) clean 
 !endif 
 	cd ..
+
+# If ntsecapi.h contains the string that indicates it came from the Vista SDK,
+#  then ntsecapitest.i will be left behind.  If the string is not present,
+#  ntsecapitest.i will be deleted. 
+ntsecapitest:: ntsecapitest.i
+    ntsecapitest.pl
+
+clean-ntsecapitest::
+    $(RM) ntsecapitest.i
+
+{}.c{}.i:
+    @$(C_RULE) -P