Author: damitha
Date: Wed Apr 25 01:33:09 2007
New Revision: 532253
URL: http://svn.apache.org/viewvc?view=rev&rev=532253
Log:
changed configure.ac so that --with-sql or --with-mysql is selected in
configuration. default is mysql
Added:
webservices/sandesha/trunk/c/include/sandesha2_permanent_storage_mgr.h
- copied unchanged from r532224,
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_storage_mgr.h
Removed:
webservices/sandesha/trunk/c/src/storage/mysql/sandesha2_permanent_storage_mgr.h
Modified:
webservices/sandesha/trunk/c/configure.ac
webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am
webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am
webservices/sandesha/trunk/c/src/util/Makefile.am
Modified: webservices/sandesha/trunk/c/configure.ac
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/configure.ac?view=diff&rev=532253&r1=532252&r2=532253
==============================================================================
--- webservices/sandesha/trunk/c/configure.ac (original)
+++ webservices/sandesha/trunk/c/configure.ac Wed Apr 25 01:33:09 2007
@@ -61,60 +61,70 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(whether to build mysql storage library)
-AC_ARG_ENABLE(mysql, [ --enable-mysql build mysql storage. default=no],
-[ case "${enableval}" in
+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(yes)
- WRAPPER_DIR="mysql"
- #PKG_CHECK_MODULES(PARSER, libmysqlclient)
- if test -d $srcdir/storage/mysql; then
- CFLAGS="$CFLAGS $STORAGE_CFLAGS"
- LDFLAGS="$LDFLAGS $STORAGE_LIBS"
+ 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
-
- MYSQL_LIBS="$srcdir/storage/mysql"
- WRAPPER_DIR="mysql"
+ MYSQL_LIBS="$srcdir/storage/sqlite"
+ WRAPPER_DIR="sqlite"
;;
esac ],
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT(yes)
+ MYSQL_LIBS="$srcdir/storage/sqlite"
+ WRAPPER_DIR="sqlite"
+ sqliteinc="-I/usr/include"
)
-SQLITE_LIBS=""
-
-AC_MSG_CHECKING(whether to build sqlite storage library)
-AC_ARG_ENABLE(sqlite, [ --enable-sqlite build sqlite storage library.
default=yes],
-[ case "${enableval}" in
+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(yes)
- WRAPPER_DIR="sqlite"
- #PKG_CHECK_MODULES(PARSER, libsqlite3)
- if test -d $srcdir/storage/sqlite; then
- CFLAGS="$CFLAGS $STORAGE_CFLAGS"
- LDFLAGS="$LDFLAGS $STORAGE_LIBS"
+ AC_MSG_RESULT($withval)
+ WRAPPER_DIR="mysql"
+ dnl Find mysql include dir in the path
+ if test -d $withval; then
+ mysqlinc="-I$withval"
+ 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
-
- SQLITE_LIBS="$srcdir/storage/sqlite"
- WRAPPER_DIR="sqlite"
-
+ MYSQL_LIBS="$srcdir/storage/mysql"
+ WRAPPER_DIR="mysql"
;;
esac ],
- AC_MSG_RESULT(yes)
- MYSQL_LIBS="$srcdir/storage/sqlite"
- WRAPPER_DIR="sqlite"
+ AC_MSG_RESULT(no)
)
AXIS2INC=$axis2inc
+MYSQLINC=$mysqlinc
+SQLITEINC=$sqliteinc
AC_SUBST(AXIS2INC)
+AC_SUBST(MYSQLINC)
+AC_SUBST(SQLITEINC)
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
AC_SUBST(WRAPPER_DIR)
Modified: webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am?view=diff&rev=532253&r1=532252&r2=532253
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/mysql/Makefile.am Wed Apr 25
01:33:09 2007
@@ -14,6 +14,6 @@
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@ \
-I. \
- -I/usr/include/mysql
+ @MYSQLINC@
EXTRA_DIST=sandesha2_sqls.h
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am?view=diff&rev=532253&r1=532252&r2=532253
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/Makefile.am Wed Apr 25
01:33:09 2007
@@ -14,5 +14,6 @@
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/sandesha2 \
-I. \
- @AXIS2INC@
+ @AXIS2INC@ \
+ @SQLITEINC@
Modified: webservices/sandesha/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/Makefile.am?view=diff&rev=532253&r1=532252&r2=532253
==============================================================================
--- webservices/sandesha/trunk/c/src/util/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/util/Makefile.am Wed Apr 25 01:33:09 2007
@@ -17,4 +17,5 @@
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@ \
- -I/usr/include/mysql
+ @MYSQLINC@ \
+ @SQLITEINC@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
