svn commit: r407468 - in /webservices/axis2/trunk/c: ./ axiom/ axiom/attachments/ axiom/include/ axiom/parser/libxml2/ include/

[da...@apache.org]

Author: damitha
Date: Wed May 17 23:10:05 2006
New Revision: 407468

URL: http://svn.apache.org/viewvc?rev=407468&view=rev
Log:
More changes

Added:
    webservices/axis2/trunk/c/axiom/include/axis2_om.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_attribute.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_attribute.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_child_element_iterator.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_child_element_iterator.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_children_iterator.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_children_iterator.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_children_qname_iterator.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_children_qname_iterator.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_children_with_specific_attribute_iterator.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_children_with_specific_attribute_iterator.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_comment.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_comment.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_doctype.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_doctype.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_document.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_document.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_element.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_element.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_namespace.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_namespace.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_navigator.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_navigator.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_node.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_node.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_output.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_output.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_processing_instruction.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_stax_builder.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
    webservices/axis2/trunk/c/axiom/include/axis2_om_text.h
      - copied unchanged from r407443, webservices/axis2/trunk/c/include/axis2_om_text.h
Removed:
    webservices/axis2/trunk/c/include/axis2_om.h
    webservices/axis2/trunk/c/include/axis2_om_attribute.h
    webservices/axis2/trunk/c/include/axis2_om_child_element_iterator.h
    webservices/axis2/trunk/c/include/axis2_om_children_iterator.h
    webservices/axis2/trunk/c/include/axis2_om_children_qname_iterator.h
    webservices/axis2/trunk/c/include/axis2_om_children_with_specific_attribute_iterator.h
    webservices/axis2/trunk/c/include/axis2_om_comment.h
    webservices/axis2/trunk/c/include/axis2_om_doctype.h
    webservices/axis2/trunk/c/include/axis2_om_document.h
    webservices/axis2/trunk/c/include/axis2_om_element.h
    webservices/axis2/trunk/c/include/axis2_om_namespace.h
    webservices/axis2/trunk/c/include/axis2_om_navigator.h
    webservices/axis2/trunk/c/include/axis2_om_node.h
    webservices/axis2/trunk/c/include/axis2_om_output.h
    webservices/axis2/trunk/c/include/axis2_om_processing_instruction.h
    webservices/axis2/trunk/c/include/axis2_om_stax_builder.h
    webservices/axis2/trunk/c/include/axis2_om_text.h
Modified:
    webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h
    webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h
    webservices/axis2/trunk/c/axiom/configure.ac
    webservices/axis2/trunk/c/axiom/parser/libxml2/Makefile.am
    webservices/axis2/trunk/c/configure.ac

Modified: webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h?rev=407468&r1=407467&r2=407468&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/attachments/axis2_mime_body_part.h Wed May 17 23:10:05 2006
@@ -22,7 +22,7 @@
  * @brief axis2 mime_body_part interface
  */
 
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_error.h>
 #include <axis2_defines.h>
 #include <axis2_env.h>

Modified: webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h?rev=407468&r1=407467&r2=407468&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h (original)
+++ webservices/axis2/trunk/c/axiom/attachments/axis2_mime_output.h Wed May 17 23:10:05 2006
@@ -22,7 +22,7 @@
  * @brief axis2 mime_output interface
  */
 
-#include <axis2_const.h>
+#include <axis2_utils.h>
 #include <axis2_error.h>
 #include <axis2_defines.h>
 #include <axis2_env.h>

Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=407468&r1=407467&r2=407468&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Wed May 17 23:10:05 2006
@@ -45,6 +45,33 @@
 AC_FUNC_REALLOC
 #AC_CHECK_FUNCS([memmove])
 
+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)/util/include
+    elif test -d '$(AXIS2C_HOME)/util/include'; then
+        axis2_utilinc="-I$(AXIS2C_HOME)/util/include"
+    else
+        AC_MSG_ERROR(could not find axis2_util. stop)
+    fi
+    ;;
+  esac ],
+  AC_MSG_RESULT(no)
+)
+
+
+UTILINC=$axis2_utilinc
+
+AC_SUBST(UTILINC)
 
 AC_CONFIG_FILES([Makefile \
     parser/Makefile \

Modified: webservices/axis2/trunk/c/axiom/parser/libxml2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/parser/libxml2/Makefile.am?rev=407468&r1=407467&r2=407468&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/parser/libxml2/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/parser/libxml2/Makefile.am Wed May 17 23:10:05 2006
@@ -8,5 +8,6 @@
 
 INCLUDES = -I$(top_builddir)/include \
             -I$(top_builddir)/modules/util \
-            -I$(top_builddir)/modules/xml/parser \
-            -I$(top_builddir)/modules/platforms
+            -I$(top_builddir)/xml/parser \
+            -I$(top_builddir)/modules/platforms \
+			@UTILINC@

Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=407468&r1=407467&r2=407468&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Wed May 17 23:10:05 2006
@@ -224,9 +224,9 @@
     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)/modules/xml/om/include
-    elif test -d '$(AXIS2C_HOME)/modules/xml/om/include'; then
-        axiominc="-I$(AXIS2C_HOME)/modules/xml/om/include"
+    dnl else find the axiom include dir in $(AXIS2C_HOME)/axiom/include
+    elif test -d '$(AXIS2C_HOME)/axiom/include'; then
+        axiominc="-I$(AXIS2C_HOME)/axiom/include"
     else
         AC_MSG_ERROR(could not find axiom. stop)
     fi
@@ -247,9 +247,9 @@
     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)/modules/util/include
-    elif test -d '$(AXIS2C_HOME)/modules/util/include'; then
-        axis2_utilinc="-I$(AXIS2C_HOME)/modules/util/include"
+    dnl else find the axis2_util include dir in $(AXIS2C_HOME)/util/include
+    elif test -d '$(AXIS2C_HOME)/util/include'; then
+        axis2_utilinc="-I$(AXIS2C_HOME)/util/include"
     else
         AC_MSG_ERROR(could not find axis2_util. stop)
     fi
@@ -262,13 +262,13 @@
 CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
 
 APACHE2INC=$apache2inc
-OMINC=$axiominc
+AXIOMINC=$axiominc
 UTILINC=$axis2_utilinc
 APRINC=$aprinc
 
 AC_SUBST(APACHE2INC)
 AC_SUBST(APRINC)
-AC_SUBST(OMINC)
+AC_SUBST(AXIOMINC)
 AC_SUBST(UTILINC)
 AC_SUBST(LIBXML2_CFLAGS)
 AC_SUBST(LIBXML2_LIBS)