Date: Friday, March 16, 2007 @ 16:37:54
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.32 -> 1.33) include/CarobCommon.hpp (1.5 -> 1.6)
include/CarobMySQL.hpp (1.43 -> 1.44) include/CarobStmt.hpp
(1.12 -> 1.13) include/HostTokenizer.hpp (1.2 -> 1.3)
src/CarobCommon.cpp (1.14 -> 1.15) src/CarobMySQL.cpp (1.100 ->
1.101) src/CarobStmt.cpp (1.46 -> 1.47) src/MySQLAPI.cpp (1.68
-> 1.69) src/Utils.cpp (1.48 -> 1.49)
Now including carob headers with a carob subdir: #include <carob/Connection.hpp>
---------------------------+
configure.ac | 6 +++---
include/CarobCommon.hpp | 4 ++--
include/CarobMySQL.hpp | 8 ++++----
include/CarobStmt.hpp | 4 ++--
include/HostTokenizer.hpp | 2 +-
src/CarobCommon.cpp | 2 +-
src/CarobMySQL.cpp | 4 ++--
src/CarobStmt.cpp | 6 +++---
src/MySQLAPI.cpp | 6 +++---
src/Utils.cpp | 6 +++---
10 files changed, 24 insertions(+), 24 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.32 libmysequoia/configure.ac:1.33
--- libmysequoia/configure.ac:1.32 Thu Mar 15 19:11:50 2007
+++ libmysequoia/configure.ac Fri Mar 16 16:37:54 2007
@@ -104,14 +104,14 @@
# Check for Carob headers and library
AC_MSG_CHECKING([for Carob])
-carob_header_dir="/usr/include/carob"
+carob_header_dir="/usr/include"
AC_ARG_WITH(carob-headers,
[ --with-carob-headers=DIR Carob header files directory.],
[
carob_header_dir="$withval"
]
)
-if test -f "$carob_header_dir/ConnectionParameters.hpp"
+if test -f "$carob_header_dir/carob/ConnectionParameters.hpp"
then : # OK
else
AC_MSG_ERROR([You need to install the Carob development package or use
--with-carob-headers=DIR if the headers are in an unusual place.])
@@ -139,7 +139,7 @@
save_LIBS="$LIBS"
CXXFLAGS="-I$carob_header_dir"
LIBS="-L$carob_lib_dir -lcarob -lpthread -llog4cxx"
-AC_TRY_LINK([#include <ConnectionParameters.hpp>],
+AC_TRY_LINK([#include <carob/ConnectionParameters.hpp>],
[using namespace CarobNS; ControllerInfo ci; ],
,AC_MSG_ERROR([You need to install the Carob development
packages or use --with-carob-lib=DIR if the library is in an unusual place.]))
CXXFLAGS="$save_CXXFLAGS"
Index: libmysequoia/include/CarobCommon.hpp
diff -u libmysequoia/include/CarobCommon.hpp:1.5
libmysequoia/include/CarobCommon.hpp:1.6
--- libmysequoia/include/CarobCommon.hpp:1.5 Tue Apr 18 11:50:34 2006
+++ libmysequoia/include/CarobCommon.hpp Fri Mar 16 16:37:54 2007
@@ -26,8 +26,8 @@
#include <mysql_wrapper.h>
// carob includes
-#include <ResultSetMetaData.hpp>
-#include <CarobException.hpp>
+#include <carob/ResultSetMetaData.hpp>
+#include <carob/CarobException.hpp>
// include log4cxx header files.
#include <log4cxx/logger.h>
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.43
libmysequoia/include/CarobMySQL.hpp:1.44
--- libmysequoia/include/CarobMySQL.hpp:1.43 Fri Jan 26 06:31:47 2007
+++ libmysequoia/include/CarobMySQL.hpp Fri Mar 16 16:37:54 2007
@@ -31,10 +31,10 @@
#include <mysql_wrapper.h>
/* Carob includes */
-#include <ConnectionParameters.hpp>
-#include <Connection.hpp>
-#include <DriverResultSet.hpp>
-#include <Statement.hpp>
+#include <carob/ConnectionParameters.hpp>
+#include <carob/Connection.hpp>
+#include <carob/DriverResultSet.hpp>
+#include <carob/Statement.hpp>
#include <string>
#include <vector>
Index: libmysequoia/include/CarobStmt.hpp
diff -u libmysequoia/include/CarobStmt.hpp:1.12
libmysequoia/include/CarobStmt.hpp:1.13
--- libmysequoia/include/CarobStmt.hpp:1.12 Tue Aug 1 18:16:21 2006
+++ libmysequoia/include/CarobStmt.hpp Fri Mar 16 16:37:54 2007
@@ -28,8 +28,8 @@
#include <mysql_wrapper.h>
//Carob includes
-#include <ParameterStatement.hpp>
-#include <DriverResultSet.hpp>
+#include <carob/ParameterStatement.hpp>
+#include <carob/DriverResultSet.hpp>
class CarobStmt : public CarobCommon
{
Index: libmysequoia/include/HostTokenizer.hpp
diff -u libmysequoia/include/HostTokenizer.hpp:1.2
libmysequoia/include/HostTokenizer.hpp:1.3
--- libmysequoia/include/HostTokenizer.hpp:1.2 Wed May 24 12:23:55 2006
+++ libmysequoia/include/HostTokenizer.hpp Fri Mar 16 16:37:54 2007
@@ -26,7 +26,7 @@
#include <vector>
//Carob includes
-#include <ConnectionParameters.hpp>
+#include <carob/ConnectionParameters.hpp>
typedef struct {
std::string host;
Index: libmysequoia/src/CarobCommon.cpp
diff -u libmysequoia/src/CarobCommon.cpp:1.14
libmysequoia/src/CarobCommon.cpp:1.15
--- libmysequoia/src/CarobCommon.cpp:1.14 Fri Jan 19 11:34:35 2007
+++ libmysequoia/src/CarobCommon.cpp Fri Mar 16 16:37:54 2007
@@ -22,7 +22,7 @@
#include <CarobCommon.hpp>
#include <Utils.hpp>
-#include <TypeConstants.hpp>
+#include <carob/TypeConstants.hpp>
/* MySQL include */
#include <errmsg.h>
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.100
libmysequoia/src/CarobMySQL.cpp:1.101
--- libmysequoia/src/CarobMySQL.cpp:1.100 Tue Jan 30 11:39:25 2007
+++ libmysequoia/src/CarobMySQL.cpp Fri Mar 16 16:37:54 2007
@@ -26,8 +26,8 @@
#include <HostTokenizer.hpp>
/* Carob include */
-#include <StringCodecs.hpp>
-#include <ResultSetMetaData.hpp>
+#include <carob/StringCodecs.hpp>
+#include <carob/ResultSetMetaData.hpp>
/* MySQL include */
#include <errmsg.h>
Index: libmysequoia/src/CarobStmt.cpp
diff -u libmysequoia/src/CarobStmt.cpp:1.46 libmysequoia/src/CarobStmt.cpp:1.47
--- libmysequoia/src/CarobStmt.cpp:1.46 Wed Jan 17 13:39:45 2007
+++ libmysequoia/src/CarobStmt.cpp Fri Mar 16 16:37:54 2007
@@ -26,9 +26,9 @@
//Carob includes
#include <CarobStmt.hpp>
-#include <Common.hpp>
-#include <StringCodecs.hpp>
-#include <TypeConstants.hpp>
+#include <carob/Common.hpp>
+#include <carob/StringCodecs.hpp>
+#include <carob/TypeConstants.hpp>
//MySQL includes
#include <mysql_wrapper.h>
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.68 libmysequoia/src/MySQLAPI.cpp:1.69
--- libmysequoia/src/MySQLAPI.cpp:1.68 Fri Mar 16 15:22:07 2007
+++ libmysequoia/src/MySQLAPI.cpp Fri Mar 16 16:37:54 2007
@@ -25,8 +25,8 @@
#include <Utils.hpp>
/* Carob include */
-#include <Common.hpp>
-#include <CarobVersion.hpp>
+#include <carob/Common.hpp>
+#include <carob/CarobVersion.hpp>
/* MySQL include */
#include <mysql_wrapper.h>
@@ -192,7 +192,7 @@
LOG4CXX_DEBUG(logger, "Entering mysql_server_init: argc=" << argc << "
argv=" << argv << " groups=" << groups);
- // Not a real a warning, but we really want this printed
+ // Not a real warning, but we really want this printed
LOG4CXX_WARN(logger, "compiled with Carob version " TOSTRING(CAROB_VERSION));
CarobNS::setLogLevel(CarobNS::LOG_LEVEL_OFF); // See LMS-39
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.48 libmysequoia/src/Utils.cpp:1.49
--- libmysequoia/src/Utils.cpp:1.48 Fri Jan 19 11:34:35 2007
+++ libmysequoia/src/Utils.cpp Fri Mar 16 16:37:54 2007
@@ -20,9 +20,9 @@
*/
//Carob includes
-#include <Common.hpp>
-#include <TypeConstants.hpp>
-#include <StringCodecs.hpp>
+#include <carob/Common.hpp>
+#include <carob/TypeConstants.hpp>
+#include <carob/StringCodecs.hpp>
#include <Utils.hpp>
#include <CarobMySQL.hpp>
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
