Author: pini
Date: Mon Jun 11 04:56:40 2007
New Revision: 546110
URL: http://svn.apache.org/viewvc?view=rev&rev=546110
Log:
Fixed build break
Modified:
webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
webservices/rampart/trunk/c/samples/build.sh
webservices/rampart/trunk/c/samples/callback/Makefile.am
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am
webservices/rampart/trunk/c/samples/configure.ac
webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
Modified: webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/authn_provider/Makefile.am?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/authn_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/authn_provider/Makefile.am Mon Jun 11
04:56:40 2007
@@ -4,4 +4,5 @@
libauthn_la_LIBADD = ../../src/util/librampart_util.la \
../../src/omxmlsec/openssl/libomopenssl.la
INCLUDES = -I ../../include\
- -I$(AXIS2C_HOME)/include/axis2-1.0
+ @AXIS2INC@
+
Modified: webservices/rampart/trunk/c/samples/build.sh
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/build.sh?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/build.sh (original)
+++ webservices/rampart/trunk/c/samples/build.sh Mon Jun 11 04:56:40 2007
@@ -1,6 +1,6 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=${AXIS2C_HOME} --enable-static=no
+./configure --prefix=${AXIS2C_HOME} --enable-static=no
--with-axis2=${AXIS2C_HOME}/include/axis2-1.1
make
make install
cd client/sec_echo
Modified: webservices/rampart/trunk/c/samples/callback/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/Makefile.am?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/callback/Makefile.am Mon Jun 11
04:56:40 2007
@@ -4,4 +4,4 @@
libpwcb_la_SOURCES = pwcb.c
libpwcb_la_LIBADD =
INCLUDES = -I ../../include\
- -I$(AXIS2C_HOME)/include/axis2-1.0
+ @AXIS2INC@
Modified:
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
Mon Jun 11 04:56:40 2007
@@ -5,4 +5,4 @@
libhtpwcb_la_LIBADD =
INCLUDES = -I ../../../include \
- -I$(AXIS2C_HOME)/include/axis2-1.0
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am Mon Jun 11
04:56:40 2007
@@ -20,10 +20,8 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
+INCLUDES = @AXIS2INC@ \
-I$(AXIS2C_HOME)/include/neethi-0.1 \
- -I ../../../include \
- @UTILINC@ \
- @AXIOMINC@
+ -I ../../../include
EXTRA_DIST = README.txt
Modified: webservices/rampart/trunk/c/samples/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/configure.ac?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/configure.ac (original)
+++ webservices/rampart/trunk/c/samples/configure.ac Mon Jun 11 04:56:40 2007
@@ -66,12 +66,38 @@
AC_FUNC_REALLOC
#AC_CHECK_FUNCS([memmove])
+AC_MSG_CHECKING(To Use Axis2 C . This is a compulsory module to build Axis2 C
samples)
+AC_ARG_WITH(axis2,
+[ --with-axis2[=PATH] Find the AXIS2 header files in 'PATH'.
+ 'PATH' should point to AXIS2 include files location.
+ If you omit the '=PATH' part completely, the configure script will search
+ '$(AXIS2C_HOME)/include/axis2-1.1' for AXIS2 headers.],
+[ 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
+ axis2inc="-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/axis2-1.1"
+ else
+ AC_MSG_ERROR(could not find axis2. stop)
+ fi
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
-AXIOMINC=$axiominc
+
+AXIS2INC=$axis2inc
UTILINC=$axis2_utilinc
XMLSCHEMAINC=$axis2_xml_schemainc
-AC_SUBST(AXIOMINC)
+AC_SUBST(AXIS2INC)
AC_SUBST(UTILINC)
AC_SUBST(XMLSCHEMAINC)
AC_SUBST(TESTDIR)
@@ -88,9 +114,6 @@
client/Makefile
client/sec_echo/Makefile \
client/sec_echo/data/Makefile \
- omxmlsec/Makefile \
- omxmlsec/xmlsig/Makefile \
- omxmlsec/xmlenc/Makefile \
keys/Makefile \
keys/ahome/Makefile \
keys/bhome/Makefile \
Modified: webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/credential_provider/Makefile.am?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/credential_provider/Makefile.am Mon Jun
11 04:56:40 2007
@@ -4,4 +4,4 @@
libcredential_la_LIBADD = ../../src/util/librampart_util.la \
../../src/omxmlsec/openssl/libomopenssl.la
INCLUDES = -I ../../include\
- -I$(AXIS2C_HOME)/include/axis2-1.0
+ @AXIS2INC@
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am?view=diff&rev=546110&r1=546109&r2=546110
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am Mon Jun 11
04:56:40 2007
@@ -8,6 +8,4 @@
SUBDIRS =
libsec_echo_la_SOURCES = echo.c echo_skeleton.c
libsec_echo_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
- @UTILINC@ \
- @AXIOMINC@
+INCLUDES = @AXIS2INC@
