Thanks for doing all this, Hyrum and Jeremy.
--dave
On Thu, Jan 15, 2009 at 12:12 PM, Hyrum K. Wright <hyrum_at_hyrumwright.org> wrote:
> Author: hwright
> Date: Thu Jan 15 09:12:23 2009
> New Revision: 35263
>
> Log:
> Make configure a bit more flexible when is comes to SQLite:
> * When given the --with-sqlite flag:
> - check that the target is a sqlite installation that exists and meets
> our minimum requirements
> - check that the target is the sqlite amalgamation that exists and meets
> our minimum requirements
>
> * When not given the --with-sqlite flag:
> - check for the shared library via pkg-config
> - check for an appropriate amalgamation file in build/
>
> INSTALL still needs to be updated, as does the code for including the
> amalgamation file in -deps. Those commits will follow shortly.
>
> This commit also reverts portions of r35241, which added initial support
> for the amalgamation file (to the detriment of library installs).
>
> * Makefile.in, build.conf:
> Revert r35241.
>
> * subversion/libsvn_subr/sqlite.c:
> Conditionally include the amalgamation.
>
> * subversion/libsvn_subr/sqlite3_c.h:
> Remove.
>
> * build/ac-macros/sqlite.m4
> (SVN_LIB_SQLITE): Update config order as described above, and refactor to make
> slightly more readable.
> (SVN_SQLITE_PKG_CONFIG, SVN_SQLITE_DIR_CONFIG, SVN_SQLITE_FILE_CONFIG,
> SVN_SQLITE_VERNUM_PARSE): New.
> (SVN_DOWNLOAD_SQLITE): Update text.
>
> * build/getversion.py
> (svn_extractor, sqlite_extractor, extractors): New.
> (usage_and_exit): Update.
> (): Allow this file to parse SQLite version information as well as svn
> version information.
>
> * configure.ac
> Partially revert r35241, and use a minimum version in place of an accepted
> pattern for SQLite checking.
--
glasser_at_davidglasser.net | langtonlabs.org | flickr.com/photos/glasser/
Received on 2009-01-15 22:08:47 CET