[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: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Wed, 04 Feb 2009 07:54:16 -0600

Arfrever Frehtes Taifersar Arahesis wrote:
> 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 <apu_want.h>.
...

This broke the build. Configure gives the following error:

config.status: creating subversion/svn_private_config.h
config.status: subversion/svn_private_config.h is unchanged
config.status: executing svn_private_config.h commands
sed: -i may not be used with stdin

And subsequently the correct value isn't being substituted in svn_private_config.h.

On another note, we aren't doing this type of substitution *anywhere* for any
other headers. Why do we need it here?

-Hyrum

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1102338
Received on 2009-02-04 14:54:58 CET

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