RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 27-Aug-2010 22:41:11
Branch: HEAD Handle: 2010082720411100
Modified files:
rpm configure.ac
rpm/misc librpmmisc.vers
Log:
- misc: add sqlite3_interrupt to the loader map.
- dbsql: use AC_DEFINE to get WITH_SQLITE enabled in config.h.
Summary:
Revision Changes Path
2.447 +2 -2 rpm/configure.ac
1.32 +17 -16 rpm/misc/librpmmisc.vers
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.446 -r2.447 configure.ac
--- rpm/configure.ac 27 Aug 2010 18:10:02 -0000 2.446
+++ rpm/configure.ac 27 Aug 2010 20:41:11 -0000 2.447
@@ -1400,12 +1400,12 @@
RPM_CHECK_LIB(
[Berkeley DB SQL], [dbsql],
[db_sql-5.0 db_sql], [sqlite3_open], [],
- [yes,internal:none], [db3/sql],
+ [no,internal:none], [db3/sql],
[
AM_CONDITIONAL(WITH_DBSQL, [ true ])
if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_DB_LIBS="${WITH_DBSQL_LIBS}"
- WITH_SQLITE=true
+ AC_DEFINE(WITH_SQLITE, 1, [Define as 1 if building with SQLite library])
DBLIBSRCS="$DBLIBSRCS sqlite.c"
fi
], [
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.vers
============================================================================
$ cvs diff -u -r1.31 -r1.32 librpmmisc.vers
--- rpm/misc/librpmmisc.vers 27 Aug 2010 18:07:57 -0000 1.31
+++ rpm/misc/librpmmisc.vers 27 Aug 2010 20:41:11 -0000 1.32
@@ -184,32 +184,33 @@
pcre_study;
pcre_version;
rc_main;
+ sqlite3_bind_blob;
sqlite3_bind_int;
+ sqlite3_bind_text;
+ sqlite3_busy_handler;
+ sqlite3_close;
sqlite3_column_blob;
+ sqlite3_column_bytes;
+ sqlite3_column_count;
+ sqlite3_column_decltype;
+ sqlite3_column_double;
sqlite3_column_int;
sqlite3_column_int64;
- sqlite3_bind_blob;
- sqlite3_reset;
- sqlite3_close;
- sqlite3_errcode;
sqlite3_column_name;
- sqlite3_mprintf;
- sqlite3_column_double;
sqlite3_column_text;
- sqlite3_bind_text;
+ sqlite3_errcode;
sqlite3_errmsg;
- sqlite3_busy_handler;
- sqlite3_prepare;
- sqlite3_column_bytes;
- sqlite3_free_table;
- sqlite3_free;
sqlite3_exec;
- sqlite3_step;
sqlite3_finalize;
- sqlite3_open;
- sqlite3_column_count;
- sqlite3_column_decltype;
+ sqlite3_free;
+ sqlite3_free_table;
sqlite3_get_table;
+ sqlite3_interrupt;
+ sqlite3_mprintf;
+ sqlite3_open;
+ sqlite3_prepare;
+ sqlite3_reset;
+ sqlite3_step;
st_foreach;
st_free_table;
syck_add_sym;
@@ .
Received on Fri Aug 27 22:41:11 2010