From 385da4f3e7cd3f20ad5f53cf8bc371ae2aad55e9 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Mon, 18 May 2009 17:09:02 +0000 Subject: [PATCH] Sqlite3 support for build system svn path=/trunk/boinc/; revision=18147 --- configure.ac | 4 ++-- m4/sqlite3.m4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5af5e08f23..430e276a07 100644 --- a/configure.ac +++ b/configure.ac @@ -799,13 +799,13 @@ AC_ARG_ENABLE(wx-debug, ], [enable_wx_debug="no"]) -CLIENTGUILIBS="${WX_LIBS} ${GTK_LIBS}" +CLIENTGUILIBS="${WX_LIBS} ${SQLITE3_LIBS} ${GTK_LIBS}" if test "${enable_client_release}" = "yes" ; then if test "x${WX_LIBS_STATIC}" = "x" ; then WX_LIBS_STATIC="${WX_LIBS}" fi - SAH_STATICIZE_LDFLAGS([${WX_LIBS_STATIC} ${GTK_LIBS}],[CLIENTGUILIBS]) + SAH_STATICIZE_LDFLAGS([${WX_LIBS_STATIC} ${SQLITE3_LIBS} ${GTK_LIBS}],[CLIENTGUILIBS]) SAH_STATICIZE_LDFLAGS([${GLUT_LIBS}],[GLUT_LIBS]) SAH_STATICIZE_LDFLAGS([${BOINC_EXTRA_LIBS}],[BOINC_EXTRA_LIBS]) diff --git a/m4/sqlite3.m4 b/m4/sqlite3.m4 index cc29fd6c1c..4214362111 100644 --- a/m4/sqlite3.m4 +++ b/m4/sqlite3.m4 @@ -43,7 +43,7 @@ if test "x$have_sqlite3" != "xyes"; then fi fi if test "x$have_sqlite3" = "xyes"; then - AC_CHECK_FUNCS([sqlite3_open_v2]) + AC_CHECK_FUNCS([sqlite3_open]) AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have sqlite3.]) AC_SUBST(SQLITE3_LIBS) AC_SUBST(SQLITE3_CPPFLAGS)