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/06/09 04:39:49 UTC
svn commit: r664606 - in /webservices/axis2/trunk/c: ./ axiom/
axiom/src/parser/ axiom/src/parser/libxml2/ axiom/test/om/ axiom/test/soap/
samples/ samples/client/echo/ samples/client/google/ samples/client/math/
samples/client/mtom/ samples/client/not...
Author: pini
Date: Sun Jun 8 19:39:48 2008
New Revision: 664606
URL: http://svn.apache.org/viewvc?rev=664606&view=rev
Log:
Fixing jira issue 1130
Modified:
webservices/axis2/trunk/c/axiom/configure.ac
webservices/axis2/trunk/c/axiom/src/parser/Makefile.am
webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am
webservices/axis2/trunk/c/axiom/test/om/Makefile.am
webservices/axis2/trunk/c/axiom/test/soap/Makefile.am
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/samples/client/echo/Makefile.am
webservices/axis2/trunk/c/samples/client/google/Makefile.am
webservices/axis2/trunk/c/samples/client/math/Makefile.am
webservices/axis2/trunk/c/samples/client/mtom/Makefile.am
webservices/axis2/trunk/c/samples/client/notify/Makefile.am
webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am
webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/Makefile.am
webservices/axis2/trunk/c/samples/codegen/client/calculator/Makefile.am
webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/Makefile.am
webservices/axis2/trunk/c/samples/codegen/client/interop_doc2/Makefile.am
webservices/axis2/trunk/c/samples/configure.ac
webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
webservices/axis2/trunk/c/src/core/transport/http/server/apache2/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/tools/md5/configure.ac
webservices/axis2/trunk/c/tools/tcpmon/configure.ac
Modified: webservices/axis2/trunk/c/axiom/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/configure.ac?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/configure.ac (original)
+++ webservices/axis2/trunk/c/axiom/configure.ac Sun Jun 8 19:39:48 2008
@@ -133,7 +133,7 @@
)
PKG_PROG_PKG_CONFIG(0.15)
-CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
+CFLAGS="$CFLAGS $GUTHTHILA_CFLAGS"
VERSION_NO="4:0:4"
AC_SUBST(VERSION_NO)
Modified: webservices/axis2/trunk/c/axiom/src/parser/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/Makefile.am Sun Jun 8 19:39:48 2008
@@ -1,4 +1,3 @@
-#SUBDIRS = $(LIBXML2_DIR) $(GUTHTHILA_DIR)
SUBDIRS = $(WRAPPER_DIR)
-EXTRA_DIST=libxml2
+DIST_SUBDIRS=guththila libxml2
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/Makefile.am Sun Jun 8 19:39:48 2008
@@ -1,13 +1,10 @@
-lib_LTLIBRARIES = libaxis2_libxml2.la libaxis2_parser.la
-libaxis2_libxml2_la_SOURCES = ../xml_reader.c ../xml_writer.c libxml2_reader_wrapper.c \
- libxml2_writer_wrapper.c
+lib_LTLIBRARIES = libaxis2_parser.la
-libaxis2_libxml2_la_LIBADD = -lxml2
-libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c libxml2_reader_wrapper.c \
- libxml2_writer_wrapper.c
+libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c \
+ libxml2_reader_wrapper.c libxml2_writer_wrapper.c
-libaxis2_parser_la_LIBADD = -lxml2
+libaxis2_parser_la_LIBADD = @LIBXML2_LIBS@
libaxis2_parser_la_LDFLAGS = -version-info $(VERSION_NO)
libaxis2_libxml2_la_LDFLAGS = -version-info $(VERSION_NO)
@@ -15,5 +12,5 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
- -I ../../../../util/include
-
+ -I ../../../../util/include \
+ @LIBXML2_CFLAGS@
Modified: webservices/axis2/trunk/c/axiom/test/om/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/om/Makefile.am Sun Jun 8 19:39:48 2008
@@ -7,10 +7,8 @@
test_om_LDADD = ../../../util/src/libaxutil.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
- $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
-
+ $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I ../../../util/include
Modified: webservices/axis2/trunk/c/axiom/test/soap/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/Makefile.am (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/Makefile.am Sun Jun 8 19:39:48 2008
@@ -7,10 +7,8 @@
test_soap_LDADD = ../../../util/src/libaxutil.la \
$(top_builddir)/src/om/libaxis2_axiom.la \
- $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(LIBXML2_LIBS) \
- $(GUTHTHILA_LIBS)
-
+ $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/parser \
-I ../../../util/include
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Sun Jun 8 19:39:48 2008
@@ -172,8 +172,8 @@
*)
AC_MSG_RESULT(yes)
WRAPPER_DIR="libxml2"
- PKG_CHECK_MODULES(PARSER, libxml-2.0)
- CFLAGS="$CFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
+ PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
+ CFLAGS="$CFLAGS -DAXIS2_LIBXML2_ENABLED"
CPPFLAGS="$CPPFLAGS $PARSER_CFLAGS -DAXIS2_LIBXML2_ENABLED"
LDFLAGS="$LDFLAGS $PARSER_LIBS"
;;
@@ -394,14 +394,12 @@
QPID_HOME=$qpidhome
AC_SUBST(VERSION_NO)
-AC_SUBST(PARSER_LIBS)
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
AC_SUBST(DICLIENT_DIR)
AC_SUBST(TESTDIR)
AC_SUBST(SAMPLES)
AC_SUBST(APACHE2BUILD)
-AC_SUBST(PARSER_DIR)
AC_SUBST(WRAPPER_DIR)
AC_SUBST(TCP_DIR)
AC_SUBST(AMQP_DIR)
@@ -412,7 +410,6 @@
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
-#export PARSER_DIR
export WRAPPER_DIR
export prefix
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=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/echo/Makefile.am Sun Jun 8 19:39:48 2008
@@ -11,8 +11,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/client/google/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/google/Makefile.am Sun Jun 8 19:39:48 2008
@@ -10,8 +10,7 @@
-laxis2_parser \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/client/math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/math/Makefile.am Sun Jun 8 19:39:48 2008
@@ -13,8 +13,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/client/mtom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/Makefile.am Sun Jun 8 19:39:48 2008
@@ -13,8 +13,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/client/notify/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/notify/Makefile.am Sun Jun 8 19:39:48 2008
@@ -11,8 +11,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/yahoo/Makefile.am Sun Jun 8 19:39:48 2008
@@ -10,8 +10,7 @@
-laxis2_parser \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = @AXIS2INC@
Modified: webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/calc_xml_inout/Makefile.am Sun Jun 8 19:39:48 2008
@@ -17,8 +17,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include \
@UTILINC@ \
Modified: webservices/axis2/trunk/c/samples/codegen/client/calculator/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/calculator/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/calculator/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/calculator/Makefile.am Sun Jun 8 19:39:48 2008
@@ -19,8 +19,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include \
@UTILINC@ \
Modified: webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/Makefile.am Sun Jun 8 19:39:48 2008
@@ -24,8 +24,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
test_echo_struct_array_SOURCES = \
axis2_echoBase64.c axis2_echoFloat.c axis2_echoString.c \
@@ -50,9 +49,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
-
+ $(GUTHTHILA_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include \
@UTILINC@ \
Modified: webservices/axis2/trunk/c/samples/codegen/client/interop_doc2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/interop_doc2/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/interop_doc2/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/interop_doc2/Makefile.am Sun Jun 8 19:39:48 2008
@@ -11,7 +11,7 @@
$(LDFLAGS) -L$(AXIS2C_HOME)/lib -laxutil -laxis2_axiom \
-laxis2_wsdl -laxis2_engine -laxis2_parser -lpthread -laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
test_echo_struct_SOURCES = \
axis2_ArrayOfstring_literal.c axis2_echoStringArray.c \
@@ -23,7 +23,7 @@
$(LDFLAGS) -L$(AXIS2C_HOME)/lib -laxutil -laxis2_axiom \
-laxis2_wsdl -laxis2_engine -laxis2_parser -lpthread -laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
test_echo_string_array_SOURCES = \
axis2_ArrayOfstring_literal.c axis2_echoStringArray.c \
@@ -35,7 +35,7 @@
$(LDFLAGS) -L$(AXIS2C_HOME)/lib -laxutil -laxis2_axiom \
-laxis2_wsdl -laxis2_engine -laxis2_parser -lpthread -laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
INCLUDES = -I$(AXIS2C_HOME)/include \
@UTILINC@ \
Modified: webservices/axis2/trunk/c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/configure.ac?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/configure.ac (original)
+++ webservices/axis2/trunk/c/samples/configure.ac Sun Jun 8 19:39:48 2008
@@ -61,7 +61,7 @@
dnl AC_FUNC_MALLOC
dnl AC_FUNC_REALLOC
-CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS"
+CFLAGS="$CFLAGS $GUTHTHILA_CFLAGS"
AC_MSG_CHECKING(whether to build dynamic invocation client)
AC_ARG_ENABLE(diclient, [ --enable-diclient build diclient. default=no],
@@ -113,9 +113,6 @@
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
AC_SUBST(AXIS2INC)
-AC_SUBST(LIBXML2_CFLAGS)
-AC_SUBST(LIBXML2_LIBS)
-AC_SUBST(LIBXML2_DIR)
AC_SUBST(GUTHTHILA_DIR)
AC_SUBST(GUTHTHILA_LIBS)
AC_SUBST(DICLIENT_DIR)
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am Sun Jun 8 19:39:48 2008
@@ -20,8 +20,7 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
- $(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(GUTHTHILA_LIBS)
echo_blocking_LDADD = $(LINK_FLAGS)
echo_non_blocking_LDADD = $(LINK_FLAGS)
Modified: webservices/axis2/trunk/c/src/core/transport/http/server/apache2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/apache2/Makefile.am?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/apache2/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/apache2/Makefile.am Sun Jun 8 19:39:48 2008
@@ -13,10 +13,7 @@
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la\
$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la\
$(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la\
- -lpthread \
- -L$(top_builddir)$(GUTHTHILA_LIBS) \
- $(PARSER_LIBS) \
- $(LIBXML2_LIBS)
+ -lpthread
libmod_axis2_la_LDFLAGS = -version-info $(VERSION_NO)
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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Sun Jun 8 19:39:48 2008
@@ -9,11 +9,9 @@
../../../util/src/libaxutil.la \
../../../axiom/src/om/libaxis2_axiom.la \
../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(top_builddir)/neethi/src/libneethi.la \
+ $(top_builddir)/neethi/src/libneethi.la \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
- -L$(top_builddir)$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/src/xml/guththila \
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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Sun Jun 8 19:39:48 2008
@@ -11,12 +11,10 @@
../../../util/src/libaxutil.la \
../../../axiom/src/om/libaxis2_axiom.la \
../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(top_builddir)/neethi/src/libneethi.la \
+ $(top_builddir)/neethi/src/libneethi.la \
-lpthread \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la \
- $(LIBXML2_LIBS) \
- -L$(top_builddir)$(GUTHTHILA_LIBS)
+ $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la
test_client_LDADD = \
../../../util/src/libaxutil.la \
@@ -25,20 +23,16 @@
$(top_builddir)/neethi/src/libneethi.la \
-lpthread \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la \
- $(LIBXML2_LIBS) \
- -L$(top_builddir)$(GUTHTHILA_LIBS)
+ $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la
test_svc_client_handler_count_LDADD = \
../../../util/src/libaxutil.la \
../../../axiom/src/om/libaxis2_axiom.la \
../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(top_builddir)/neethi/src/libneethi.la \
+ $(top_builddir)/neethi/src/libneethi.la \
-lpthread \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la \
- $(LIBXML2_LIBS) \
- -L$(top_builddir)$(GUTHTHILA_LIBS)
+ $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la
INCLUDES = -I${CUTEST_HOME}/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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Sun Jun 8 19:39:48 2008
@@ -11,9 +11,7 @@
../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
- $(top_builddir)/neethi/src/libneethi.la \
- -L$(top_builddir)$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(top_builddir)/neethi/src/libneethi.la
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/src/xml/guththila/src \
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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Sun Jun 8 19:39:48 2008
@@ -8,12 +8,10 @@
../../../util/src/libaxutil.la \
../../../axiom/src/om/libaxis2_axiom.la \
../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
- $(top_builddir)/neethi/src/libneethi.la \
- $(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
- -L$(top_builddir)$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
-
+ $(top_builddir)/neethi/src/libneethi.la \
+ $(top_builddir)/src/core/engine/libaxis2_engine.la \
+ $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/core/description \
-I$(top_builddir)/src/core/context \
@@ -25,4 +23,3 @@
-I ../../../util/include \
-I ../../../axiom/include \
-I ../../../neethi/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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Sun Jun 8 19:39:48 2008
@@ -11,9 +11,8 @@
-lpthread \
$(top_builddir)/neethi/src/libneethi.la \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
- $(LIBXML2_LIBS)
-
+ $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la
+
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/src/core/description \
-I$(top_builddir)/src/core/context \
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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Sun Jun 8 19:39:48 2008
@@ -12,9 +12,7 @@
../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
- $(top_builddir)/neethi/src/libneethi.la \
- -L$(top_builddir)$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(top_builddir)/neethi/src/libneethi.la
INCLUDES = -I$(top_builddir)/src/xml/guththila \
-I$(top_builddir)/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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/Makefile.am Sun Jun 8 19:39:48 2008
@@ -9,13 +9,11 @@
$(LDFLAGS) \
../../../../util/src/libaxutil.la \
../../../../axiom/src/om/libaxis2_axiom.la \
- $(top_builddir)/neethi/src/libneethi.la \
+ $(top_builddir)/neethi/src/libneethi.la \
../../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
$(top_builddir)/src/core/engine/libaxis2_engine.la \
- $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la \
- $(LIBXML2_LIBS) \
- -L$(top_builddir)$(GUTHTHILA_LIBS)
-
+ $(top_builddir)/src/core/transport/http/sender/libaxis2_http_sender.la
+
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
-I ../../../../util/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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am Sun Jun 8 19:39:48 2008
@@ -8,9 +8,7 @@
$(top_builddir)/src/core/engine/libaxis2_engine.la \
$(top_builddir)//src/core/transport/http/sender/libaxis2_http_sender.la \
$(top_builddir)/src/core/transport/http/receiver/libaxis2_http_receiver.la \
- $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
- -L$(top_builddir)/$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/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?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am Sun Jun 8 19:39:48 2008
@@ -7,9 +7,7 @@
../../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
- $(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la \
- -L$(top_builddir)/$(GUTHTHILA_LIBS) \
- $(LIBXML2_LIBS)
+ $(top_builddir)/modules/core/transport/http/receiver/libaxis2_http_receiver.la
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
Modified: webservices/axis2/trunk/c/tools/md5/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/md5/configure.ac?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/tools/md5/configure.ac (original)
+++ webservices/axis2/trunk/c/tools/md5/configure.ac Sun Jun 8 19:39:48 2008
@@ -40,42 +40,6 @@
AC_CHECK_LIB(z, inflate)
dnl AC_CHECK_LIB(cutest, CuTestInit)
-AC_MSG_CHECKING(whether to build libxml2 xml parser library)
-AC_ARG_ENABLE(libxml2, [ --enable-libxml2 build libxml2 xml parser library wrapper. default=yes],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- WRAPPER_DIR=""
- ;;
- *)
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="libxml2"
-
- ;;
- esac ],
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="libxml2"
-)
-
-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
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="guththila"
- if test -d $srcdir/guththila; then
- AC_CONFIG_SUBDIRS(guththila)
- fi
-
- GUTHTHILA_DIR="guththila"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AC_MSG_CHECKING(whether to build tests)
AC_ARG_ENABLE(tests,
Modified: webservices/axis2/trunk/c/tools/tcpmon/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/configure.ac?rev=664606&r1=664605&r2=664606&view=diff
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/configure.ac (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/configure.ac Sun Jun 8 19:39:48 2008
@@ -40,42 +40,6 @@
AC_CHECK_LIB(z, inflate)
dnl AC_CHECK_LIB(cutest, CuTestInit)
-AC_MSG_CHECKING(whether to build libxml2 xml parser library)
-AC_ARG_ENABLE(libxml2, [ --enable-libxml2 build libxml2 xml parser library wrapper. default=yes],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- WRAPPER_DIR=""
- ;;
- *)
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="libxml2"
-
- ;;
- esac ],
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="libxml2"
-)
-
-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
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="guththila"
- if test -d $srcdir/guththila; then
- AC_CONFIG_SUBDIRS(guththila)
- fi
-
- GUTHTHILA_DIR="guththila"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AC_MSG_CHECKING(whether to build tests)
AC_ARG_ENABLE(tests,