X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.h;h=273b9df4a378b6b9ecc051d13472147f86504832;hp=d76776ef5379cea5559436c7d7b94563d48edb70;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=08fa240d29322ece4c7bceebfae6c6d3fb856f0e

diff --git a/init.h b/init.h
index d76776e..273b9df 100644
--- a/init.h
+++ b/init.h
@@ -20,7 +20,6 @@
 #include "buffy.h"
 #include "mutt.h"
 #include "version.h"
-#include "lib/debug.h"
 
 #ifndef _MAKEDOC
 #define DT_MASK         0x0f
@@ -96,9 +95,6 @@ struct option_t {
 # ifndef USE_GNUTLS
 #  define USE_GNUTLS
 # endif
-# ifndef USE_DOTLOCK
-#  define USE_DOTLOCK
-# endif
 # ifndef USE_HCACHE
 #  define USE_HCACHE
 # endif
@@ -512,24 +508,6 @@ struct option_t MuttVars[] = {
    ** rest of the string are expanded in the \fIC\fP locale (that is in US
    ** English).
    */
-#ifdef DEBUG
-  {"debug_level", DT_NUM, R_NONE, UL &DebugLevel, "1" },
-  /*
-   ** .pp
-   ** Availability: debug
-   **
-   ** .pp
-   ** This variable specifies the current debug level and
-   ** may be used to increase or decrease the verbosity level
-   ** during runtime. It overrides the level given with the
-   ** \fT-d\fP command line option.
-   **
-   ** .pp
-   ** Currently, this number must be >= 0 and <= 5 and madmutt
-   ** must be started with \fT-d\fP to enable debugging at all;
-   ** enabling at runtime is not possible.
-   */
-#endif
   {"default_hook", DT_STR, R_NONE, UL &DefaultHook, "~f %s !~P | (~P ~C %s)"},
   /*
    ** .pp
@@ -585,17 +563,12 @@ struct option_t MuttVars[] = {
    ** is viewed it is passed as standard input to $$display_filter, and the
    ** filtered message is read from the standard output.
    */
-#if defined(USE_DOTLOCK)
   {"dotlock_program", DT_PATH, R_NONE, UL &MuttDotlock, "$madmutt_bindir/muttng_dotlock"},
   /*
-   ** .pp
-   ** Availability: Dotlock
-   **
    ** .pp
    ** Contains the path of the \fTmadmutt_dotlock(1)\fP binary to be used by
    ** Madmutt.
    */
-#endif
   {"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
   /*
    ** .pp
@@ -1361,7 +1334,7 @@ struct option_t MuttVars[] = {
    ** cache (first hit).
    */
 #endif /* HAVE_GDBM || HAVE_DB 4 */
-#if HAVE_QDBM
+#ifdef HAVE_QDBM
   { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" },
   /*
   ** .pp
@@ -1444,11 +1417,11 @@ struct option_t MuttVars[] = {
    ** directory containing the madmutt documentation.\fP
    */
 #ifdef USE_HCACHE
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "qdbm" },
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "gdbm" },
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" },
 #else
   {"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" },
@@ -3770,9 +3743,6 @@ static const char* Features[] = {
 #ifdef HAVE_LIBIDN
   "idn",
 #endif
-#ifdef USE_DOTLOCK
-  "dotlock",
-#endif
 #ifdef USE_NNTP
   "nntp",
 #endif