INN commit: trunk (4 files)

[INN Commit]

    Date: Monday, May 5, 2008 @ 14:29:37
  Author: iulius
Revision: 7821

It is "Berkeley DB" and not "BerkeleyDB".

Modified:
  trunk/TODO
  trunk/configure.ac
  trunk/frontends/ovdb_server.c
  trunk/m4/zlib.m4

-------------------------+
 TODO                    |   10 ++++------
 configure.ac            |    4 ++--
 frontends/ovdb_server.c |    2 +-
 m4/zlib.m4              |    2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

Modified: TODO
===================================================================
--- TODO	2008-05-05 21:28:43 UTC (rev 7820)
+++ TODO	2008-05-05 21:29:37 UTC (rev 7821)
@@ -171,14 +171,12 @@
   with cnfsstat).  pullart.c may also stand to be merged into the same
   utility (cnfs-util might not be a bad name).
 
-* The BerkeleyDB integration of INN needs some improvements in robustness.
+* The Berkeley DB integration of INN needs some improvements in robustness.
   Currently, BerkeleyDB functions can be called by nnrpd out of signal
   handlers and in other unfortunate situations, and coordination between
-  nnrpd and innd isn't entirely robust.  BerkeleyDB 4.4 offers a new
-  DB_REGISTER flag to open to allow for multi-process use of BerkeleyDB
-  databases and use of that flag should be investigated.  It may also be a
-  worthwhile simplification to pick a suitably powerful version of
-  BerkeleyDB and drop support for anything older than that.
+  nnrpd and innd isn't entirely robust.  Berkeley DB 4.4 offers a new
+  DB_REGISTER flag to open to allow for multi-process use of Berkeley DB
+  databases and use of that flag should be investigated.
 
 
 Documentation Projects

Modified: configure.ac
===================================================================
--- configure.ac	2008-05-05 21:28:43 UTC (rev 7820)
+++ configure.ac	2008-05-05 21:29:37 UTC (rev 7821)
@@ -347,14 +347,14 @@
 INN_LIB_SASL
 INN_LIB_KERBEROS
 
-dnl The dbm libraries are a special case.  If we're building with BerkeleyDB,
+dnl The dbm libraries are a special case.  If we're building with Berkeley DB,
 dnl just use the ndbm support provided by it.
 if test x"$DB_LIBS" != x ; then
     DBM_CPPFLAGS="$DB_CPPFLAGS"
     DBM_LIBS="$DB_LDFLAGS $DB_LIBS"
     AC_SUBST([DBM_LIBS])
     AC_DEFINE([HAVE_BDB_DBM], 1,
-        [Define if the BerkeleyDB dbm compatibility layer is available.])
+        [Define if the Berkeley DB dbm compatibility layer is available.])
 else
     INN_SEARCH_AUX_LIBS([dbm_open], [ndbm dbm], [DBM_LIBS],
         [AC_DEFINE([HAVE_DBM], 1, [Define if you have a dbm library.])])

Modified: frontends/ovdb_server.c
===================================================================
--- frontends/ovdb_server.c	2008-05-05 21:28:43 UTC (rev 7820)
+++ frontends/ovdb_server.c	2008-05-05 21:29:37 UTC (rev 7821)
@@ -37,7 +37,7 @@
 int
 main(int argc UNUSED, char **argv UNUSED)
 {
-    die("BerkeleyDB support not compiled");
+    die("Berkeley DB support not compiled");
 }
 
 #else /* USE_BERKELEY_DB */

Modified: m4/zlib.m4
===================================================================
--- m4/zlib.m4	2008-05-05 21:28:43 UTC (rev 7820)
+++ m4/zlib.m4	2008-05-05 21:29:37 UTC (rev 7821)
@@ -5,7 +5,7 @@
 dnl command-line option and probes for the location of zlib if that
 dnl option is used without an optional path.  It looks by default in $prefix,
 dnl /usr/local, and /usr.  It exports ZLIB_LDFLAGS, ZLIB_CPPFLAGS, and ZLIB_LIBS.
-dnl The default for --with-zlib is no unless BerkeleyDB is enabled, in which
+dnl The default for --with-zlib is no unless Berkeley DB is enabled, in which
 dnl case the default is yes.
 
 AC_DEFUN([INN_LIB_ZLIB],