Author: sahan
Date: Thu May 31 22:58:36 2007
New Revision: 543398
URL: http://svn.apache.org/viewvc?view=rev&rev=543398
Log:
Solaris port
Modified:
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/util/Makefile.am
webservices/rampart/trunk/c/test/c14n/Makefile.am
webservices/rampart/trunk/c/test/omxmlsec/Makefile.am
webservices/rampart/trunk/c/test/openssl/rsa/Makefile.am
webservices/rampart/trunk/c/test/openssl/sign/Makefile.am
Modified: webservices/rampart/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/configure.ac?view=diff&rev=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/configure.ac (original)
+++ webservices/rampart/trunk/c/configure.ac Thu May 31 22:58:36 2007
@@ -88,11 +88,39 @@
AC_MSG_RESULT(no)
)
+AC_MSG_CHECKING(path to use openssl . This is a compulsory to build Rampart-C)
+AC_ARG_WITH(openssl,
+[ --with-openssl[=PATH] use openssl.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ ;;
+ *)
+ AC_MSG_RESULT($withval)
+ dnl Find oprnssl dir in the path
+ if test -d $withval; then
+ opensslinc="-I$withval/include"
+ openssllib="-L$withval/lib"
+ elif test -d '/usr/include/openssl'; then
+ opensslinc="-L/usr/include/openssl"
+ openssllib=""
+ else
+ AC_MSG_ERROR(could not find openssl. stop)
+ fi
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AXIS2INC=$axis2inc
AXIOMINC=$axiominc
+OPENSSLINC=$opensslinc
+OPENSSLLIB=$openssllib
UTILINC=$axis2_utilinc
AC_SUBST(AXIS2INC)
AC_SUBST(AXIOMINC)
+AC_SUBST(OPENSSLINC)
+AC_SUBST(OPENSSLLIB)
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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/core/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/core/Makefile.am Thu May 31 22:58:36 2007
@@ -8,11 +8,15 @@
libmod_rampart_la_LIBADD = ../handlers/librampart_handlers.la \
../util/librampart_util.la \
../omxmlsec/libomxmlsec.la \
- ${AXIS2C_HOME}/lib
+ ${AXIS2C_HOME}/lib \
+ @OPENSSLLIB@ \
+ -lcrypto
+
INCLUDES = -I$(top_builddir)/include \
-I$(AXIS2C_HOME)/include/neethi-0.1 \
-I ../../include \
+ @OPENSSLINC@ \
@AXIS2INC@ \
@UTILINC@ \
@AXIOMINC@
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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/handlers/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/handlers/Makefile.am Thu May 31 22:58:36
2007
@@ -6,7 +6,7 @@
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
-I $(AXIS2C_HOME)/include/neethi-0.1 \
+ @OPENSSLINC@ \
@AXIOMINC@ \
@UTILINC@ \
- @NEETHIINC@ \
@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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/Makefile.am Thu May 31 22:58:36
2007
@@ -8,7 +8,8 @@
xml_key_info_builder.c
-libomxmlsec_la_LIBADD = -lssl\
+libomxmlsec_la_LIBADD = @OPENSSLLIB@ \
+ -lssl \
${AXIS2C_HOME}/lib \
tokens/liboxstokens.la \
openssl/libomopenssl.la \
@@ -17,6 +18,7 @@
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
+ @OPENSSLINC@ \
@UTILINC@ \
@AXIOMINC@ \
@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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/c14n/Makefile.am Thu May 31
22:58:36 2007
@@ -8,6 +8,7 @@
liboxsc14n_la_LIBADD = ${AXIS2C_HOME}/lib
INCLUDES = -I ../../../include \
+ @OPENSSLINC@ \
@UTILINC@ \
@AXIOMINC@ \
@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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/Makefile.am Thu May 31
22:58:36 2007
@@ -9,6 +9,7 @@
-I ../../../../util/include \
-I ../../../../include \
-I ../../../../axiom/include \
+ @OPENSSLINC@ \
@UTILINC@ \
@AXIOMINC@ \
@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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/tokens/Makefile.am Thu May 31
22:58:36 2007
@@ -16,6 +16,7 @@
-I ../../../../util/include \
-I ../../../../include \
-I ../../../../axiom/include \
+ @OPENSSLINC@ \
@UTILINC@ \
@AXIOMINC@ \
@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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Thu May 31 22:58:36 2007
@@ -10,13 +10,14 @@
librampart_util_la_LIBADD = -lssl \
- -lcrypto \
- ${AXIS2C_HOME}/lib
+ -lcrypto \
+ ${AXIS2C_HOME}/lib\
+ @OPENSSLLIB@
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
-I $(AXIS2C_HOME)/include/neethi-0.1 \
+ @OPENSSLINC@ \
@AXIOMINC@ \
@UTILINC@ \
- @NEETHIINC@ \
@AXIS2INC@
Modified: webservices/rampart/trunk/c/test/c14n/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/c14n/Makefile.am?view=diff&rev=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/test/c14n/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/c14n/Makefile.am Thu May 31 22:58:36 2007
@@ -6,6 +6,7 @@
test_c14n_SOURCES = test.c
INCLUDES = -I$(top_builddir)/include \
+ @OPENSSLINC@ \
@AXIS2INC@ \
@UTILINC@ \
@AXIOMINC@
@@ -13,4 +14,5 @@
test_c14n_LDADD = ${AXIS2C_HOME}/lib/libaxutil.la \
${AXIS2C_HOME}/lib/libaxis2_axiom.la \
${AXIS2C_HOME}/lib/libaxis2_libxml2.la \
-
$(top_builddir)/src/omxmlsec/c14n/liboxsc14n.la
+
$(top_builddir)/src/omxmlsec/c14n/liboxsc14n.la \
+ @OPENSSLLIB@
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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/test/omxmlsec/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/omxmlsec/Makefile.am Thu May 31 22:58:36
2007
@@ -7,6 +7,7 @@
INCLUDES = -I$(top_builddir)/include \
-I ../../include \
+ @OPENSSLINC@ \
@AXIS2INC@ \
@UTILINC@ \
@AXIOMINC@
@@ -18,4 +19,5 @@
${AXIS2C_HOME}/lib/libaxutil.la \
${AXIS2C_HOME}/lib/libaxis2_axiom.la \
${AXIS2C_HOME}/lib/libaxis2_parser.la \
- -lxml2
+ @[EMAIL PROTECTED]
+ -lxml2
Modified: webservices/rampart/trunk/c/test/openssl/rsa/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/test/openssl/rsa/Makefile.am?view=diff&rev=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/test/openssl/rsa/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/openssl/rsa/Makefile.am Thu May 31
22:58:36 2007
@@ -9,12 +9,14 @@
INCLUDES = -I$(top_builddir)/include \
@UTILINC@ \
- @AXIOMINC@
+ @[EMAIL PROTECTED]
+ @OPENSSLINC@
test_LDADD = $(top_builddir)/src/util/librampart_util.la \
$(top_builddir)/src/omxmlsec/libomxmlsec.la \
$(top_builddir)/src/omxmlsec/openssl/libomopenssl.la \
-laxis2_util \
-laxis2_axiom \
+ @[EMAIL PROTECTED]
-laxis2_libxml2 \
-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=543398&r1=543397&r2=543398
==============================================================================
--- webservices/rampart/trunk/c/test/openssl/sign/Makefile.am (original)
+++ webservices/rampart/trunk/c/test/openssl/sign/Makefile.am Thu May 31
22:58:36 2007
@@ -10,6 +10,7 @@
INCLUDES = -I$(top_builddir)/include \
-I ../../../include \
+ @OPENSSLINC@ \
@UTILINC@ \
@AXIOMINC@ \
@AXIS2INC@
@@ -21,5 +22,7 @@
${AXIS2C_HOME}/lib/libaxis2_parser.la \
${AXIS2C_HOME}/lib/libaxis2_axiom.la \
${AXIS2C_HOME}/lib/libaxutil.la \
- -lxml2
+ @[EMAIL PROTECTED]
+ -lxml2 \
+ -lssl
