diff options
| -rw-r--r-- | build/win32/configure.in | 10 | ||||
| -rw-r--r-- | build/win32/makefile | 36 |
2 files changed, 43 insertions, 3 deletions
diff --git a/build/win32/configure.in b/build/win32/configure.in index c9d93a1..d5f9220 100644 --- a/build/win32/configure.in +++ b/build/win32/configure.in @@ -32,6 +32,8 @@ WITH_TCP = 1 # build with archive based deployment
WITH_ARCHIVE = 0
#
+# enable NTLM authentication support.
+ENABLE_NTLM = 1
#
#############################################################################
### Dependant Binary Locations (Required) ###
@@ -54,18 +56,20 @@ ZLIB_BIN_DIR= E:\zlib-1.2.3.win32 #
# openssl binary location
# required if ENABLE_SSL = 1
-OPENSSL_BIN_DIR = F:\OpenSSL
+OPENSSL_BIN_DIR = D:\OpenSSL
#
# libcurl binary location, only required if libcurl transport is enabled
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
#
#############################################################################
### Apache Server module (required when building Axis2/C Apache Module) ###
#############################################################################
#
# apache binary location
-APACHE_BIN_DIR = "F:\Apache2.2"
+APACHE_BIN_DIR = "D:\Apache2.2"
#
# apache 2 server family
# To use apache 2.2 family, use APACHE_VERSION_IS_2_0_X = 0
@@ -84,5 +88,5 @@ EMBED_MANIFEST = 0 #
# debug symbols
# To build with debug symbols use DEBUG = 1
-DEBUG = 0
+DEBUG = 1
#
diff --git a/build/win32/makefile b/build/win32/makefile index 4139570..093376e 100644 --- a/build/win32/makefile +++ b/build/win32/makefile @@ -144,6 +144,11 @@ AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(OPENSSL_BIN_DIR)\include AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(LIBCURL_BIN_DIR)\include
!endif
+
+!if "$(ENABLE_NTLM)" == "1"
+AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(OPENSSL_BIN_DIR)\include /I$(HEIMDAL_BIN_DIR)\inc
+!endif
+
# Compiler Options
###################
@@ -167,6 +172,8 @@ CFLAGS = $(CFLAGS) /D "AXIS2_LIBXML2_ENABLED" $(LIBXML2_INCLUDE_PATH) CFLAGS = $(CFLAGS) /D "AXIS2_GUTHTHILA_ENABLED" $(GUTHTHILA_INCLUDE_PATH)
!endif
+
+
# Linker Options
####################
@@ -192,6 +199,11 @@ 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"
+LDFLAGS = $(LDFLAGS) /LIBPATH:$(HEIMDAL_BIN_DIR)\lib /LIBPATH:$(OPENSSL_BIN_DIR)\lib\VC
+LIBS = $(LIBS) libheimntlm.lib libeay32MD.lib ssleay32MD.lib
+!endif
+
# Manifest Options
####################
MT=mt.exe
@@ -628,6 +640,9 @@ HTTP_SENDER_SRC = $(AXIS2_SOURCE_DIR)\src\core\transport\http\sender HTTP_SENDER_INTDIR = $(AXIS2_INTDIR)\http_sender
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_OBJS = $(HTTP_SENDER_INTDIR)\*.obj
@@ -640,6 +655,12 @@ $(HTTP_SENDER_INTDIR1) : $(HTTP_SENDER_INTDIR2) :
@if not exist $(HTTP_SENDER_INTDIR2) mkdir $(HTTP_SENDER_INTDIR2)
+$(HTTP_SENDER_INTDIR3) :
+ @if not exist $(HTTP_SENDER_INTDIR3) mkdir $(HTTP_SENDER_INTDIR3)
+
+$(HTTP_SENDER_INTDIR4) :
+ @if not exist $(HTTP_SENDER_INTDIR4) mkdir $(HTTP_SENDER_INTDIR4)
+
{$(HTTP_SENDER_SRC)}.c{$(HTTP_SENDER_INTDIR)}.obj ::
$(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR)\ /c $<
@@ -649,6 +670,13 @@ $(HTTP_SENDER_INTDIR2) : {$(HTTP_SENDER_SRC)\libcurl}.c{$(HTTP_SENDER_INTDIR2)}.obj ::
$(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR2)\ /c $<
+{$(HTTP_SENDER_SRC)\ntlm}.c{$(HTTP_SENDER_INTDIR3)}.obj ::
+ $(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR3)\ /c $<
+
+
+{$(HTTP_SENDER_SRC)\ntlm\heimdal}.c{$(HTTP_SENDER_INTDIR4)}.obj ::
+ $(CC) $(CFLAGS) /Fo$(HTTP_SENDER_INTDIR4)\ /c $<
+
!if "$(ENABLE_SSL)" == "1"
!if "$(ENABLE_LIBCURL)" == "1"
HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
@@ -671,6 +699,14 @@ $(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR) $(HTTP_SENDER_INTDIR2) $(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR)
!endif
+!if "$(ENABLE_NTLM)" == "1"
+HTTP_SENDER_OBJS = $(HTTP_SENDER_OBJS) \
+ $(HTTP_SENDER_INTDIR3)\*.obj \
+ $(HTTP_SENDER_INTDIR4)\*.obj
+
+$(HTTP_SENDER_OBJS) : $(HTTP_SENDER_INTDIR3) $(HTTP_SENDER_INTDIR4)
+!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 \
|