From 1e7f8d23d53de8bb52dc462d19aa4f7c12272781 Mon Sep 17 00:00:00 2001
From: nandika
Date: Wed, 8 Jun 2011 09:20:32 +0000
Subject: makefile updated

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1133297 13f79535-47bb-0310-9956-ffa450edef68
---
 build/win32/configure.in |  8 +++++---
 build/win32/makefile     | 32 +++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/build/win32/configure.in b/build/win32/configure.in
index d5f9220..942100e 100644
--- a/build/win32/configure.in
+++ b/build/win32/configure.in
@@ -33,7 +33,9 @@ WITH_TCP = 1
 WITH_ARCHIVE = 0
 #
 # enable NTLM authentication support.
-ENABLE_NTLM = 1
+ENABLE_NTLM_WITH_HEIMDAL = 0
+#
+ENABLE_NTLM_WITH_LIBNTLM = 1
 #
 #############################################################################
 ### Dependant Binary Locations (Required) ###
@@ -41,7 +43,6 @@ ENABLE_NTLM = 1
 #
 # libxml2 binary location ( axis2c is built with libxml2 )
 LIBXML2_BIN_DIR = E:\libxml2-2.6.30.win32
-
 #
 # iconv binary location
 ICONV_BIN_DIR = E:\iconv-1.9.2.win32
@@ -49,7 +50,6 @@ ICONV_BIN_DIR = E:\iconv-1.9.2.win32
 # zlib binary location
 ZLIB_BIN_DIR= E:\zlib-1.2.3.win32
 #
-#
 #############################################################################
 ### Dependant Binary Locations (Optional) ###
 #############################################################################
@@ -64,6 +64,8 @@ LIBCURL_BIN_DIR = E:\libcurl-7.15.1-msvc-win32-ssl-0.9.8a-zlib-1.2.3
 #Heimdal
 HEIMDAL_BIN_DIR=D:\NTLM\heimdal-bin
 #
+LIBNTLM_BIN_DIR=D:\libntlm
+#
 #############################################################################
 ### Apache Server module (required when building Axis2/C Apache Module) ###
 #############################################################################
diff --git a/build/win32/makefile b/build/win32/makefile
index 093376e..3b47834 100644
--- a/build/win32/makefile
+++ b/build/win32/makefile
@@ -145,9 +145,12 @@ AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(LIBCURL_BIN_DIR)\include
 !endif
 
 
-!if "$(ENABLE_NTLM)" == "1"
+!if "$(ENABLE_NTLM_WITH_HEIMDAL)" == "1"
 AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(OPENSSL_BIN_DIR)\include /I$(HEIMDAL_BIN_DIR)\inc
 !endif
+!if "$(ENABLE_NTLM_WITH_LIBNTLM)" == "1"
+AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(LIBNTLM_BIN_DIR)\include
+!endif
 
 # Compiler Options
 ###################
@@ -199,11 +202,16 @@ APACHE_LIBS = apr.lib xml.lib libhttpd.lib libaprutil.lib libapr.lib
 APACHE_LIBS = apr-1.lib xml.lib libhttpd.lib libapr-1.lib libaprutil-1.lib
 !endif
 
-!if "$(ENABLE_NTLM)" == "1"
+!if "$(ENABLE_NTLM_WITH_HEIMDAL)" == "1"
 LDFLAGS = $(LDFLAGS) /LIBPATH:$(HEIMDAL_BIN_DIR)\lib /LIBPATH:$(OPENSSL_BIN_DIR)\lib\VC
 LIBS = $(LIBS) libheimntlm.lib libeay32MD.lib ssleay32MD.lib 
 !endif
 
+!if "$(ENABLE_NTLM_WITH_LIBNTLM)" == "1"
+LDFLAGS = $(LDFLAGS) /LIBPATH:$(LIBNTLM_BIN_DIR)\lib
+LIBS = $(LIBS) libntlm.a
+!endif
+
 # Manifest Options
 ####################
 MT=mt.exe
