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 2006/10/03 08:05:08 UTC
svn commit: r452316 - in /webservices/axis2/trunk/c: ./
modules/core/transport/http/server/apache2/
modules/core/transport/http/server/simple_axis2_server/ test/core/addr/
test/core/clientapi/ test/core/context/ test/core/deployment/
test/core/descript...
Author: pini
Date: Mon Oct 2 23:05:07 2006
New Revision: 452316
URL: http://svn.apache.org/viewvc?view=rev&rev=452316
Log:
Removed hard coded libxml2 from tests.
Modified:
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
webservices/axis2/trunk/c/test/core/addr/Makefile.am
webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
webservices/axis2/trunk/c/test/core/context/Makefile.am
webservices/axis2/trunk/c/test/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/core/description/Makefile.am
webservices/axis2/trunk/c/test/core/engine/Makefile.am
webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am
webservices/axis2/trunk/c/test/unit/Makefile.am
webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Mon Oct 2 23:05:07 2006
@@ -122,6 +122,9 @@
WRAPPER_DIR="libxml2"
)
+
+GUTHTHILA_LIBS=""
+
AC_MSG_CHECKING(whether to build guththila xml parser library)
AC_ARG_ENABLE(guththila, [ --enable-guththila build guththila xml parser library wrapper. default=no],
[ case "${enableval}" in
@@ -135,7 +138,7 @@
AC_CONFIG_SUBDIRS(guththila)
fi
-# GUTHTHILA_LIBS="../../../../../../guththila/src/"
+ GUTHTHILA_LIBS="/guththila/src/"
GUTHTHILA_DIR="guththila"
;;
@@ -294,7 +297,7 @@
AC_SUBST(WRAPPER_DIR)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(RAMPART_DIR)
-#AC_SUBST(GUTHTHILA_LIBS)
+AC_SUBST(GUTHTHILA_LIBS)
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
#export PARSER_DIR
export WRAPPER_DIR
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/Makefile.am Mon Oct 2 23:05:07 2006
@@ -5,6 +5,7 @@
apache2_out_transport_info.c\
apache2_worker.c
AM_CFLAGS = -DLINUX=2 -D_REENTRANT -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE
+
libmod_axis2_la_LIBADD = $(LDFLAGS) \
-L$(top_builddir)/modules/wsdl \
-L$(top_builddir)/modules/core/engine \
@@ -20,9 +21,9 @@
-laxis2_wsdl \
-laxis2_http_sender \
-laxis2_http_receiver \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(PARSER_LIBS) \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
+ $(LIBXML2_LIBS)
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl\
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am Mon Oct 2 23:05:07 2006
@@ -19,8 +19,8 @@
-laxis2_wsdl \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
+ $(LIBXML2_LIBS)
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl\
Modified: webservices/axis2/trunk/c/test/core/addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/addr/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Mon Oct 2 23:05:07 2006
@@ -14,7 +14,7 @@
../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
Modified: webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Mon Oct 2 23:05:07 2006
@@ -18,7 +18,7 @@
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
$(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
+ -L$(top_builddir)$(GUTHTHILA_LIBS)
test_client_LDADD = \
../../../util/src/libaxis2_util.la \
@@ -31,7 +31,7 @@
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
$(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
+ -L$(top_builddir)$(GUTHTHILA_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Mon Oct 2 23:05:07 2006
@@ -14,7 +14,7 @@
../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
Modified: webservices/axis2/trunk/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Mon Oct 2 23:05:07 2006
@@ -13,7 +13,7 @@
../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Mon Oct 2 23:05:07 2006
@@ -14,7 +14,7 @@
-lpthread \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Mon Oct 2 23:05:07 2006
@@ -15,7 +15,7 @@
../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
Modified: webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/Makefile.am Mon Oct 2 23:05:07 2006
@@ -17,7 +17,7 @@
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
$(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
+ -L$(top_builddir)$(GUTHTHILA_LIBS)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am Mon Oct 2 23:05:07 2006
@@ -12,7 +12,7 @@
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
$(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)/$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am Mon Oct 2 23:05:07 2006
@@ -10,9 +10,9 @@
../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
+ $(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
$(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)/$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Mon Oct 2 23:05:07 2006
@@ -19,9 +19,9 @@
../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
+ $(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
$(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Mon Oct 2 23:05:07 2006
@@ -25,6 +25,6 @@
../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am Mon Oct 2 23:05:07 2006
@@ -36,6 +36,6 @@
-lpthread \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Mon Oct 2 23:05:07 2006
@@ -37,6 +37,6 @@
../../../../woden/src/wsdl20/libwoden.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Mon Oct 2 23:05:07 2006
@@ -31,5 +31,5 @@
../../../../woden/src/wsdl20/libwoden.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Mon Oct 2 23:05:07 2006
@@ -34,6 +34,6 @@
../../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am?view=diff&rev=452316&r1=452315&r2=452316
==============================================================================
--- webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am Mon Oct 2 23:05:07 2006
@@ -36,5 +36,5 @@
../../../xml_schema/src/libaxis2_xml_schema.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
- $(GUTHTHILA_LIBS) \
+ -L$(top_builddir)$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org