On Wed, Feb 18, 2009 at 10:57 PM, Ivan Zhakov <ivan_at_visualsvn.com> wrote:
> On Wed, Feb 18, 2009 at 10:22 PM, Paul Burba <ptburba_at_gmail.com> wrote:
>> On Wed, Feb 18, 2009 at 11:44 AM, Ivan Zhakov <ivan_at_visualsvn.com> wrote:
>>> On Wed, Feb 18, 2009 at 7:08 PM, Mark Phippard <markphip_at_gmail.com> wrote:
>>>> On Wed, Feb 18, 2009 at 11:02 AM, Bert Huijben <rhuijben_at_sharpsvn.net> wrote:
>>>>> Is it a problem to just keep the current build option?
>>>>> (+1 on making the amalgamation default on Windows)
>>>>> The amalgamation build makes it impossible to re-use Sqlite from
>>>>> applications that use both Subversion and Sqlite (Requiring them to link to
>>>>> two separate copies).
>>>> That said, I am not against supporting other options as long as we can
>>>> make the default fairly easy.
>>> Paul, Mark and Bert,
>>> Please check attached patch. I've implemented the same behavior as
>>> *nix system which is described in build\ac-macros\sqlite.m4:
>>> If a --with-sqlite=PREFIX option is passed, look for a suitable sqlite
>>> either installed under the directory PREFIX or as an amalgamation file
>>> at the path PREFIX. In this case ignore any sqlite-amalgamation/ subdir
>>> within the source tree.
>>> If no --with-sqlite option is passed, look first for
>>> sqlite-amalgamation/sqlite3.c which should be the amalgamated version of
>>> the source distribution. If the amalgamation exists and is the wrong
>>> version, exit with a failure. If no sqlite-amalgamation/ subdir is
>>> present, search for a sqlite installed on the system.
>>> So existing builds should not be broken with this patch. While simple
>>> point --with-sqlite to directory with SQLite amalgamation directory or
>>> putting it to directory sqlite-amalgamation should be enough to build
>>> Log message:
>>> Add support to build and use SQLite amalgamation version on Windows.
>>> This implements the same behavior as *nix build system does.
>> This is supposed to *build* sqlite if I point --with-sqlite to a
>> directory containing the amalgamation files right? Because no matter
>> where I put the amalgamation the build fails for me because
>> sqlite3.lib is not created:
>> (If this is working for you I suspect you are picking up some existing
> Oops, my fault. I post updated patch in ten minutes.
Here is updated patch.
Received on 2009-02-18 21:10:30 CET