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 20:10:02
  Branch: HEAD                             Handle: 2010082718100101

  Modified files:
    rpm                     CHANGES configure.ac

  Log:
    - permit --with-dbsql=internal as sqlite replacement.

  Summary:
    Revision    Changes     Path
    1.3426      +1  -0      rpm/CHANGES
    2.446       +19 -10     rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3425 -r1.3426 CHANGES
  --- rpm/CHANGES	27 Aug 2010 12:51:22 -0000	1.3425
  +++ rpm/CHANGES	27 Aug 2010 18:10:01 -0000	1.3426
  @@ -1,4 +1,5 @@
   5.3.3 -> 5.4a1:
  +    - jbj: permit --with-dbsql=internal as sqlite replacement.
       - jbj: permit building --without-sqlite again.
   
   5.3.2 -> 5.3.3:
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.445 -r2.446 configure.ac
  --- rpm/configure.ac	9 Aug 2010 11:45:05 -0000	2.445
  +++ rpm/configure.ac	27 Aug 2010 18:10:02 -0000	2.446
  @@ -8,7 +8,7 @@
   
   AC_PREREQ(2.63)
   m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
  -AC_INIT([rpm],[5.3.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
  +AC_INIT([rpm],[5.4.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
   PACKAGE_TIMESTAMP="2009" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
  @@ -1388,20 +1388,30 @@
         fi
       ])
   
  -dnl RPM_CHECK_LIB(
  -dnl     [Berkeley DB SQL], [dbsql],
  -dnl     [db_sql-5.0 db_sql], [sqlite3_open], [],
  -dnl     [yes,internal:external:none], [db3/sql],
  -dnl     [],
  -dnl     [])
  -
  +dnl # Sqlite external
   RPM_CHECK_LIB(
       [SQLite], [sqlite],
       [sqlite3], [sqlite3_open], [sqlite3.h],
  -    [no,external:none], [],
  +    [no,external:none], [sqlite],
       [ DBLIBSRCS="$DBLIBSRCS sqlite.c" ],
       [])
   
  +dnl # Sqlite 3.6.23.1 internal from db-5.0.x
  +RPM_CHECK_LIB(
  +    [Berkeley DB SQL], [dbsql],
  +    [db_sql-5.0 db_sql], [sqlite3_open], [],
  +    [yes,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
  +        DBLIBSRCS="$DBLIBSRCS sqlite.c"
  +      fi
  +    ], [
  +      AM_CONDITIONAL(WITH_DBSQL, [ false ])
  +    ])
  +
   DBLIBOBJS=`echo $DBLIBSRCS | sed -e "s/\.c/\.lo/g"`
   
   AC_SUBST(DBLIBSRCS)
  @@ -1417,7 +1427,6 @@
   
   dnl # determine whether the db sqlite3 tool/library should be built
   dnl XXX hot-wire --with-dbsql; --with-dbsql=external will need RPM_CHECK_LIB
  -AM_CONDITIONAL(WITH_DBSQL, true)
   AM_CONDITIONAL(WITH_DBSQL_CODEGEN, true)
   
   dnl # determine default RPM DB API and configuration
  @@ .