[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r35665 - in trunk: . build/ac-macros subversion subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util

From: Chris Foote <cafoote_at_yahoo.com>
Date: Wed, 4 Feb 2009 08:25:44 -0800 (PST)

----- Original Message ----
> From: Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA_at_GMail.Com>
> To: svn_at_subversion.tigris.org
> Sent: Wednesday, 4 February, 2009 1:34:36
> Subject: svn commit: r35665 - in trunk: . build/ac-macros subversion subversion/libsvn_fs_base subversion/libsvn_fs_base/bdb subversion/libsvn_fs_base/util
>
> Author: arfrever
> Date: Tue Feb  3 17:34:36 2009
> New Revision: 35665
>
> Log:
> Follow-up to r35017:
> Allow to specify Berkeley DB header.
>
> * build/ac-macros/berkeley-db.m4
>   (SVN_LIB_BERKELEY_DB, SVN_LIB_BERKELEY_DB_TRY): Allow to specify Berkeley DB
>   header in argument of the '--with-berkeley-db' option. Add conditional
>   inclusion of Berkeley DB header to 'subversion/svn_private_config.h'.
>
> * configure.ac: Substitute '@SVN_DB_HEADER@' with appropriate value
>   in 'subversion/svn_private_config.h'.
>
> * subversion/svn_private_config.hw: Include Berkeley DB header when
>   SVN_WANT_BDB is defined.
>
> * subversion/libsvn_fs_base/bdb/bdb_compat.h:
> * subversion/libsvn_fs_base/bdb/bdb-err.c:
> * subversion/libsvn_fs_base/bdb/changes-table.h:
> * subversion/libsvn_fs_base/bdb/dbt.c:
> * subversion/libsvn_fs_base/bdb/dbt.h:
> * subversion/libsvn_fs_base/bdb/env.h:
> * subversion/libsvn_fs_base/bdb/nodes-table.h:
> * subversion/libsvn_fs_base/bdb/reps-table.h:
> * subversion/libsvn_fs_base/bdb/rev-table.h:
> * subversion/libsvn_fs_base/bdb/strings-table.h:
> * subversion/libsvn_fs_base/bdb/uuids-table.h:
> * subversion/libsvn_fs_base/fs.c:
> * subversion/libsvn_fs_base/fs.h:
> * subversion/libsvn_fs_base/node-rev.c:
> * subversion/libsvn_fs_base/node-rev.h:
> * subversion/libsvn_fs_base/reps-strings.c:
> * subversion/libsvn_fs_base/reps-strings.h:
> * subversion/libsvn_fs_base/revs-txns.h:
> * subversion/libsvn_fs_base/trail.c:
> * subversion/libsvn_fs_base/trail.h:
> * subversion/libsvn_fs_base/util/fs_skels.h: Define SVN_WANT_BDB and
>   include "svn_private_config.h" instead of defining APU_WANT_DB and
>   including .
>
--- snip --- 
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1099602

This also breaks the windows build.

The SVN_WANT_BDB define also needs to be added to the lock.c and tree.c files.

Index: subversion/libsvn_fs_base/tree.c
===================================================================
--- subversion/libsvn_fs_base/tree.c    (revision 35669)
+++ subversion/libsvn_fs_base/tree.c    (working copy)
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#define SVN_WANT_BDB
 #include "svn_private_config.h"
 #include "svn_pools.h"
 #include "svn_error.h"
Index: subversion/libsvn_fs_base/lock.c
===================================================================
--- subversion/libsvn_fs_base/lock.c    (revision 35669)
+++ subversion/libsvn_fs_base/lock.c    (working copy)
@@ -19,6 +19,7 @@
 #include "svn_pools.h"
 #include "svn_error.h"
 #include "svn_fs.h"
+#define SVN_WANT_BDB
 #include "svn_private_config.h"
 #include <apr_uuid.h>

Regards
Chris

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1102826
Received on 2009-02-04 17:26:17 CET

This is an archived mail posted to the Subversion Dev mailing list.