projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more tweaks and fixes.
[apps/madmutt.git]
/
init.h
diff --git
a/init.h
b/init.h
index
3f149ca
..
10b2c8b
100644
(file)
--- a/
init.h
+++ b/
init.h
@@
-80,9
+80,6
@@
struct option_t {
/* build complete documentation */
#ifdef _MAKEDOC
/* build complete documentation */
#ifdef _MAKEDOC
-# ifndef MIXMASTER
-# define MIXMASTER "mixmaster"
-# endif
# ifndef USE_SSL
# define USE_SSL
# endif
# ifndef USE_SSL
# define USE_SSL
# endif
@@
-95,9
+92,6
@@
struct option_t {
# ifndef USE_GNUTLS
# define USE_GNUTLS
# endif
# ifndef USE_GNUTLS
# define USE_GNUTLS
# endif
-# ifndef USE_DOTLOCK
-# define USE_DOTLOCK
-# endif
# ifndef USE_HCACHE
# define USE_HCACHE
# endif
# ifndef USE_HCACHE
# define USE_HCACHE
# endif
@@
-566,17
+560,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.
*/
** 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"},
/*
{"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.
*/
** .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
{"dsn_notify", DT_STR, R_NONE, UL &DsnNotify, ""},
/*
** .pp
@@
-1342,7
+1331,7
@@
struct option_t MuttVars[] = {
** cache (first hit).
*/
#endif /* HAVE_GDBM || HAVE_DB 4 */
** cache (first hit).
*/
#endif /* HAVE_GDBM || HAVE_DB 4 */
-#if HAVE_QDBM
+#if
def
HAVE_QDBM
{ "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" },
/*
** .pp
{ "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, "no" },
/*
** .pp
@@
-1425,11
+1414,11
@@
struct option_t MuttVars[] = {
** directory containing the madmutt documentation.\fP
*/
#ifdef USE_HCACHE
** 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" },
{"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" },
{"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" },
{"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "db4" },
#else
{"madmutt_hcache_backend", DT_SYS, R_NONE, 0, "unknown" },
@@
-1658,12
+1647,8
@@
struct option_t MuttVars[] = {
*/
#endif
*/
#endif
-#ifdef MIXMASTER
{"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
/*
{"mix_entry_format", DT_STR, R_NONE, UL &MixEntryFormat, "%4n %c %-16s %a"},
/*
- ** .pp
- ** Availability: Mixmaster
- **
** .pp
** This variable describes the format of a remailer line on the mixmaster
** chain selection screen. The following \fTprintf(3)\fP-like sequences are
** .pp
** This variable describes the format of a remailer line on the mixmaster
** chain selection screen. The following \fTprintf(3)\fP-like sequences are
@@
-1678,16
+1663,12
@@
struct option_t MuttVars[] = {
*/
{"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER},
/*
*/
{"mixmaster", DT_PATH, R_NONE, UL &Mixmaster, MIXMASTER},
/*
- ** .pp
- ** Availability: Mixmaster
- **
** .pp
** This variable contains the path to the Mixmaster binary on your
** system. It is used with various sets of parameters to gather the
** list of known remailers, and to finally send a message through the
** mixmaster chain.
*/
** .pp
** This variable contains the path to the Mixmaster binary on your
** system. It is used with various sets of parameters to gather the
** list of known remailers, and to finally send a message through the
** mixmaster chain.
*/
-#endif
{"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
/*
** .pp
{"move", DT_QUAD, R_NONE, OPT_MOVE, "ask-no" },
/*
** .pp
@@
-3751,9
+3732,6
@@
static const char* Features[] = {
#ifdef HAVE_LIBIDN
"idn",
#endif
#ifdef HAVE_LIBIDN
"idn",
#endif
-#ifdef USE_DOTLOCK
- "dotlock",
-#endif
#ifdef USE_NNTP
"nntp",
#endif
#ifdef USE_NNTP
"nntp",
#endif