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 2008/10/06 14:02:26 UTC
svn commit: r702117 - in /webservices/axis2/branches/c/xpath_integration:
axiom/configure.ac axiom/src/Makefile.am axiom/src/om/Makefile.am
axiom/src/xpath/Makefile.am configure.ac
Author: pini
Date: Mon Oct 6 05:02:25 2008
New Revision: 702117
URL: http://svn.apache.org/viewvc?rev=702117&view=rev
Log:
Creating the xpath library seperately
Modified:
webservices/axis2/branches/c/xpath_integration/axiom/configure.ac
webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am
webservices/axis2/branches/c/xpath_integration/axiom/src/om/Makefile.am
webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/Makefile.am
webservices/axis2/branches/c/xpath_integration/configure.ac
Modified: webservices/axis2/branches/c/xpath_integration/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/configure.ac?rev=702117&r1=702116&r2=702117&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/configure.ac (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/configure.ac Mon Oct 6 05:02:25 2008
@@ -79,7 +79,21 @@
dnl AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+AC_MSG_CHECKING(whether to build xpath)
+AC_ARG_ENABLE(xpath, [ --enable-xpath build xpath. default=yes],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ XPATH_DIR="xpath"
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ XPATH_DIR="xpath"
+)
AC_MSG_CHECKING(whether to build guththila xml parser library)
AC_ARG_ENABLE(guththila, [ --enable-guththila build guththila xml parser library wrapper. default=yes],
@@ -142,6 +156,7 @@
AC_SUBST(WRAPPER_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(TESTDIR)
+AC_SUBST(XPATH_DIR)
AC_CONFIG_FILES([Makefile \
src/Makefile \
Modified: webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am?rev=702117&r1=702116&r2=702117&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/src/Makefile.am Mon Oct 6 05:02:25 2008
@@ -1 +1 @@
-SUBDIRS = parser attachments soap util xpath om
+SUBDIRS = parser attachments soap util ${XPATH_DIR} om
Modified: webservices/axis2/branches/c/xpath_integration/axiom/src/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/src/om/Makefile.am?rev=702117&r1=702116&r2=702117&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/src/om/Makefile.am (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/src/om/Makefile.am Mon Oct 6 05:02:25 2008
@@ -18,7 +18,6 @@
om_navigator.c
libaxis2_axiom_la_LIBADD = $(top_builddir)/src/soap/libaxis2_soap.la \
- $(top_builddir)/src/xpath/libaxis2_xpath.la \
$(top_builddir)/src/attachments/libaxis2_attachments.la \
$(top_builddir)/src/util/libaxis2_axiom_util.la \
../parser/${WRAPPER_DIR}/libaxis2_parser.la \
Modified: webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/Makefile.am?rev=702117&r1=702116&r2=702117&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/Makefile.am (original)
+++ webservices/axis2/branches/c/xpath_integration/axiom/src/xpath/Makefile.am Mon Oct 6 05:02:25 2008
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libaxis2_xpath.la
+lib_LTLIBRARIES = libaxis2_xpath.la
libaxis2_xpath_la_SOURCES = xpath.c \
xpath_functions.c \
xpath_internals.c \
Modified: webservices/axis2/branches/c/xpath_integration/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/xpath_integration/configure.ac?rev=702117&r1=702116&r2=702117&view=diff
==============================================================================
--- webservices/axis2/branches/c/xpath_integration/configure.ac (original)
+++ webservices/axis2/branches/c/xpath_integration/configure.ac Mon Oct 6 05:02:25 2008
@@ -133,6 +133,21 @@
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(whether to build xpath)
+AC_ARG_ENABLE(xpath, [ --enable-xpath build xpath. default=yes],
+[ case "${enableval}" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ XPATH_DIR="xpath"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ XPATH_DIR="xpath"
+)
GUTHTHILA_LIBS=""