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 pi...@apache.org on 2007/06/11 10:39:35 UTC
svn commit: r546045 - in /webservices/axis2/trunk/c/samples: ./ client/echo/
client/google/ client/math/ client/mtom/ client/notify/ client/yahoo/
server/Calculator/ server/echo/ server/math/ server/mtom/ server/notify/
server/sg_math/ user_guide/clients/
Author: pini
Date: Mon Jun 11 01:39:33 2007
New Revision: 546045
URL: http://svn.apache.org/viewvc?view=rev&rev=546045
Log:
Fixed a error in include path
Modified:
webservices/axis2/trunk/c/samples/build.sh
webservices/axis2/trunk/c/samples/client/echo/Makefile.am
webservices/axis2/trunk/c/samples/client/google/Makefile.am
webservices/axis2/trunk/c/samples/client/math/Makefile.am
webservices/axis2/trunk/c/samples/client/mtom/Makefile.am
webservices/axis2/trunk/c/samples/client/notify/Makefile.am
webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am
webservices/axis2/trunk/c/samples/configure.ac
webservices/axis2/trunk/c/samples/server/Calculator/Makefile.am
webservices/axis2/trunk/c/samples/server/echo/Makefile.am
webservices/axis2/trunk/c/samples/server/math/Makefile.am
webservices/axis2/trunk/c/samples/server/mtom/Makefile.am
webservices/axis2/trunk/c/samples/server/notify/Makefile.am
webservices/axis2/trunk/c/samples/server/sg_math/Makefile.am
webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
Modified: webservices/axis2/trunk/c/samples/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/build.sh?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/build.sh (original)
+++ webservices/axis2/trunk/c/samples/build.sh Mon Jun 11 01:39:33 2007
@@ -2,7 +2,7 @@
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include/axis2-1.1 --with-axiom=${AXIS2C_HOME}/include/axis2-1.1
+./configure --prefix=${AXIS2C_HOME} --with-axis2=${AXIS2C_HOME}/include/axis2-1.1
make
make install
Modified: webservices/axis2/trunk/c/samples/client/echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/echo/Makefile.am Mon Jun 11 01:39:33 2007
@@ -16,8 +16,6 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=README.txt echo.mk
Modified: webservices/axis2/trunk/c/samples/client/google/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/google/Makefile.am Mon Jun 11 01:39:33 2007
@@ -15,8 +15,6 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=README.txt google.mk
Modified: webservices/axis2/trunk/c/samples/client/math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/math/Makefile.am Mon Jun 11 01:39:33 2007
@@ -18,8 +18,6 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=math.mk
Modified: webservices/axis2/trunk/c/samples/client/mtom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/Makefile.am Mon Jun 11 01:39:33 2007
@@ -18,8 +18,6 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=mtom.mk
Modified: webservices/axis2/trunk/c/samples/client/notify/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/notify/Makefile.am Mon Jun 11 01:39:33 2007
@@ -16,8 +16,6 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=notify.mk
Modified: webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am Mon Jun 11 01:39:33 2007
@@ -15,8 +15,6 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=yahoo.mk
Modified: webservices/axis2/trunk/c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/configure.ac?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/configure.ac (original)
+++ webservices/axis2/trunk/c/samples/configure.ac Mon Jun 11 01:39:33 2007
@@ -81,12 +81,12 @@
DICLIENT_DIR=""
)
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] Find the AXIOM header files in 'PATH'.
- 'PATH' should point to AXIOM include files location.
+AC_MSG_CHECKING(To Use Axis2 C . This is a compulsory module to build Axis2 C samples)
+AC_ARG_WITH(axis2,
+[ --with-axis2[=PATH] Find the AXIS2 header files in 'PATH'.
+ 'PATH' should point to AXIS2 include files location.
If you omit the '=PATH' part completely, the configure script will search
- '$(AXIS2C_HOME)/include/axis2-1.1' for AXIOM headers.],
+ '$(AXIS2C_HOME)/include/axis2-1.1' for AXIS2 headers.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
@@ -95,54 +95,25 @@
AC_MSG_RESULT(yes)
dnl Find axiom include dir in the path
if test -d $withval; then
- axiominc="-I$withval"
+ axis2inc="-I$withval"
dnl else find the axiom include dir in $(AXIS2C_HOME)/include
elif test -d '$(AXIS2C_HOME)/include'; then
axiominc="-I$(AXIS2C_HOME)/include/axis2-1.1"
else
- AC_MSG_ERROR(could not find axiom. stop)
+ AC_MSG_ERROR(could not find axis2. stop)
fi
;;
esac ],
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(To Use Axis2 C Util. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] Find the Axis2 util header files in 'PATH'.
- 'PATH' should point to Axis2 util include files location.
- If you omit the '=PATH' part completely, the configure script will search
- '$(AXIS2C_HOME)/include/axis2-1.1' for Axis2 util headers.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_util include dir in the path
- if test -d $withval; then
- axis2_utilinc="-I$withval"
- dnl else find the axis2_util include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_utilinc="-I$(AXIS2C_HOME)/include/axis2-1.1"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-
APACHE2INC=$apache2inc
-AXIOMINC=$axiominc
-UTILINC=$axis2_utilinc
+AXIS2INC=$axis2inc
APRINC=$aprinc
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
-AC_SUBST(AXIOMINC)
-AC_SUBST(UTILINC)
+AC_SUBST(AXIS2INC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_DIR)
Modified: webservices/axis2/trunk/c/samples/server/Calculator/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/Makefile.am Mon Jun 11 01:39:33 2007
@@ -8,6 +8,4 @@
SUBDIRS =
libCalculator_la_SOURCES = calc.c calc_skeleton.c
libCalculator_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/server/echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/echo/Makefile.am Mon Jun 11 01:39:33 2007
@@ -8,6 +8,4 @@
SUBDIRS =
libecho_la_SOURCES = echo.c echo_skeleton.c
libecho_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/server/math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/math/Makefile.am Mon Jun 11 01:39:33 2007
@@ -8,6 +8,4 @@
SUBDIRS =
libmath_la_SOURCES = math.c math_skeleton.c
libmath_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/server/mtom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/Makefile.am Mon Jun 11 01:39:33 2007
@@ -8,6 +8,4 @@
SUBDIRS =
libmtom_la_SOURCES = mtom.c mtom_skeleton.c
libmtom_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/server/notify/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/notify/Makefile.am Mon Jun 11 01:39:33 2007
@@ -8,6 +8,4 @@
SUBDIRS =
libnotify_la_SOURCES = notify.c notify_skeleton.c
libnotify_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/server/sg_math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/Makefile.am Mon Jun 11 01:39:33 2007
@@ -14,6 +14,4 @@
libsub_la_SOURCES = sub.c sub_skeleton.c
libmul_la_SOURCES = mul.c mul_skeleton.c
libdiv_la_SOURCES = div.c div_skeleton.c
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am?view=diff&rev=546045&r1=546044&r2=546045
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am Mon Jun 11 01:39:33 2007
@@ -32,9 +32,7 @@
echo_non_blocking_dual_LDADD = $(LINK_FLAGS)
echo_blocking_soap11_LDADD = $(LINK_FLAGS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.1 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
EXTRA_DIST=echo_util.h echo_blocking_addr.mk echo_blocking.mk echo_non_blocking_dual.mk echo_rest.mk echo_blocking_dual.mk echo_blocking_soap11.mk echo_non_blocking.mk
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org