[PATCH] Fix non-BDB build

[Alex Waugh <al...@alexwaugh.com>]

Hi

r12760 broke the build for people who don't have BDB headers installed.
This patch fixes things.

Alex



Fix the build when BerkeleyDB is not available.

* build.conf
  (libsvn_test_fs): Remove unnecessary dependency on libsvn_fs_base and
    hence BDB
* subversion/tests/fs-helpers.c: Remove unused #includes



Index: build.conf
===================================================================
--- build.conf	(revision 12813)
+++ build.conf	(working copy)
@@ -477,9 +477,8 @@
 type = lib
 path = subversion/tests
 sources = fs-helpers.c
-install = bdb-test
-libs = libsvn_fs_base libsvn_fs libsvn_repos libsvn_delta libsvn_subr
-       libsvn_test apr
+install = test
+libs = libsvn_fs libsvn_repos libsvn_delta libsvn_subr libsvn_test apr
 msvc-static = yes
 # this lib does not actually have linktime undefined symbols, but as it depends
 # on libsvn_test, which does, and libtool refuses to link shared libs with 
Index: subversion/tests/fs-helpers.c
===================================================================
--- subversion/tests/fs-helpers.c	(revision 12813)
+++ subversion/tests/fs-helpers.c	(working copy)
@@ -26,14 +26,7 @@
 #include "svn_test.h"
 #include "fs-helpers.h"
 
-#include "../libsvn_fs_base/fs.h"
-#include "../libsvn_fs_base/dag.h"
-#include "../libsvn_fs_base/trail.h"
 
-#include "../libsvn_fs_base/bdb/rev-table.h"
-#include "../libsvn_fs_base/bdb/nodes-table.h"
-
-
 /*-------------------------------------------------------------------*/
 
 /** Helper routines. **/


-- 
Alex Waugh

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] Fix non-BDB build

[Max Bowsher <ma...@ukf.net>]

Alex Waugh wrote:
> Hi
> 
> r12760 broke the build for people who don't have BDB headers installed.
> This patch fixes things.

Thanks, applied in r12819.

Max.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org