You are viewing a plain text version of this content. The canonical link for it is here.
Posted to savan-dev@ws.apache.org by pi...@apache.org on 2007/06/21 04:03:28 UTC
svn commit: r549325 - in /webservices/savan/trunk/c: ./
samples/client/subscriber/ samples/server/listener/
samples/server/publisher/ src/client/ src/core/ src/handlers/
src/msgreceivers/ src/subscribers/ src/util/
Author: pini
Date: Wed Jun 20 19:03:27 2007
New Revision: 549325
URL: http://svn.apache.org/viewvc?view=rev&rev=549325
Log:
Removed hard coded paths from build system
Modified:
webservices/savan/trunk/c/build.sh
webservices/savan/trunk/c/configure.ac
webservices/savan/trunk/c/samples/client/subscriber/Makefile.am
webservices/savan/trunk/c/samples/server/listener/Makefile.am
webservices/savan/trunk/c/samples/server/publisher/Makefile.am
webservices/savan/trunk/c/src/client/Makefile.am
webservices/savan/trunk/c/src/core/Makefile.am
webservices/savan/trunk/c/src/handlers/Makefile.am
webservices/savan/trunk/c/src/msgreceivers/Makefile.am
webservices/savan/trunk/c/src/subscribers/Makefile.am
webservices/savan/trunk/c/src/util/Makefile.am
Modified: webservices/savan/trunk/c/build.sh
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/build.sh?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/build.sh (original)
+++ webservices/savan/trunk/c/build.sh Wed Jun 20 19:03:27 2007
@@ -1,4 +1,4 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2_util=${AXIS2C_HOME}/include/axis2-1.1 --with-axiom=${AXIS2C_HOME}/include/axis2-1.1
+./configure --prefix=${AXIS2C_HOME} --enable-static=no --with-axis2=${AXIS2C_HOME}/include/axis2-1.1
make
Modified: webservices/savan/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/configure.ac?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/configure.ac (original)
+++ webservices/savan/trunk/c/configure.ac Wed Jun 20 19:03:27 2007
@@ -22,7 +22,7 @@
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Werror -Wall -Wno-implicit-function-declaration"
+ CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration"
#CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
fi
LDFLAGS="-lpthread"
@@ -39,59 +39,42 @@
dnl AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
-AC_MSG_CHECKING(To Use Axis2 C AXIOM. This is a compulsory module to build Axis2 C)
-AC_ARG_WITH(axiom,
-[ --with-axiom[=PATH] use axiom.],
+AC_MSG_CHECKING(path to use Axis2C . This is a compulsory to build Sandesha2C)
+AC_ARG_WITH(axis2,
+[ --with-axis2[=PATH] use axis2c.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
;;
*)
- AC_MSG_RESULT(yes)
- dnl Find axiom include dir in the path
+ AC_MSG_RESULT($withval)
+ dnl Find axis2 include dir in the path
if test -d $withval; then
- axiominc="-I$withval"
- dnl else find the axiom include dir in $(AXIS2C_HOME)/include
+ axis2inc="-I$withval"
+ dnl else find the axis2inc include dir in $(AXIS2C_HOME)/include
elif test -d '$(AXIS2C_HOME)/include'; then
- axiominc="-I$(AXIS2C_HOME)/include"
+ axis2inc="-I$(AXIS2C_HOME)/include/axis2-1.1"
else
- AC_MSG_ERROR(could not find axiom. stop)
+ AC_MSG_ERROR(could not find axis2inc. stop)
fi
;;
esac ],
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/include'; then
- axis2_utilinc="-I./axis2c/include"
- else
- AC_MSG_ERROR(could not find axis2_util. stop)
- fi
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
+
AC_MSG_CHECKING(To Use Xml Schema. This is a compulsory module to build Woden C)
-AXIOMINC=$axiominc
-UTILINC=$axis2_utilinc
+AXIS2INC=$axis2inc
+AXIOMINC=$axis2inc/../axiom/include
+UTILINC=$axis2inc/../util/include
+NEETHIINC=$axis2inc/../neethi/include
+AC_SUBST(AXIS2INC)
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
+AC_SUBST(NEETHIINC)
AC_SUBST(XMLSCHEMAINC)
AC_CONFIG_FILES([Makefile \
Modified: webservices/savan/trunk/c/samples/client/subscriber/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/client/subscriber/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/samples/client/subscriber/Makefile.am (original)
+++ webservices/savan/trunk/c/samples/client/subscriber/Makefile.am Wed Jun 20 19:03:27 2007
@@ -19,8 +19,6 @@
INCLUDES = -I$(AXIS2C_HOME)/include \
@AXIOMINC@ \
@UTILINC@ \
- -I ../../../../axis2c/include \
- -I ../../../../axis2c/axiom/include \
- -I ../../../../axis2c/util/include \
- -I ../../../../axis2c/neethi/include \
+ @AXIS2INC@ \
+ @NEETHIINC@ \
-I../../../include
Modified: webservices/savan/trunk/c/samples/server/listener/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/server/listener/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/samples/server/listener/Makefile.am (original)
+++ webservices/savan/trunk/c/samples/server/listener/Makefile.am Wed Jun 20 19:03:27 2007
@@ -7,10 +7,9 @@
liblistener_la_SOURCES = listener.c listener_skeleton.c
liblistener_la_LIBADD =
INCLUDES = -I$(AXIS2C_HOME)/include \
- -I ../../../../axis2c/include \
@AXIOMINC@ \
- -I ../../../../axis2c/axiom/include \
- -I ../../../../axis2c/util/include \
- -I ../../../../axis2c/neethi/include
+ @AXIS2INC@ \
+ @UTILINC@ \
+ @NEETHIINC@
EXTRA_DIST=services.xml
Modified: webservices/savan/trunk/c/samples/server/publisher/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/server/publisher/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/samples/server/publisher/Makefile.am (original)
+++ webservices/savan/trunk/c/samples/server/publisher/Makefile.am Wed Jun 20 19:03:27 2007
@@ -12,9 +12,8 @@
INCLUDES = -I$(AXIS2C_HOME)/include \
-I$(top_builddir)/include \
@AXIOMINC@ \
- -I ../../../../axis2c/include \
- -I ../../../../axis2c/axiom/include \
- -I ../../../../axis2c/util/include \
- -I ../../../../axis2c/neethi/include
+ @AXIS2INC@ \
+ @UTILINC@ \
+ @NEETHIINC@
EXTRA_DIST=services.xml
Modified: webservices/savan/trunk/c/src/client/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/src/client/Makefile.am (original)
+++ webservices/savan/trunk/c/src/client/Makefile.am Wed Jun 20 19:03:27 2007
@@ -6,7 +6,7 @@
../util/libsavan_util.la
INCLUDES = -I$(top_builddir)/include \
- -I ../../../axis2c/util/include \
- -I ../../../axis2c/axiom/include \
- -I ../../../axis2c/neethi/include \
- -I ../../../axis2c/include
+ @AXIS2INC@ \
+ @UTILINC@ \
+ @AXIOMINC@ \
+ @NEETHIINC@
Modified: webservices/savan/trunk/c/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/src/core/Makefile.am (original)
+++ webservices/savan/trunk/c/src/core/Makefile.am Wed Jun 20 19:03:27 2007
@@ -5,10 +5,9 @@
libmod_savan_la_SOURCES = mod_savan.c savan_sub_processor.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../axis2c/include \
@AXIOMINC@ \
- -I ../../../axis2c/axiom/include \
- -I ../../../axis2c/util/include
+ @UTILINC@ \
+ @AXIS2INC@
libmod_savan_la_LIBADD = ../client/libsavan_client.la\
../handlers/libsavan_handlers.la\
Modified: webservices/savan/trunk/c/src/handlers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/handlers/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/src/handlers/Makefile.am (original)
+++ webservices/savan/trunk/c/src/handlers/Makefile.am Wed Jun 20 19:03:27 2007
@@ -4,7 +4,6 @@
savan_out_handler.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../axis2c/include \
- -I ../../../axis2c/axiom/include \
- @AXIOMINC@ \
- -I ../../../axis2c/util/include
+ @AXIS2INC@ \
+ @UTILINC@ \
+ @AXIOMINC@
Modified: webservices/savan/trunk/c/src/msgreceivers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/msgreceivers/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/src/msgreceivers/Makefile.am (original)
+++ webservices/savan/trunk/c/src/msgreceivers/Makefile.am Wed Jun 20 19:03:27 2007
@@ -3,7 +3,6 @@
libsavan_msgreceivers_la_SOURCES = savan_msg_recv.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../axis2c/include \
+ @AXIS2INC@ \
@AXIOMINC@ \
- -I ../../../axis2c/axiom/include \
- -I ../../../axis2c/util/include
+ @UTILINC@
Modified: webservices/savan/trunk/c/src/subscribers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subscribers/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/src/subscribers/Makefile.am (original)
+++ webservices/savan/trunk/c/src/subscribers/Makefile.am Wed Jun 20 19:03:27 2007
@@ -3,8 +3,7 @@
libsavan_subscribers_la_SOURCES = savan_subscriber.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../axis2c/include \
@AXIOMINC@ \
- -I ../../../axis2c/axiom/include \
- -I ../../../axis2c/util/include \
- -I ../../../axis2c/neethi/include
+ @UTILINC@ \
+ @NEETHIINC@ \
+ @AXIS2INC@
Modified: webservices/savan/trunk/c/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/Makefile.am?view=diff&rev=549325&r1=549324&r2=549325
==============================================================================
--- webservices/savan/trunk/c/src/util/Makefile.am (original)
+++ webservices/savan/trunk/c/src/util/Makefile.am Wed Jun 20 19:03:27 2007
@@ -3,8 +3,7 @@
libsavan_util_la_SOURCES = savan_util.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../axis2c/include \
@AXIOMINC@ \
- -I ../../../axis2c/axiom/include \
- -I ../../../axis2c/util/include \
- -I ../../../axis2c/neethi/include
+ @AXIS2INC@ \
+ @UTILINC@ \
+ @NEETHIINC@