[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Default to fsfs when not built with Berkeley DB

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2004-07-14 17:54:30 CEST

I have built for the first time without bdb support. If you
build this way, svnadmin create has a useless default and cries:

svn: Unknown FS type 'bdb'

I think it would be good to fix this for 1.1 since it's so
trivial :). Can i commit the following patch to trunk?

When configured without Berkeley DB, make libsvn_fs default to
the fsfs back-end.

* configure.in:
  Set DEFAULT_FS_TYPE to "bdb" if configured with Berkeley DB, or
  "fsfs" if not. Publish this to svn_private_config.h with
  AC_DEFINE_UNQUOTED.

* subversion/libsvn_fs/fs-loader.c:
  Don't define DEFAULT_FS_TYPE here; expect it to come from
  svn_private_config.h.

Index: configure.in
===================================================================
--- configure.in (revision 10284)
+++ configure.in (working copy)
@@ -327,6 +327,9 @@
   INSTALL_STATIC_RULES="$INSTALL_STATIC_RULES install-bdb-lib"
   BDB_TEST_DEPS="\$(BDB_TEST_DEPS)"
   BDB_TEST_PROGRAMS="\$(BDB_TEST_PROGRAMS)"
+ DEFAULT_FS_TYPE="bdb"
+else
+ DEFAULT_FS_TYPE="fsfs"
 fi
 
 if test "$svn_lib_neon" = "yes"; then
@@ -352,6 +355,8 @@
                    [The desired minor version for the Berkeley DB])
 AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_PATCH, $SVN_FS_WANT_DB_PATCH,
                    [The desired patch version for the Berkeley DB])
+AC_DEFINE_UNQUOTED(DEFAULT_FS_TYPE, "$DEFAULT_FS_TYPE",
+ [The fs type to use by default])
 
 dnl Check for header files ----------------
 
Index: subversion/libsvn_fs/fs-loader.c
===================================================================
--- subversion/libsvn_fs/fs-loader.c (revision 10284)
+++ subversion/libsvn_fs/fs-loader.c (working copy)
@@ -31,7 +31,6 @@
 
 #include "fs-loader.h"
 
-#define DEFAULT_FS_TYPE "bdb"
 #define FS_TYPE_FILENAME "fs-type"
 
 /* The implementation of this library is deliberately not separated

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 14 17:55:28 2004

This is an archived mail posted to the Subversion Dev mailing list.