axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r515456 - in /webservices/axis2/trunk/c/build/win32: configure.in makefile
Date Wed, 07 Mar 2007 04:54:14 GMT
Author: nandika
Date: Tue Mar  6 20:54:13 2007
New Revision: 515456

URL: http://svn.apache.org/viewvc?view=rev&rev=515456
Log:
makefile updated to build libcurl transport

Modified:
    webservices/axis2/trunk/c/build/win32/configure.in
    webservices/axis2/trunk/c/build/win32/makefile

Modified: webservices/axis2/trunk/c/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/configure.in?view=diff&rev=515456&r1=515455&r2=515456
==============================================================================
--- webservices/axis2/trunk/c/build/win32/configure.in (original)
+++ webservices/axis2/trunk/c/build/win32/configure.in Tue Mar  6 20:54:13 2007
@@ -1,15 +1,14 @@
 ENABLE_SSL = 0
+ENABLE_LIBCURL= 0
 LIBXML2_BIN_DIR = E:\libxml2-2.6.27.win32
 ICONV_BIN_DIR = E:\iconv-1.9.2.win32
 ZLIB_BIN_DIR=E:\zlib-1.2.3.win32
-APACHE_BIN_DIR = E:\Apache2
+APACHE_BIN_DIR = E:\Apache22
 LIBXSLT_BIN_DIR = E:\libxslt-1.1.17.win32
-APACHE_VERSION_IS_2_0_59 = 1
+APACHE_VERSION_IS_2_0_59 = 0
 OPENSSL_BIN_DIR = E:\OpenSSL
+LIBCURL_BIN_DIR = E:\libcurl-7.15.1-msvc-win32-ssl-0.9.8a-zlib-1.2.3
 RELEASE_VER = 0.96
-
-
-
 
 ## to use apache 2.2.3 , use  APACHE_VERSION_IS_2_0_59 = 0
 ## to build with debug symbols use DEBUG=1

Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?view=diff&rev=515456&r1=515455&r2=515456
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Tue Mar  6 20:54:13 2007
@@ -123,6 +123,10 @@
 !if "$(ENABLE_SSL)" == "1"
 AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(OPENSSL_BIN_DIR)\include
 !endif
+!if "$(ENABLE_LIBCURL)" == "1"
+AXIS2_INCLUDE_PATH = $(AXIS2_INCLUDE_PATH) /I$(LIBCURL_BIN_DIR)\include
+!endif
+
 
 #source paths for core modules
 
@@ -175,6 +179,11 @@
 AXIS2_HTTP_SENDER_SRC = $(AXIS2_HTTP_SENDER_SRC) \
 		$(AXIS2_SOURCE_DIR)\modules\core\transport\http\sender\ssl\*.c
 !endif
+!if "$(ENABLE_LIBCURL)" == "1"
+AXIS2_HTTP_SENDER_SRC = $(AXIS2_HTTP_SENDER_SRC) \
+		$(AXIS2_SOURCE_DIR)\modules\core\transport\http\sender\libcurl\*.c
+!endif
+
 
 AXIS2_HTTP_RECEIVER_SRC = $(AXIS2_SOURCE_DIR)\modules\core\transport\http\receiver\*.c 
 
@@ -192,6 +201,10 @@
 CFLAGS = $(CFLAGS) /D "AXIS2_SSL_ENABLED"
 !endif
 
+!if "$(ENABLE_LIBCURL)" == "1"
+CFLAGS = $(CFLAGS) /D "AXIS2_LIBCURL_ENABLED"
+!endif
+
 ################### linker options
 
 LD = @link.exe
@@ -206,6 +219,11 @@
 LIBS = $(LIBS) libeay32MT.lib ssleay32MT.lib
 !endif
 
+!if "$(ENABLE_LIBCURL)" == "1"
+LDFLAGS = $(LDFLAGS) /LIBPATH:$(LIBCURL_BIN_DIR)
+LIBS = $(LIBS) libcurl_imp.lib
+!endif
+
 !if "$(APACHE_VERSION_IS_2_0_59)" == "1"
 APACHE_LIBS = apr.lib xml.lib libhttpd.lib aprutil.lib libapr.lib
 !else
@@ -1024,6 +1042,7 @@
 
 	copy mod_rampart.dll $(RAMPART_MODULES_DIR)\rampart
 	copy mod_rampart.lib $(AXIS2_BINDIR)\lib
+	copy mod_rampart.dll $(AXIS2_BINDIR)\lib
 	
 	del *.dll
 	del *.lib
@@ -1161,5 +1180,5 @@
  
 install: all
 
-dist: all axis2_server_modules savan copy_extra copy_samples mv_dist
+dist: all mod_rampart_all axis2_server_modules savan copy_extra copy_samples mv_dist
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message