added configure check and support for sqlite3 libraries without sqlite3_prepare_v2
This commit is contained in:
parent
4ce78f9356
commit
f8277a8370
|
@ -620,9 +620,16 @@ if test x$mysql = xtrue; then
|
|||
AC_CHECK_HEADER([mysql/mysql.h],,[AC_MSG_ERROR([MySQL header mysql/mysql.h not found!])])
|
||||
fi
|
||||
|
||||
if test x$mysql = xtrue; then
|
||||
if test x$sqlite = xtrue; then
|
||||
AC_HAVE_LIBRARY([sqlite3],[LIBS="$LIBS"],[AC_MSG_ERROR([SQLite library sqlite3 not found])])
|
||||
AC_CHECK_HEADER([sqlite3.h],,[AC_MSG_ERROR([SQLite header sqlite3.h not found!])])
|
||||
AC_MSG_CHECKING([sqlite3_prepare_v2])
|
||||
AC_TRY_COMPILE(
|
||||
[#include <sqlite3.h>],
|
||||
[
|
||||
void *test = sqlite3_prepare_v2;
|
||||
],
|
||||
[AC_MSG_RESULT([yes])]; AC_DEFINE_UNQUOTED(HAVE_SQLITE3_PREPARE_V2, 1), [AC_MSG_RESULT([no])])
|
||||
fi
|
||||
|
||||
if test x$openssl = xtrue; then
|
||||
|
|
|
@ -54,7 +54,11 @@ static sqlite3_stmt* run(private_sqlite_database_t *this, char *sql,
|
|||
sqlite3_stmt *stmt = NULL;
|
||||
int params, i, res = SQLITE_OK;
|
||||
|
||||
#ifdef HAVE_SQLITE3_PREPARE_V2
|
||||
if (sqlite3_prepare_v2(this->db, sql, -1, &stmt, NULL) == SQLITE_OK)
|
||||
#else
|
||||
if (sqlite3_prepare(this->db, sql, -1, &stmt, NULL) == SQLITE_OK)
|
||||
#endif
|
||||
{
|
||||
params = sqlite3_bind_parameter_count(stmt);
|
||||
for (i = 1; i <= params; i++)
|
||||
|
|
Loading…
Reference in New Issue