2009-02-04 14:54:16 Hyrum K. Wright napisał(a):
> 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?
AC_CONFIG_HEADERS unfortunately doesn't perform substitution of variables marked for substitution by AC_SUBST.
Fixed in r35668.
--
Arfrever Frehtes Taifersar Arahesis
Received on 2009-02-04 16:14:35 CET