Here is the "build db in the src tree" patch modified to
support the new build system. It is still entirely
optional. The db code is only configured and built
when a $top_srcdir/db directory is detected. This
really does make bootstrapping much easier so I
would hope folks could take a moment to consider
adding it.
Mo DeJong
Red Hat Inc
Index: Makefile.in
===================================================================
RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/Makefile.in,v
retrieving revision 1.13
diff -u -r1.13 Makefile.in
--- Makefile.in 2001/06/04 22:06:39 1.13
+++ Makefile.in 2001/06/05 22:56:45
@@ -8,7 +8,7 @@
SVN_RA_LIB_DEPS = @SVN_RA_LIB_DEPS@
SVN_RA_LIB_LINK = @SVN_RA_LIB_LINK@
-EXTERNAL_PROJECT_DIRS = neon apr
+EXTERNAL_PROJECT_DIRS = neon apr @DB_SUBDIR@
SVN_APR_LIBS = @SVN_APR_LIBS@
Index: configure.in
===================================================================
RCS file:
/usr/local/tigris/data/helm/cvs/repository/subversion/configure.in,v
retrieving revision 1.90
diff -u -r1.90 configure.in
--- configure.in 2001/06/05 09:58:30 1.90
+++ configure.in 2001/06/05 22:56:45
@@ -50,6 +50,16 @@
if test "$enable_subdir_config" = "yes"; then
APR_SUBDIR_CONFIG(apr)
APR_SUBDIR_CONFIG(neon, --with-expat="$abs_srcdir/expat-lite/libexpat.la")
+
+ if test -d $abs_srcdir/db ; then
+ # Note: We have to configure and build a db subdirectory even if
+ # some other berkeley db is configured via --with-berkeley-db
+ DB_SUBDIR=db/dist
+ DB_CONFIG_ARGS=
+ APR_SUBDIR_CONFIG($DB_SUBDIR, $DB_CONFIG_ARGS)
+ fi
+ AC_SUBST(DB_SUBDIR)
+
fi
@@ -272,6 +282,7 @@
You can find latest version of Berkeley DB at http://www.sleepycat.com.
You can find the latest version of Berkeley DB here:
http://www.sleepycat.com/update/3.2.9/db-3.2.9.tar.gz
+Download, extract, and rename db-3.2.9/ to db/ to incorporate into build.
])
;;
esac
Index: ac-helpers/berkeley-db.m4
===================================================================
RCS file:
/usr/local/tigris/data/helm/cvs/repository/subversion/ac-helpers/berkeley-db.m4,v
retrieving revision 1.7
diff -u -r1.7 berkeley-db.m4
--- ac-helpers/berkeley-db.m4 2001/03/13 03:25:43 1.7
+++ ac-helpers/berkeley-db.m4 2001/06/05 22:56:45
@@ -58,7 +58,8 @@
The Subversion server requires Berkeley DB 3.2.9 or newer. If
you specify \`--without-berkeley-db', the server will not be
built. Otherwise, the configure script builds the server if and
- only if it can find a new enough version installed.],
+ only if it can find a new enough version installed or if a copy
+ of Berkeley DB exists in the subversion tree.],
[
if test "$withval" = "yes"; then
status=required
@@ -71,11 +72,32 @@
fi
],
[
- status=if-found
- places=search
+ # No --with-berkeley-db option:
+ #
+ # Check to see if a db directory exists in the build directory.
+ # If it does then we will be using the berkeley DB version
+ # from the source tree. We can't test it since it is not built
+ # yet, so we have to assume it is the correct version.
+
+ AC_MSG_CHECKING([for built-in Berkeley DB])
+
+ if test -d db ; then
+ status=builtin
+ AC_MSG_RESULT([yes])
+ else
+ status=if-found
+ places=search
+ AC_MSG_RESULT([no])
+ fi
])
- if test "$status" = "skip"; then
+ if test "$status" = "builtin"; then
+ # Use the include and lib files in the build dir.
+ dbdir=`cd db/dist ; pwd`
+ CPPFLAGS="$CPPFLAGS -I$dbdir"
+ LIBS="$LIBS -L$dbdir -ldb"
+ svn_lib_berkeley_db=yes
+ elif test "$status" = "skip"; then
svn_lib_berkeley_db=no
else
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:31 2006