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/09/28 12:12:36 UTC
svn commit: r450786 - in /webservices/axis2/trunk/c: ./ tools/codegen/
tools/codegen/src/util/ tools/codegen/test/ tools/codegen/test/unit/
tools/codegen/test/unit/codegen/ tools/codegen/test/unit/util/
tools/tcpmon/ tools/tcpmon/src/ tools/tcpmon/test...
Author: pini
Date: Thu Sep 28 03:12:34 2006
New Revision: 450786
URL: http://svn.apache.org/viewvc?view=rev&rev=450786
Log:
Fixed the build break in codegen.
Modified:
webservices/axis2/trunk/c/Makefile.am
webservices/axis2/trunk/c/tools/codegen/configure.ac
webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am
webservices/axis2/trunk/c/tools/codegen/test/Makefile.am
webservices/axis2/trunk/c/tools/codegen/test/unit/Makefile.am
webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/Makefile.am
webservices/axis2/trunk/c/tools/codegen/test/unit/util/Makefile.am
webservices/axis2/trunk/c/tools/tcpmon/configure.ac
webservices/axis2/trunk/c/tools/tcpmon/src/Makefile.am
webservices/axis2/trunk/c/tools/tcpmon/test/unit/Makefile.am
Modified: webservices/axis2/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/Makefile.am (original)
+++ webservices/axis2/trunk/c/Makefile.am Thu Sep 28 03:12:34 2006
@@ -1,14 +1,14 @@
datadir=$(prefix)
logsdir=$(prefix)/logs
docsdir=$(prefix)/docs
-SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules rampart tools/codegen tools/tcpmon $(TESTDIR) include ides
+SUBDIRS = util $(GUTHTHILA_DIR) axiom xml_schema woden modules rampart $(TESTDIR) include ides
include_HEADERS=$(top_builddir)/include/*.h
data_DATA= samples/server/axis2.xml README \
INSTALL CREDITS COPYING NEWS config.guess missing install-sh depcomp config.sub ltmain.sh
logs_DATA=
docs_DATA=docs/*
-EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE samples/server/axis2.log samples build axis2c_build.sh docs guththila
+EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE samples/server/axis2.log samples build axis2c_build.sh docs guththila tools
dist-hook:
rm -rf `find $(distdir)/ -type d -name .svn`
rm -rf `find $(distdir)/ -type d -name .la`
Modified: webservices/axis2/trunk/c/tools/codegen/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/configure.ac?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/configure.ac (original)
+++ webservices/axis2/trunk/c/tools/codegen/configure.ac Thu Sep 28 03:12:34 2006
@@ -78,98 +78,6 @@
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)
-)
-
-AC_MSG_CHECKING(To Use 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 Xml Schema. This is a compulsory module to build Woden C and Codegen)
-AC_ARG_WITH(axis2_xml_schema,
-[ --with-axis2_xml_schema[=PATH] use axis2_xml_schema.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_xml_schema include dir in the path
- if test -d $withval; then
- axis2_xml_schemainc="-I$withval"
- dnl else find the axis2_xml_schema include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_xml_schemainc="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_xml_schema. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(To Use Woden C. This is a compulsory module to build C Codegen)
-AC_ARG_WITH(axis2_woden,
-[ --with-axis2_woden[=PATH] use axis2_woden.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find axis2_woden include dir in the path
- if test -d $withval; then
- axis2_woden="-I$withval"
- dnl else find the axis2_woden include dir in $(AXIS2C_HOME)/include
- elif test -d '$(AXIS2C_HOME)/include'; then
- axis2_woden="-I$(AXIS2C_HOME)/include"
- else
- AC_MSG_ERROR(could not find axis2_woden. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
AC_MSG_CHECKING(whether to build tests)
AC_ARG_ENABLE(tests,
[ --enable-tests build tests. default=no],
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/Makefile.am Thu Sep 28 03:12:34 2006
@@ -31,3 +31,5 @@
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../axiom/include
+
+EXTRA_DIST=codegen-config.properties
Modified: webservices/axis2/trunk/c/tools/codegen/test/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/Makefile.am Thu Sep 28 03:12:34 2006
@@ -1 +1,2 @@
SUBDIRS = unit
+EXTRA_DIST=resources
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/Makefile.am Thu Sep 28 03:12:34 2006
@@ -10,16 +10,18 @@
$(top_builddir)/src/util/libw2c_util.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
-lxslt \
-lxml2
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../xml_schema/include \
+ -I ../../../../../axiom/include
+
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/Makefile.am Thu Sep 28 03:12:34 2006
@@ -7,8 +7,9 @@
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include \
+ -I ../../../../../include
check_PROGRAMS = w2c_codegen_test
prgbin_PROGRAMS = w2c_codegen_test
@@ -17,10 +18,9 @@
$(top_builddir)/src/wsdl/libw2c_codegen.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
-lxslt \
-lxml2
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/util/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/util/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/util/Makefile.am Thu Sep 28 03:12:34 2006
@@ -8,8 +8,9 @@
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../../../util/include \
+ -I ../../../../../axiom/include \
+ -I ../../../../../xml_schema/include
check_PROGRAMS = w2c_util_test
prgbin_PROGRAMS = w2c_util_test
@@ -18,10 +19,10 @@
$(top_builddir)/src/util/libw2c_util.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
- -laxis2_axiom \
- -laxis2_parser \
+ ../../../../../util/src/libaxis2_util.la \
+ ../../../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../../../xml_schema/src/libaxis2_xml_schema.la \
+ ../../../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
-lxslt \
-lxml2
Modified: webservices/axis2/trunk/c/tools/tcpmon/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/configure.ac?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/configure.ac (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/configure.ac Thu Sep 28 03:12:34 2006
@@ -39,30 +39,43 @@
AC_CHECK_LIB(z, inflate)
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)
+ PARSER_DIR=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ PARSER_DIR="libxml2"
-AC_MSG_CHECKING(To Use Axis2/C Util. This is a compulsory module to build TCPMON/C)
-AC_ARG_WITH(axis2_util,
-[ --with-axis2_util[=PATH] use axis2_util.],
-[ case "$withval" in
+ ;;
+ esac ],
+ AC_MSG_RESULT(yes)
+ PARSER_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)
- 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)
+ PARSER_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,
[ --enable-tests build tests. default=no],
@@ -86,6 +99,7 @@
AC_SUBST(UTILINC)
AC_SUBST(TESTDIR)
+AC_SUBST(PARSER_DIR)
CFLAGS="$CFLAGS"
Modified: webservices/axis2/trunk/c/tools/tcpmon/src/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/Makefile.am Thu Sep 28 03:12:34 2006
@@ -11,8 +11,11 @@
$(NULL)
libaxis2_tcpmon_la_LIBADD = \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
+ ../../../util/src/libaxis2_util.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
$(NULL)
prgbin_PROGRAMS = tcpmon
@@ -20,12 +23,15 @@
tcpmon_SOURCES = tcpmon.c
tcpmon_LDADD = \
$(top_builddir)/src/libaxis2_tcpmon.la \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
+ ../../../util/src/libaxis2_util.la \
+ ../../../woden/src/wsdl20/libwoden.la \
+ ../../../axiom/src/om/libaxis2_axiom.la \
+ ../../../axiom/src/parser/$(PARSER_DIR)/libaxis2_parser.la \
+ ../../../xml_schema/src/libaxis2_xml_schema.la \
$(NULL)
INCLUDES = -I$(top_builddir)/include \
- @UTILINC@ \
+ -I ../../../util/include \
$(NULL)
Modified: webservices/axis2/trunk/c/tools/tcpmon/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/test/unit/Makefile.am?view=diff&rev=450786&r1=450785&r2=450786
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/test/unit/Makefile.am Thu Sep 28 03:12:34 2006
@@ -8,12 +8,12 @@
$(top_builddir)/src/libaxis2_tcpmon.la \
-L$(CUTEST_HOME)/lib \
-lcutest \
- -L$(AXIS2C_HOME)/lib \
- -laxis2_util \
+ ../../../../util/src/libaxis2_util.la \
+ ../../../../axiom/src/om/libaxis2_axiom.la \
$(NULL)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/include \
- @UTILINC@ \
+ -I ../../../../util/include \
$(NULL)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org