[PATCH] In-tree DB 4.1 support - Re: svn commit: rev 3577 - trunk/ac-helpers

Ben Collins-Sussman wrote:
> If this detection is working for everyone, then I'll bump the
> CHANGES file again, and roll a real 0.14.5 tarball.

Yes, the detection seems to be working perfectly, atleast for me.

But, the one thing that still seems awry (that was indeed mentioned
before) is that an in-tree Berkeley DB 4.1 will not work.

So I made a patch to make it work - I've tested this with both 4.0 and
4.1, with --disable-shared and without. The change is ofcourse trivial
:-)

I'm not sure if this is the correct way to do the change - but since
there's no version checks what so ever performed with an in-tree
Berkeley DB, I think it's quite OK to just try and find some library
to link against.

No log message, but here's the patch.

-- Naked

Index: ac-helpers/berkeley-db.m4
===================================================================
--- ac-helpers/berkeley-db.m4 (revision 3577)
+++ ac-helpers/berkeley-db.m4 (working copy)
@@ -105,7 +105,7 @@
     # Linking directly to the .la is broken with --disable-shared
     # because Berkeley db does not seem to generate a .la library.
     if test "$enable_shared" = "yes"; then
- SVN_DB_LIBS="$dbdir/libdb-4.0.la"
+ SVN_DB_LIBS="$dbdir/libdb"*".la"
     else
         SVN_DB_LIBS="-L$dbdir -ldb" # ignoring $db_libname here on purpose.
     fi

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 30 16:25:12 2002