[29320] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix Makefiles for VS2010 KfW build
daemon@ATHENA.MIT.EDU (Tom Yu)
Wed Mar 2 15:35:58 2016
Date: Wed, 2 Mar 2016 15:35:54 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201603022035.u22KZsMr012709@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/0533ebf04d6ab98ccb18652466ea910600bab219
commit 0533ebf04d6ab98ccb18652466ea910600bab219
Author: Tom Yu <tlyu@mit.edu>
Date: Thu Feb 25 18:01:36 2016 -0500
Fix Makefiles for VS2010 KfW build
The new Makefile conditionals in commit
4552159e97007a45370dd49fa6b9fb963bb7d160 don't behave properly if
VISUALSTUDIOVERSION isn't set, probably due to the way nmake orders
macro expansion and boolean short circuiting. Use nested conditionals
instead.
src/lib/Makefile.in | 4 +++-
src/windows/kfwlogon/Makefile.in | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index e5ea67f..178954d 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -51,9 +51,11 @@ clean-windows::
##WIN32##KRB5RC = krb5.rc
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
-##WIN32##!if defined(VISUALSTUDIOVERSION) && $(VISUALSTUDIOVERSION:.=) >= 140
+##WIN32##!if defined(VISUALSTUDIOVERSION)
+##WIN32##!if $(VISUALSTUDIOVERSION:.=) >= 140
##WIN32##WINCRTEXTRA = ucrt.lib vcruntime.lib
##WIN32##!endif
+##WIN32##!endif
##WIN32##WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
##WIN32## version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib \
##WIN32## $(WINCRTEXTRA)
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in
index da7f1d3..50c8bca 100644
--- a/src/windows/kfwlogon/Makefile.in
+++ b/src/windows/kfwlogon/Makefile.in
@@ -7,9 +7,11 @@ DEFINES = -DNO_KRB4
LOCALINCLUDES = -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include
PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)
-!if defined(VISUALSTUDIOVERSION) && $(VISUALSTUDIOVERSION:.=) >= 140
+!if defined(VISUALSTUDIOVERSION)
+!if $(VISUALSTUDIOVERSION:.=) >= 140
WINCRTEXTRA = ucrt.lib vcruntime.lib
!endif
+!endif
SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib $(WINCRTEXTRA)
VERSIONRC = $(BUILDTOP)\windows\version.rc
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
