Author: pini
Date: Mon Mar 26 05:19:22 2007
New Revision: 522493
URL: http://svn.apache.org/viewvc?view=rev&rev=522493
Log:
Changed the build system for new repository
Modified:
webservices/rampart/trunk/c/build.sh
webservices/rampart/trunk/c/configure.ac
webservices/rampart/trunk/c/src/core/Makefile.am
webservices/rampart/trunk/c/src/handlers/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am
webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am
webservices/rampart/trunk/c/src/secpolicy/builder/Makefile.am
webservices/rampart/trunk/c/src/secpolicy/model/Makefile.am
webservices/rampart/trunk/c/src/util/Makefile.am
webservices/rampart/trunk/c/test/omxmlsec/Makefile.am
webservices/rampart/trunk/c/test/openssl/sign/Makefile.am
Modified: webservices/rampart/trunk/c/build.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/build.sh?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/build.sh (original)
+++ webservices/rampart/trunk/c/build.sh Mon Mar 26 05:19:22 2007
@@ -1,5 +1,5 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no
+./configure --prefix=${AXIS2C_HOME}/modules --enable-static=no
--with-axis2=${AXIS2C_HOME}/include
make
-make install
+#make install
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Mon Mar 26 05:19:22 2007
@@ -47,7 +47,7 @@
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS -ansi -Werror -Wall -Wno-implicit-function-declaration"
+ CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
#CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
fi
@@ -65,9 +65,33 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+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($withval)
+ dnl Find axis2 include dir in the path
+ if test -d $withval; then
+ axis2inc="-I$withval"
+ dnl else find the axis2inc include dir in $(AXIS2C_HOME)/include
+ elif test -d '$(AXIS2C_HOME)/include'; then
+ axis2inc="-I$(AXIS2C_HOME)/include"
+ else
+ AC_MSG_ERROR(could not find axis2inc. stop)
+ fi
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
+AXIS2INC=$axis2inc
AXIOMINC=$axiominc
UTILINC=$axis2_utilinc
-
+AC_SUBST(AXIS2INC)
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
AC_SUBST(XMLSCHEMAINC)
Modified: webservices/rampart/trunk/c/src/core/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/core/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/core/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/core/Makefile.am Mon Mar 26 05:19:22 2007
@@ -10,9 +10,8 @@
../omxmlsec/libomxmlsec.la \
../secpolicy/model/librp_model.la \
../secpolicy/builder/librp_builder.la \
- ../../../modules/core/engine/libaxis2_engine.la
+ ${AXIS2C_HOME}/lib
INCLUDES = -I$(top_builddir)/include \
- -I ../../../include \
- -I ../../../util/include \
- -I ../../../axiom/include
+ -I ../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/handlers/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/handlers/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/handlers/Makefile.am Mon Mar 26 05:19:22
2007
@@ -4,6 +4,5 @@
librampart_handlers_la_SOURCES = rampart_out_handler.c\
rampart_in_handler.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../include \
- -I ../../../util/include \
- -I ../../../axiom/include
+ -I ../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/omxmlsec/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/Makefile.am Mon Mar 26 05:19:22
2007
@@ -9,14 +9,12 @@
libomxmlsec_la_LIBADD = -lssl\
- ../../../util/src/libaxis2_util.la \
- ../../../axiom/src/om/libaxis2_axiom.la \
+ ${AXIS2C_HOME}/lib \
tokens/liboxstokens.la \
openssl/libomopenssl.la \
c14n/liboxsc14n.la \
-lcrypto
INCLUDES = -I$(top_builddir)/include \
- -I ../../../include \
- -I ../../../util/include \
- -I ../../../axiom/include
+ -I ../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am Mon Mar 26
05:19:22 2007
@@ -5,11 +5,7 @@
liboxsc14n_la_SOURCES = c14n.c \
sorted_list.c
-liboxsc14n_la_LIBADD = ../../../../util/src/libaxis2_util.la \
-
../../../../axiom/src/om/libaxis2_axiom.la
-
../../../../axiom/src/parser/libxml2/libaxis2_parser.la
+liboxsc14n_la_LIBADD = ${AXIS2C_HOME}/lib
-INCLUDES = -I ../../../../include \
- -I ../../../../util/include \
- -I ../../../../rampart/include \
- -I ../../../../axiom/include
+INCLUDES = -I ../../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am Mon Mar 26
05:19:22 2007
@@ -2,11 +2,11 @@
libomopenssl_la_SOURCES = cipher_ctx.c crypt.c rsa.c pkey.c util.c
cipher_property.c digest.c x509.c pkcs12.c pem.c sign.c
libomopenssl_la_LIBADD = -lssl\
- ../../../../util/src/libaxis2_util.la \
- ../../../../axiom/src/om/libaxis2_axiom.la \
+ ${AXIS2C_HOME}/include \
-lcrypto
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../include \
- -I ../../../../axiom/include
+ -I ../../../../axiom/include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am Mon Mar 26
05:19:22 2007
@@ -10,10 +10,10 @@
token_transform.c
token_transforms.c token_signature.c token_ds_reference.c \
token_x509_certificate.c
-liboxstokens_la_LIBADD =../../../../util/src/libaxis2_util.la \
- ../../../../axiom/src/om/libaxis2_axiom.la
+liboxstokens_la_LIBADD = ${AXIS2C_HOME}/lib
INCLUDES = -I$(top_builddir)/include \
-I ../../../../util/include \
-I ../../../../include \
- -I ../../../../axiom/include
+ -I ../../../../axiom/include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/secpolicy/builder/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/builder/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/secpolicy/builder/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/secpolicy/builder/Makefile.am Mon Mar 26
05:19:22 2007
@@ -10,11 +10,9 @@
wss10_builder.c
wss11_builder.c x509_token_builder.c policy_creator.c
-librp_builder_la_LIBADD = ../../../../util/src/libaxis2_util.la \
-
../../../../axiom/src/om/libaxis2_axiom.la
+librp_builder_la_LIBADD = ${AXIS2C_HOME}/lib
INCLUDES = -I$(top_builddir)/include \
- -I ../../../../include \
- -I ../../../../util/include \
- -I ../../../../axiom/include
+ -I ../../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/secpolicy/model/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/secpolicy/model/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/secpolicy/model/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/secpolicy/model/Makefile.am Mon Mar 26
05:19:22 2007
@@ -9,11 +9,9 @@
symmetric_binding.c
transport_binding.c ut.c wss10.c wss11.c x509_token.c
-librp_model_la_LIBADD = ../../../../util/src/libaxis2_util.la \
-
../../../../axiom/src/om/libaxis2_axiom.la
+librp_model_la_LIBADD = ${AXIS2C_HOME}/lib
INCLUDES = -I$(top_builddir)/include \
- -I ../../../../include \
- -I ../../../../util/include \
- -I ../../../../axiom/include
+ -I ../../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Mon Mar 26 05:19:22 2007
@@ -11,10 +11,8 @@
librampart_util_la_LIBADD = -lssl \
-lcrypto \
-
../../../util/src/libaxis2_util.la
+ ${AXIS2C_HOME}/lib
INCLUDES = -I$(top_builddir)/include \
- -I ../../../include \
- -I ../../../util/include \
- -I ../../../xml_schema/include \
- -I ../../../axiom/include
+ -I ../../include \
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/test/omxmlsec/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/omxmlsec/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/test/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/omxmlsec/Makefile.am Mon Mar 26 05:19:22
2007
@@ -6,15 +6,14 @@
test_oxs_SOURCES = test.c
INCLUDES = -I$(top_builddir)/include \
- -I ../../../include \
- -I ../../../util/include \
- -I ../../../axiom/include
+ -I ../../include \
+ @AXIS2INC@
test_oxs_LDADD = $(top_builddir)/src/util/librampart_util.la \
$(top_builddir)/src/omxmlsec/libomxmlsec.la \
$(top_builddir)/src/omxmlsec/openssl/libomopenssl.la \
$(top_builddir)/src/omxmlsec/tokens/liboxstokens.la \
- ../../../util/src/libaxis2_util.la \
- ../../../axiom/src/om/libaxis2_axiom.la
\
-
../../../axiom/src/parser/libxml2/libaxis2_libxml2.la \
+ ${AXIS2C_HOME}/lib/libaxis2_util.la \
+ ${AXIS2C_HOME}/lib/libaxis2_axiom.la \
+ ${AXIS2C_HOME}/lib/libaxis2_parser.la \
-lxml2
Modified: webservices/rampart/trunk/c/test/openssl/sign/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/openssl/sign/Makefile.am?view=diff&rev=522493&r1=522492&r2=522493
==============================================================================
--- webservices/rampart/trunk/c/test/openssl/sign/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/openssl/sign/Makefile.am Mon Mar 26
05:19:22 2007
@@ -9,15 +9,15 @@
INCLUDES = -I$(top_builddir)/include \
- -I ../../../../include \
- -I ../../../../util/include \
- -I ../../../../axiom/include
+ -I ../../../include \
+ @AXIS2INC@
test_LDADD = $(top_builddir)/src/util/librampart_util.la \
$(top_builddir)/src/omxmlsec/libomxmlsec.la \
$(top_builddir)/src/omxmlsec/openssl/libomopenssl.la \
$(top_builddir)/src/omxmlsec/tokens/liboxstokens.la \
- ../../../../util/src/libaxis2_util.la \
- ../../../../axiom/src/om/libaxis2_axiom.la \
- ../../../../axiom/src/parser/libxml2/libaxis2_libxml2.la \
- -lxml2
+ ${AXIS2C_HOME}/lib/libaxis2_parser.la \
+ ${AXIS2C_HOME}/lib/libaxis2_axiom.la \
+ ${AXIS2C_HOME}/lib/libaxis2_util.la \
+ -lxml2
+
