You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2005/02/07 07:52:23 UTC
cvs commit: ws-axis/c/src/transport Makefile.am
damitha 2005/02/06 22:52:23
Modified: c configure.ac runconfig.sh
c/src/transport Makefile.am
Log:
Made the axis3 the default transport in gnu build
Revision Changes Path
1.70 +10 -10 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- configure.ac 28 Jan 2005 05:48:42 -0000 1.69
+++ configure.ac 7 Feb 2005 06:52:23 -0000 1.70
@@ -94,21 +94,21 @@
TSPPBUILD=""
)
-AC_MSG_CHECKING(whether to build axis3 client transport library)
-AC_ARG_ENABLE(axis3, [ --enable-axis3 build axis3 client transport library. default=no],
+AC_MSG_CHECKING(whether to build axis2 client transport library)
+AC_ARG_ENABLE(axis2, [ --enable-axis2 build axis2 client transport library. default=no],
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
- AXIS3BUILD=""
+ AXIS2BUILD=""
;;
*)
AC_MSG_RESULT(yes)
- AXIS3BUILD="axis3"
+ AXIS2BUILD="axis2"
;;
esac ],
AC_MSG_RESULT(no)
- AXIS3BUILD=""
+ AXIS2BUILD=""
)
AC_MSG_CHECKING(whether to build test cases)
@@ -201,6 +201,10 @@
;;
*)
AC_MSG_RESULT(yes)
+ dnl test whether axis2 build enabled
+ if test axis2 != "$AXIS2BUILD"; then
+ AC_MSG_ERROR("Axis2 transport is not enabled. stop")
+ fi
dnl test for ssl directory
if test -d $withval; then
sslinc="-I$withval/include"
@@ -226,10 +230,6 @@
;;
*)
AC_MSG_RESULT(yes)
- dnl test whether axis3 build enabled
- if test axis3 != "$AXIS3BUILD"; then
- AC_MSG_ERROR("Axis3 transport is not enabled. stop")
- fi
dnl test for ssl directory
if test -d $withval; then
@@ -280,7 +280,7 @@
AC_SUBST(TESTCASESBUILD)
AC_SUBST(CPPUNITBUILD)
AC_SUBST(SAMPLESBUILD)
-AC_SUBST(AXIS3BUILD)
+AC_SUBST(AXIS2BUILD)
AC_SUBST(TSPPBUILD)
AC_SUBST(SSLBUILD)
AC_SUBST(AXIS3SSLBUILD)
1.4 +2 -3 ws-axis/c/runconfig.sh
Index: runconfig.sh
===================================================================
RCS file: /home/cvs/ws-axis/c/runconfig.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- runconfig.sh 28 Jan 2005 05:48:42 -0000 1.3
+++ runconfig.sh 7 Feb 2005 06:52:23 -0000 1.4
@@ -20,10 +20,9 @@
# Following is the configure options with a brief description
# --prefix=path to your installation folder. default is /usr/ocal/axiscpp_deploy
# --enable-tspp Whether tspp parser library should be built. by default this is not built
-# --enable-axis3 build axis3 client transport library. default=no
+# --enable-axis2 build axis2 client transport library. default=no
# --enable-testcases build test cases. default=no
# --enable-samples build samples. default=yes
-# --enable-axis3 build axis3 client transport library. default=no
# --with-apache2=PATH path to apache2 installation. if not given apache2 module library is not built.
# --with-apache=PATH path to apache1 installation. if not given apache1 module library is not built.
# --with-xercesc=PATH path to xercesc installation. if not given xercesc parser library is not built.
@@ -41,5 +40,5 @@
echo ""
./configure --prefix=/usr/local/axiscpp_deploy \
--with-apache2=/usr/local/apache2 \
- --with-xercesc=/usr/local/xerces-c
+ --with-xercesc=/usr/local/xerces-c
1.11 +1 -1 ws-axis/c/src/transport/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/src/transport/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am 13 Jan 2005 12:29:36 -0000 1.10
+++ Makefile.am 7 Feb 2005 06:52:23 -0000 1.11
@@ -1 +1 @@
-SUBDIRS = axis2 @AXIS3BUILD@
+SUBDIRS = axis3 @AXIS2BUILD@