Rocco Rutte:

- remove $header_cache_pagesize for qdbm (patch by Thomas Glanzmann)
- new feature tests due to qdbm support: feature_(qdbm|gdbm|db4)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@293 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/TODO.mutt-ng b/TODO.mutt-ng
index cafd150..0039a0d 100644 (file)
--- a/TODO.mutt-ng
+++ b/TODO.mutt-ng
@@ -20,4 +20,5 @@ Here's a list of all mutt-ng specific TODOs (not in priority order):
   functions should only be called directly in the right abstraction
   layer's implementation. And so forth.
 
-- Convert all the names in manual.sgml.head/tail
+- Improve documentation, update/rewrite/remove legacy docs (such as
+  INSTALL and friends)

diff --git a/UPGRADING b/UPGRADING
index 015a92b..575ef2e 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -10,6 +10,15 @@ This document is not the place for verbose documentation; it only offers
 the necessary keywords to look them up in the manual, ChangeLog or other
 sources of information.
 
+2005-05-17:
+
+  Changes due to better integration of qdbm support w/ header caching:
+  
+    - the $header_cache_pagesize variable is not available with as it's 
+      not used
+    - the following feature tests were added: feature_qdbm, feature_gdbm,
+      feature_db4 (for ifdef/ifndef)
+
 2005-05-14:
 
   New Configuration Variables:

diff --git a/hcache.c b/hcache.c
index 734014d..7e7334d 100644 (file)
--- a/hcache.c
+++ b/hcache.c
@@ -618,9 +618,6 @@ mutt_hcache_open(const char *path, const char *folder)
 {
   struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE));
   int    flags = VL_OWRITER | VL_OCREAT;
-#if 0 /* FIXME */
-  int pagesize = atoi(HeaderCachePageSize) ? atoi(HeaderCachePageSize) : 16384;
-#endif
   h->db = NULL;
   h->folder = safe_strdup(folder);
   h->crc = generate_crc32();

diff --git a/init.h b/init.h
index 34601d3..a12d82d 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1274,6 +1274,7 @@ struct option_t MuttVars[] = {
    ** files when the header cache is in use. This incurs one \fTstat(2)\fP per
    ** message every time the folder is opened.
    */
+#if HAVE_GDBM || HAVE_DB4
   {"header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384"},
   /*
    ** .pp
@@ -1288,6 +1289,7 @@ struct option_t MuttVars[] = {
    ** less the best you can get. For details google for mutt header
    ** cache (first hit).
    */
+#endif /* HAVE_GDBM || HAVE_DB 4 */
 #if HAVE_QDBM
   { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 },
   /*
@@ -3606,120 +3608,137 @@ const struct feature_t Features[] = {
 #endif
    }, {"slang",
 #ifdef USE_SLANG_CURSES
-       1
+   1
 #else
-       0
+   0
 #endif
-       }, {"iconv",
+   }, {"iconv",
 #ifdef _LIBICONV_VERSION
-           1
+   1
 #else
-           0
+   0
 #endif
-           }, {"idn",
+   }, {"idn",
 #ifdef HAVE_LIBIDN
-               1
+   1
 #else
-               0
+   0
 #endif
-               }, {"dotlock",
+   }, {"dotlock",
 #ifdef USE_DOTLOCK
-                   1
+   1
 #else
-                   0
+   0
 #endif
-                   }, {"standalone",
+   }, {"standalone",
 #ifdef DL_STANDALONE
-                       1
+   1
 #else
-                       0
+   0
 #endif
-                       }, {"pop",
+   }, {"pop",
 #ifdef USE_POP
-                           1
+   1
 #else
-                           0
+   0
 #endif
-                           }, {"nntp",
+   }, {"nntp",
 #ifdef USE_NNTP
-                               1
+   1
 #else
-                               0
+   0
 #endif
-                               }, {"imap",
+   }, {"imap",
 #ifdef USE_IMAP
-                                   1
+   1
 #else
-                                   0
+   0
 #endif
-                                   }, {"ssl",
+   }, {"ssl",
 #ifdef USE_SSL
-                                       1
+   1
 #else
-                                       0
+   0
 #endif
-                                       }, {"gnutls",
+   }, {"gnutls",
 #ifdef USE_GNUTLS
-                                           1
+   1
 #else
-                                           0
+   0
 #endif
-                                           }, {"sasl",
+   }, {"sasl",
 #ifdef USE_SASL
-                                               1
+   1
 #else
-                                               0
+   0
 #endif
-                                               }, {"sasl2",
+   }, {"sasl2",
 #ifdef USE_SASL2
-                                                   1
+   1
 #else
-                                                   0
+   0
 #endif
-                                                   }, {"libesmtp",
+   }, {"libesmtp",
 #ifdef USE_LIBESMTP
-                                                       1
+   1
 #else
-                                                       0
+   0
 #endif
-                                                       }, {"compressed",
+   }, {"compressed",
 #ifdef USE_COMPRESSED
-                                                           1
+   1
 #else
-                                                           0
+   0
 #endif
-                                                           }, {"color",
+   }, {"color",
 #ifdef HAVE_COLOR
-                                                               1
+   1
 #else
-                                                               0
+   0
 #endif
-                                                               },
-    {"classic_pgp",
+   }, {"classic_pgp",
 #ifdef CRYPT_BACKEND_CLASSIC_PGP
-     1
+   1
 #else
-     0
+   0
 #endif
-     }, {"classic_smime",
+   }, {"classic_smime",
 #ifdef CRYPT_BACKEND_CLASSIC_SMIME
-         1
+   1
 #else
-         0
+   0
 #endif
-         }, {"gpgme",
+   }, {"gpgme",
 #ifdef CRYPT_BACKEND_GPGME
-             1
+   1
 #else
-             0
+   0
 #endif
-             }, {"header_cache",
+   }, {"header_cache",
 #ifdef USE_HCACHE
-                 1
+   1
 #else
-                 0
+   0
+#endif
+   }, {"qdbm",
+#ifdef HAVE_QDBM
+   1
+#else
+   0
+#endif
+   }, {"gdbm",
+#ifdef HAVE_GDBM
+   1
+#else
+   0
+#endif
+   }, {"db4",
+#ifdef HAVE_DB4
+   1
+#else
+   0
 #endif
-                 },
+   },
   /* last */
   {NULL, 0}
 };