Windows: ASN1_LIB needs to be defined for Heimdal library

diff --git a/lib/hcrypto/NTMakefile b/lib/hcrypto/NTMakefile
index 2fc7a96758cf2664106d8d7624d2860eb6860184..7c72380940411a0ac26f37a8f662915cb6915a19 100644 (file)
--- a/lib/hcrypto/NTMakefile
+++ b/lib/hcrypto/NTMakefile
@@ -33,7 +33,7 @@ SUBDIRS=libtommath
 
 RELDIR=lib\hcrypto
 
-AUXCFLAGS=$(AUXCFLAGS) -DKRB5 -I$(HCRYPTOINCLUDEDIR)
+intcflags=-DKRB5 -DASN1_LIB -I$(HCRYPTOINCLUDEDIR)
 
 !include ../../windows/NTMakefile.w32
 

diff --git a/lib/hx509/NTMakefile b/lib/hx509/NTMakefile
index 5b651b89e97903520ccd8dd171982102e19d2729..77edf6446272e719e8343587531391f333f12575 100644 (file)
--- a/lib/hx509/NTMakefile
+++ b/lib/hx509/NTMakefile
@@ -30,6 +30,7 @@
 # 
 
 RELDIR=lib\hx509
+intcflags=-DASN1_LIB
 
 !include ../../windows/NTMakefile.w32
 

diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile
index cf9ceec01e02c6514a8adf9fb4cfe67024ab41d4..c1a9088b61284581cf034c03b4056d4e6c41cfd1 100644 (file)
--- a/lib/krb5/NTMakefile
+++ b/lib/krb5/NTMakefile
@@ -90,13 +90,13 @@ libkrb5_OBJS =                      \
        $(OBJ)\log.obj                      \
        $(OBJ)\mcache.obj                   \
        $(OBJ)\misc.obj                     \
+       $(OBJ)\mit_glue.obj                 \
        $(OBJ)\mk_error.obj                 \
        $(OBJ)\mk_priv.obj                  \
        $(OBJ)\mk_rep.obj                   \
        $(OBJ)\mk_req.obj                   \
        $(OBJ)\mk_req_ext.obj               \
        $(OBJ)\mk_safe.obj                  \
-       $(OBJ)\mit_glue.obj                 \
        $(OBJ)\net_read.obj                 \
        $(OBJ)\net_write.obj                \
        $(OBJ)\n-fold.obj                   \
@@ -319,10 +319,10 @@ $(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBHEIMDAL) $(LIBR
        $(EXEPREP)
 
 {}.c{$(OBJ)}.obj::
-       $(C2OBJ_P) -DBUILD_KRB5_LIB
+       $(C2OBJ_P) -DBUILD_KRB5_LIB -DASN1_LIB
 
 {$(OBJ)}.c{$(OBJ)}.obj::
-       $(C2OBJ_P) -DBUILD_KRB5_LIB
+       $(C2OBJ_P) -DBUILD_KRB5_LIB -DASN1_LIB
 
 #----------------------------------------------------------------------
 # Tests