@@ -241,7 +249,6 @@ deploy:
 	@if not exist $(AXIS2_INCLUDE) mkdir $(AXIS2_INCLUDE)
 	@if not exist $(AXIS2_LOG) mkdir $(AXIS2_LOG)
 	@if not exist $(AXIS2_MODULES)\addressing mkdir $(AXIS2_MODULES)\addressing
-			
 	@if not exist $(AXIS2_INTDIR) mkdir $(AXIS2_INTDIR)
 	@if not exist $(AXIS2_INTDIR_SAMPLES) mkdir $(AXIS2_INTDIR_SAMPLES)
 	
@@ -642,7 +649,7 @@ HTTP_SENDER_INTDIR1 = $(AXIS2_INTDIR)\http_sender\ssl
 HTTP_SENDER_INTDIR2 = $(AXIS2_INTDIR)\http_sender\libcurl
 HTTP_SENDER_INTDIR3 = $(AXIS2_INTDIR)\http_sender\ntlm
 HTTP_SENDER_INTDIR4 = $(AXIS2_INTDIR)\http_sender\ntlm\heimdal
-
+HTTP_SENDER_INTDIR5 = $(AXIS2_INTDIR)\http_sender\ntlm\libntlm
 
 HTTP_SENDER_OBJS = $(HTTP_SENDER_INTDIR)\*.obj
 
@@ -661,6 +668,9 @@ $(HTTP_SENDER_INTDIR3) :
 $(HTTP_SENDER_INTDIR4) :
 	@if not exist $(HTTP_SENDER_INTDIR4) mkdir $(HTTP_SENDER_INTDIR4)
 
+$(HTTP_SENDER_INTDIR5) :
+	@if not exist $(HTTP_SENDER_INTDIR5) mkdir $(HTTP_SENDER_INTDIR5)
+
 {$(HTTP_SENDER_SRC)}.c{$(HTTP_SENDER_INTDIR)}.obj ::
 	$(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR)\ /c $<
 
@@ -677,6 +687,9 @@ $(HTTP_SENDER_INTDIR4) :
 {$(HTTP_SENDER_SRC)\ntlm\heimdal}.c{$(HTTP_SENDER_INTDIR4)}.obj ::
 	$(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR4)\ /c $<
 
+{$(HTTP_SENDER_SRC)\ntlm\libntlm}.c{$(HTTP_SENDER_INTDIR5)}.obj ::
+	$(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR5)\ /c $<
+
 !if "$(ENABLE_SSL)" == "1"
 !if "$(ENABLE_LIBCURL)" == "1"
 HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
@@ -699,7 +712,7 @@ $(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR2)
 $(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR)
 !endif
 
-!if "$(ENABLE_NTLM)" == "1"
+!if "$(ENABLE_NTLM_WITH_HEIMDAL)" == "1"
 HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
 		$(HTTP_SENDER_INTDIR3)\*.obj \
 		  $(HTTP_SENDER_INTDIR4)\*.obj 
@@ -707,6 +720,15 @@ HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
 $(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR4)
 !endif
 
+
+!if "$(ENABLE_NTLM_WITH_LIBNTLM)" == "1"
+HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
+		   $(HTTP_SENDER_INTDIR3)\*.obj \
+		   $(HTTP_SENDER_INTDIR5)\*.obj 
+
+$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR5)
+!endif
+
 $(AXIS2_LIBS)\$(AXIS2_HTTP_SENDER).dll : $(HTTP_SENDER_OBJS)
 	$(LD) $(LDFLAGS) $(HTTP_SENDER_OBJS) $(AXUTIL).lib \
 	$(AXIOM).lib $(AXIS2_PARSER).lib $(LIBS) $(AXIS2_ENGINE).lib \
-- 
cgit v1.1-32-gdbae