Date: Thursday, March 22, 2007 @ 19:29:27
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.43 -> 1.44) include/mysql_wrapper.h (1.3 -> 1.4)
src/CarobCommon.cpp (1.15 -> 1.16) src/CarobMySQL.cpp (1.101 ->
1.102) src/CarobStmt.cpp (1.47 -> 1.48) src/Makefile.am (1.17 ->
1.18) src/MySQLAPI.cpp (1.69 -> 1.70) src/Utils.cpp (1.49 ->
1.50) test/Makefile.am (1.14 -> 1.15)
Replaced complex mysql detection by standard AC_CHECK_HEADER. MySQL
#includes are now directory-qualified
-------------------------+
configure.ac | 20 +++-----------------
include/mysql_wrapper.h | 2 +-
src/CarobCommon.cpp | 2 +-
src/CarobMySQL.cpp | 2 +-
src/CarobStmt.cpp | 5 +++--
src/Makefile.am | 2 +-
src/MySQLAPI.cpp | 5 +++--
src/Utils.cpp | 4 ++--
test/Makefile.am | 2 +-
9 files changed, 16 insertions(+), 28 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.43 libmysequoia/configure.ac:1.44
--- libmysequoia/configure.ac:1.43 Thu Mar 22 19:12:27 2007
+++ libmysequoia/configure.ac Thu Mar 22 19:29:27 2007
@@ -142,23 +142,9 @@
# Should probably use http://autoconf-archive.cryp.to/acx_pthread.html
# Check for mysql headers
-AC_MSG_CHECKING([for MySQL headers])
-mysql_header_dir="/usr/include/mysql"
-AC_ARG_WITH(mysql-headers,
- [ --with-mysql-headers=DIR MySQL header files directory.],
- [
- mysql_header_dir="$withval"
- ]
-)
-
-if test -f "$mysql_header_dir/mysql.h"
-then
- MYSQL_CFLAGS="-I$mysql_header_dir"
-else
- AC_MSG_ERROR([You need to install the MySQL development package, or use
--with-mysql-headers=DIR if the headers are in an unusual place.])
-fi
-AC_MSG_RESULT([$mysql_header_dir])
-AC_SUBST(MYSQL_CFLAGS)
+AC_CHECK_HEADER([[mysql/mysql_version.h]], ,
+ [AC_MSG_ERROR([[mysql/mysql_version.h not found. Try to fix
CPPFLAGS, for instance:
+ ./configure CPPFLAGS="... -I/usr/local/include"]])])
AC_DEFUN([SEQUOIA_AC_MYSQL_VERSION_ID_AT_LEAST],
Index: libmysequoia/include/mysql_wrapper.h
diff -u libmysequoia/include/mysql_wrapper.h:1.3
libmysequoia/include/mysql_wrapper.h:1.4
--- libmysequoia/include/mysql_wrapper.h:1.3 Fri Mar 3 10:41:15 2006
+++ libmysequoia/include/mysql_wrapper.h Thu Mar 22 19:29:27 2007
@@ -2,7 +2,7 @@
#define _MYSQL_WRAPPER_H
#define USE_OLD_FUNCTIONS
-#include <mysql.h>
+#include <mysql/mysql.h>
#if MYSQL_VERSION_ID >= 50000
#define MYSQL5
Index: libmysequoia/src/CarobCommon.cpp
diff -u libmysequoia/src/CarobCommon.cpp:1.15
libmysequoia/src/CarobCommon.cpp:1.16
--- libmysequoia/src/CarobCommon.cpp:1.15 Fri Mar 16 16:37:54 2007
+++ libmysequoia/src/CarobCommon.cpp Thu Mar 22 19:29:27 2007
@@ -25,7 +25,7 @@
#include <carob/TypeConstants.hpp>
/* MySQL include */
-#include <errmsg.h>
+#include <mysql/errmsg.h>
using namespace CarobNS;
using namespace log4cxx;
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.101
libmysequoia/src/CarobMySQL.cpp:1.102
--- libmysequoia/src/CarobMySQL.cpp:1.101 Fri Mar 16 16:37:54 2007
+++ libmysequoia/src/CarobMySQL.cpp Thu Mar 22 19:29:27 2007
@@ -30,7 +30,7 @@
#include <carob/ResultSetMetaData.hpp>
/* MySQL include */
-#include <errmsg.h>
+#include <mysql/errmsg.h>
#include <cstdlib>
#include <string>
Index: libmysequoia/src/CarobStmt.cpp
diff -u libmysequoia/src/CarobStmt.cpp:1.47 libmysequoia/src/CarobStmt.cpp:1.48
--- libmysequoia/src/CarobStmt.cpp:1.47 Fri Mar 16 16:37:54 2007
+++ libmysequoia/src/CarobStmt.cpp Thu Mar 22 19:29:27 2007
@@ -32,8 +32,9 @@
//MySQL includes
#include <mysql_wrapper.h>
-#include <my_alloc.h>
-#include <errmsg.h>
+
+#include <mysql/my_alloc.h>
+#include <mysql/errmsg.h>
using namespace CarobNS;
using namespace std;
Index: libmysequoia/src/Makefile.am
diff -u libmysequoia/src/Makefile.am:1.17 libmysequoia/src/Makefile.am:1.18
--- libmysequoia/src/Makefile.am:1.17 Wed Mar 21 20:04:01 2007
+++ libmysequoia/src/Makefile.am Thu Mar 22 19:29:27 2007
@@ -33,7 +33,7 @@
Converter.cpp \
HostTokenizer.cpp
-libmysequoia_la_CXXFLAGS = @MYSQL_CFLAGS@ @GCOV_CFLAGS@ @PROFILE_CFLAGS@
+libmysequoia_la_CXXFLAGS = @GCOV_CFLAGS@ @PROFILE_CFLAGS@
libmysequoia_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @GCOV_LDADD@
@PROFILE_LDADD@
clean-local:
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.69 libmysequoia/src/MySQLAPI.cpp:1.70
--- libmysequoia/src/MySQLAPI.cpp:1.69 Fri Mar 16 16:37:54 2007
+++ libmysequoia/src/MySQLAPI.cpp Thu Mar 22 19:29:27 2007
@@ -30,8 +30,9 @@
/* MySQL include */
#include <mysql_wrapper.h>
-#include <my_alloc.h>
-#include <errmsg.h>
+
+#include <mysql/my_alloc.h>
+#include <mysql/errmsg.h>
/* log4cxx include */
#include <log4cxx/logger.h>
Index: libmysequoia/src/Utils.cpp
diff -u libmysequoia/src/Utils.cpp:1.49 libmysequoia/src/Utils.cpp:1.50
--- libmysequoia/src/Utils.cpp:1.49 Fri Mar 16 16:37:54 2007
+++ libmysequoia/src/Utils.cpp Thu Mar 22 19:29:27 2007
@@ -28,8 +28,8 @@
#include <CarobMySQL.hpp>
/* MySQL include */
-#include <errmsg.h>
-#include <mysqld_error.h>
+#include <mysql/errmsg.h>
+#include <mysql/mysqld_error.h>
#include <cstdio>
#include <climits>
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.14 libmysequoia/test/Makefile.am:1.15
--- libmysequoia/test/Makefile.am:1.14 Wed Mar 21 20:04:01 2007
+++ libmysequoia/test/Makefile.am Thu Mar 22 19:29:27 2007
@@ -30,7 +30,7 @@
TestIniParser.cpp \
TestConverter.cpp
-runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @MYSQL_CFLAGS@ @GCOV_CFLAGS@
@PROFILE_CFLAGS@
+runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @GCOV_CFLAGS@ @PROFILE_CFLAGS@
runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @PROFILE_LDADD@
TESTS = $(check_PROGRAMS)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
