You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2006/06/01 06:28:46 UTC
svn commit: r410739 - in /webservices/axis2/trunk/c/xml_schema: build.sh
configure.ac src/Makefile.am src/xml_schema_enum.c
Author: pini
Date: Wed May 31 21:28:45 2006
New Revision: 410739
URL: http://svn.apache.org/viewvc?rev=410739&view=rev
Log:
corrected build errors
Modified:
webservices/axis2/trunk/c/xml_schema/build.sh
webservices/axis2/trunk/c/xml_schema/configure.ac
webservices/axis2/trunk/c/xml_schema/src/Makefile.am
webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
Modified: webservices/axis2/trunk/c/xml_schema/build.sh
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/build.sh?rev=410739&r1=410738&r2=410739&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/build.sh (original)
+++ webservices/axis2/trunk/c/xml_schema/build.sh Wed May 31 21:28:45 2006
@@ -1,4 +1,4 @@
#!/bin/bash
./autogen.sh
-./configure --enable-static=no
+./configure --enable-static=no --with-axis2_util=${AXIS2C_HOME}/include --with-axiom=${AXIS2C_HOME}/include
make
Modified: webservices/axis2/trunk/c/xml_schema/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/configure.ac?rev=410739&r1=410738&r2=410739&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/configure.ac (original)
+++ webservices/axis2/trunk/c/xml_schema/configure.ac Wed May 31 21:28:45 2006
@@ -38,7 +38,60 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+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)
+)
+
+UTILINC=$axis2_utilinc
+AXIOMINC=$axiominc
+
+AC_SUBST(UTILINC)
+AC_SUBST(AXIOMINC)
+
AC_CONFIG_FILES([Makefile
+ src/Makefile \
])
AC_OUTPUT
Modified: webservices/axis2/trunk/c/xml_schema/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/Makefile.am?rev=410739&r1=410738&r2=410739&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/xml_schema/src/Makefile.am Wed May 31 21:28:45 2006
@@ -24,9 +24,7 @@
xml_schema_obj_table.c \
xml_schema_collection.c \
xml_schema_type.c \
- xml_schema_type_receiver.c \
xml_schema_element.c \
- validation_event_handler.c \
xml_schema_any_attribute.c \
xml_schema_builder.c \
xml_schema_external.c \
@@ -44,4 +42,7 @@
INCLUDES = -I$(top_builddir)/include \
- -I$(top_builddir)/modules/xml/xml_schema/include
+ -I$(top_builddir)/xml_schema/include \
+ @AXIOMINC@ \
+ @UTILINC@
+
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?rev=410739&r1=410738&r2=410739&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Wed May 31 21:28:45 2006
@@ -81,7 +81,7 @@
/************************** function impl ************************************/
AXIS2_EXTERN axis2_xml_schema_enum_t * AXIS2_CALL
-axis2_xml_schema_enum_create(axis2_env_t **env,
+axis2_xml_schema_enum_create(axis2_env_t *env,
axis2_char_t *value)
{
axis2_xml_schema_enum_impl_t *schema_enum_impl = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org