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 2006/05/18 12:50:18 UTC
svn commit: r407516 - in /webservices/axis2/trunk/c: axiom/ axiom/include/
samples/ samples/client/echo/ samples/server/echo/ util/ util/include/
Author: damitha
Date: Thu May 18 03:50:17 2006
New Revision: 407516
URL: http://svn.apache.org/viewvc?rev=407516&view=rev
Log:
Changes due to folder structure change
Added:
webservices/axis2/trunk/c/axiom/include/Makefile.am
Modified:
webservices/axis2/trunk/c/axiom/Makefile.am
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/samples/build.sh
webservices/axis2/trunk/c/samples/client/echo/Makefile.am
webservices/axis2/trunk/c/samples/configure.ac
webservices/axis2/trunk/c/samples/server/echo/Makefile.am
webservices/axis2/trunk/c/util/Makefile.am
webservices/axis2/trunk/c/util/include/Makefile.am
Modified: webservices/axis2/trunk/c/axiom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/Makefile.am?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/Makefile.am Thu May 18 03:50:17 2006
@@ -1,2 +1,3 @@
TESTS =
+include_HEADERS=$(top_builddir)/include/*.h
SUBDIRS = parser attachments om soap
Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Thu May 18 03:50:17 2006
@@ -119,7 +119,8 @@
parser/libxml2/Makefile \
soap/Makefile \
om/Makefile \
- attachments/Makefile
+ attachments/Makefile \
+ include/Makefile
])
AC_OUTPUT
Added: webservices/axis2/trunk/c/axiom/include/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/Makefile.am?rev=407516&view=auto
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/Makefile.am (added)
+++ webservices/axis2/trunk/c/axiom/include/Makefile.am Thu May 18 03:50:17 2006
@@ -0,0 +1 @@
+TESTS =
Modified: webservices/axis2/trunk/c/samples/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/build.sh?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/build.sh (original)
+++ webservices/axis2/trunk/c/samples/build.sh Thu May 18 03:50:17 2006
@@ -1,5 +1,5 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME}
+./configure --prefix=${AXIS2C_HOME} --with-axis2_util=${AXIS2C_HOME}/include --with-axiom=${AXIS2C_HOME}/include
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?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/echo/Makefile.am Thu May 18 03:50:17 2006
@@ -20,4 +20,6 @@
$(LIBXML2_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include \
- -I$(AXIS2C_HOME)/platforms
+ @UTILINC@ \
+ @UTILINC@/platforms \
+ @AXIOMINC@
Modified: webservices/axis2/trunk/c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/configure.ac?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/configure.ac (original)
+++ webservices/axis2/trunk/c/samples/configure.ac Thu May 18 03:50:17 2006
@@ -54,6 +54,62 @@
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] use axiom.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ dnl Find axiom include dir in the path
+ if test -d $withval; then
+ axiominc="-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"
+ else
+ AC_MSG_ERROR(could not find axiom. 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] use axis2_util.],
+[ 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"
+ else
+ AC_MSG_ERROR(could not find axis2_util. stop)
+ fi
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+
+APACHE2INC=$apache2inc
+AXIOMINC=$axiominc
+UTILINC=$axis2_utilinc
+APRINC=$aprinc
+
+AC_SUBST(APACHE2INC)
+AC_SUBST(APRINC)
+AC_SUBST(AXIOMINC)
+AC_SUBST(UTILINC)
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
AC_SUBST(LIBXML2_DIR)
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?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/server/echo/Makefile.am Thu May 18 03:50:17 2006
@@ -9,4 +9,6 @@
libecho_la_SOURCES = echo.c echo_skeleton.c
libecho_la_LIBADD =
INCLUDES = -I$(AXIS2C_HOME)/include \
- -I$(AXIS2C_HOME)/platforms
+ @UTILINC@ \
+ @UTILINC@/platforms \
+ @AXIOMINC@
Modified: webservices/axis2/trunk/c/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/Makefile.am?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/Makefile.am Thu May 18 03:50:17 2006
@@ -1,4 +1,5 @@
TESTS =
+include_HEADERS=$(top_builddir)/include/*.h
SUBDIRS = platforms/unix minizip
lib_LTLIBRARIES = libaxis2_util.la
libaxis2_util_la_SOURCES = \
Modified: webservices/axis2/trunk/c/util/include/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/Makefile.am?rev=407516&r1=407515&r2=407516&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/Makefile.am (original)
+++ webservices/axis2/trunk/c/util/include/Makefile.am Thu May 18 03:50:17 2006
@@ -1,3 +1,2 @@
-TESTS=
+TESTS =
nobase_include_HEADERS= platforms/axis2_platform_auto_sense.h platforms/unix/*.h platforms/windows/*.h
-