From: Tom Yu <tlyu@mit.edu>
Date: Fri, 30 Mar 2007 00:35:43 +0000 (+0000)
Subject: pull up r19122 from trunk
X-Git-Tag: kfw-3.2.0-beta1~52
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b6f91c71d612878fb435d7ca9a6c3ff873653610;p=krb5.git

pull up r19122 from trunk

 r19122@cathode-dark-space:  jaltman | 2007-01-30 06:02:32 -0500
 ticket: new
 subject: KFW: 32-bit builds use the pismere krbv4w32.dll library
 tags: pullup

 	Only the 32-bit builds should use the pismere krbv4w32.dll
 	library.   Pismere does not provide 64-bit support.



ticket: 5418
version_fixed: 1.6.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19325 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 2501c92f3..4b1ab9578 100644
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -30,11 +30,11 @@ DEFINES = -DUSE_MASTER -DKRB524_PRIVATE=1
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
 
-##WIN32##!ifdef USE_ALTERNATE_KRB4_INCLUDES
+##WIN32##!if ("$(CPU)" == "i386") && defined(USE_ALTERNATE_KRB4_INCLUDES)
 ##WIN32##KRB4_INCLUDES=-I$(USE_ALTERNATE_KRB4_INCLUDES)
 ##WIN32##!endif
 
-##WIN32##!ifdef USE_ALTERNATE_KRB4_LIB
+##WIN32##!if ("$(CPU)" == "i386") && defined(USE_ALTERNATE_KRB4_LIB)
 ##WIN32##K4LIB=$(USE_ALTERNATE_KRB4_LIB)
 ##WIN32##!endif