You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2008/06/13 11:51:55 UTC
svn commit: r667445 - in /webservices/sandesha/trunk/c: configure.ac
samples/configure.ac src/core/Makefile.am
src/msgprocessors/app_msg_processor.c src/storage/Makefile.am
Author: damitha
Date: Fri Jun 13 02:51:55 2008
New Revision: 667445
URL: http://svn.apache.org/viewvc?rev=667445&view=rev
Log:
Removing mysql and sqlite3 external dependancies
Modified:
webservices/sandesha/trunk/c/configure.ac
webservices/sandesha/trunk/c/samples/configure.ac
webservices/sandesha/trunk/c/src/core/Makefile.am
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/storage/Makefile.am
Modified: webservices/sandesha/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/configure.ac?rev=667445&r1=667444&r2=667445&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/configure.ac (original)
+++ webservices/sandesha/trunk/c/configure.ac Fri Jun 13 02:51:55 2008
@@ -65,66 +65,6 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(path to use sqlite storage .)
-AC_ARG_WITH(sqlite,
-[ --with-sqlite[=PATH] use sqlite storage.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- WRAPPER_DIR=""
- ;;
- *)
- AC_MSG_RESULT($withval)
- WRAPPER_DIR="sqlite"
- dnl Find sqlite include dir in the path
- if test -d $withval; then
- sqliteinc="-I$withval"
- dnl else find the sqliteinc include dir in /usr/include
- elif test -d '/usr/include'; then
- sqliteinc="-I/usr/include"
- else
- AC_MSG_ERROR(could not find sqliteinc. stop)
- fi
- WRAPPER_DIR="sqlite"
- LDFLAGS="$LDFLAGS -lsqlite3"
- ;;
- esac ],
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="sqlite"
- sqliteinc="-I/usr/include"
- LDFLAGS="$LDFLAGS -lsqlite3"
-)
-
-AC_MSG_CHECKING(path to use mysql storage .)
-AC_ARG_WITH(mysql,
-[ --with-mysql[=PATH] use mysql storage.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- WRAPPER_DIR=""
- ;;
- *)
- AC_MSG_RESULT($withval)
- WRAPPER_DIR="mysql"
- dnl Find mysql include dir in the path
- if test -d $withval; then
- mysqlinc="-I$withval"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- dnl else find the mysqlinc include dir in /usr/include/mysql
- elif test -d '/usr/include/mysql'; then
- mysqlinc="-I/usr/include/mysql"
- else
- AC_MSG_ERROR(could not find mysqlinc. stop)
- fi
- WRAPPER_DIR="mysql"
- dnl LDFLAGS="$LDFLAGS -lmysqlclient -lnsl -lm -lz"
- LDFLAGS="$LDFLAGS -lmysqlclient -lm -lz"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-
AXIOMINC="-I$abs_top_builddir/../axis2c/axiom/include"
UTILINC="-I$abs_top_builddir/../axis2c/util/include"
NEETHIINC="-I$abs_top_builddir/../axis2c/neethi/include"
@@ -132,12 +72,6 @@
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
AC_SUBST(NEETHIINC)
-MYSQLINC=$mysqlinc
-SQLITEINC=$sqliteinc
-
-AC_SUBST(MYSQLINC)
-AC_SUBST(SQLITEINC)
-AC_SUBST(WRAPPER_DIR)
AC_CONFIG_FILES([Makefile \
src/Makefile \
@@ -151,7 +85,6 @@
src/storage/beans/Makefile \
src/storage/common/Makefile \
src/storage/sqlite/Makefile \
- src/storage/mysql/Makefile \
src/client/Makefile \
src/core/Makefile \
src/polling/Makefile
Modified: webservices/sandesha/trunk/c/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/samples/configure.ac?rev=667445&r1=667444&r2=667445&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/samples/configure.ac (original)
+++ webservices/sandesha/trunk/c/samples/configure.ac Fri Jun 13 02:51:55 2008
@@ -36,11 +36,6 @@
AC_FUNC_MALLOC
AC_FUNC_REALLOC
-PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
-if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS -g"
-fi
-
AC_MSG_CHECKING(To Use Axis2 C Axis2. This is a compulsory module to build Sandesha2 C)
AC_ARG_WITH(axis2,
[ --with-axis2[=PATH] use axis2.],
@@ -72,12 +67,6 @@
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
AC_SUBST(AXIS2INC)
-AC_SUBST(LIBXML2_CFLAGS)
-AC_SUBST(LIBXML2_LIBS)
-AC_SUBST(LIBXML2_DIR)
-AC_SUBST(GUTHTHILA_DIR)
-AC_SUBST(GUTHTHILA_LIBS)
-AC_SUBST(DICLIENT_DIR)
AC_CONFIG_FILES([Makefile \
RMSampleService/Makefile \
Modified: webservices/sandesha/trunk/c/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/Makefile.am?rev=667445&r1=667444&r2=667445&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/core/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/core/Makefile.am Fri Jun 13 02:51:55 2008
@@ -13,7 +13,7 @@
../msgprocessors/libsandesha2_msgprocessors.la\
../storage/beans/libsandesha2_storage_beans.la\
../storage/common/libsandesha2_storage.la\
- ../storage/${WRAPPER_DIR}/libsandesha2_permanent.la\
+ ../storage/sqlite/libsandesha2_permanent.la\
../transport/libsandesha2_transport.la\
../util/libsandesha_util.la\
../workers/libsandesha2_workers.la\
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?rev=667445&r1=667444&r2=667445&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Fri Jun 13 02:51:55 2008
@@ -825,7 +825,6 @@
long msg_number = -1;
axis2_char_t *dummy_msg_str = NULL;
axis2_bool_t dummy_msg = AXIS2_FALSE;
- axis2_bool_t seq_timed_out = AXIS2_FALSE;
sandesha2_seq_property_bean_t *res_highest_msg_bean = NULL;
axis2_char_t msg_number_str[32];
axis2_bool_t send_create_seq = AXIS2_FALSE;
Modified: webservices/sandesha/trunk/c/src/storage/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/Makefile.am?rev=667445&r1=667444&r2=667445&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/Makefile.am Fri Jun 13 02:51:55 2008
@@ -1,2 +1 @@
-SUBDIRS = beans $(WRAPPER_DIR) common
-EXTRA_DIST=mysql
+SUBDIRS = beans sqlite common
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org